MLE-25053 update config readme and sample files (#112)

* MLE-25053: update the readme for Operator 1.1

* update fluent-bit to latest 4.1.1

* update sample config files

* fix error in kustomization file

* update readme for known issue regarding fluent-bit

* remove unneeded files

* update the docker-build script

* update the fluent-bit version to 4.1.1

* add back         hugespages2Mi: "24Gi"

---------

Co-authored-by: Peng Zhou <peng.zhou@progress.com>

Author: pengzhouml

Makefile

@@ -68,7 +68,6 @@ OPERATOR_SDK_VERSION ?= v1.34.2
 # Image URL to use all building/pushing image targets
 # Image for dev: ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-operator-kubernetes
 IMG ?= progressofficial/marklogic-operator-kubernetes:$(VERSION)
-# IMG ?= "testrepo/marklogic-operator-image-dev:$(VERSION)"
 
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -206,7 +205,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 # More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 .PHONY: docker-build
 docker-build: ## Build docker image with the manager. to build for linux, add --platform="linux/amd64"
-	$(CONTAINER_TOOL) buildx build -t ${IMG} .
+	$(CONTAINER_TOOL) buildx build --platform="linux/amd64" -t ${IMG} .
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.

README.md

@@ -27,9 +27,9 @@ helm repo add marklogic-operator https://marklogic.github.io/marklogic-operator-
 helm repo update
 ```
 
-2. Install the Helm Chart for MarkLogic Operator: 
+2. Install or upgrade the Helm Chart for MarkLogic Operator: 
 ```sh
-helm upgrade marklogic-operator marklogic-operator/marklogic-operator-kubernetes --version=1.0.0 --install --namespace marklogic-operator-system --create-namespace
+helm upgrade marklogic-operator marklogic-operator/marklogic-operator-kubernetes --version=1.1.0 --install --namespace marklogic-operator-system --create-namespace
 ```
 
 3. Make sure the Marklogic Operator pod is running:
@@ -94,6 +94,6 @@ kubectl delete namespace marklogic-operator-system
 
 ## Known Issues and Limitations
 
-1. The latest released version of fluent/fluent-bit:3.2.5 has high and critical security vulnerabilities. If you decide to enable the log collection feature, choose and deploy the fluent-bit or an alternate image with no vulnerabilities as per your requirements.
+1. The latest released version of fluent/fluent-bit:4.1.1 has high security vulnerabilities. If you decide to enable the log collection feature, choose and deploy the fluent-bit or an alternate image with no vulnerabilities as per your requirements.
 2. Known Issues and Limitations for the MarkLogic Server Docker image can be viewed using the link: https://github.com/marklogic/marklogic-docker?tab=readme-ov-file#Known-Issues-and-Limitations.
 3. If you're updating the group name configuration, ensure that you delete the pod to apply the changes, as we are using the OnDelete upgrade strategy.

api/v1/common_types.go

@@ -61,7 +61,7 @@ type AdminAuth struct {
 type LogCollection struct {
 	// +kubebuilder:default:=false
 	Enabled bool `json:"enabled,omitempty"`
-	// +kubebuilder:default:="fluent/fluent-bit:3.2.5"
+	// +kubebuilder:default:="fluent/fluent-bit:4.1.1"
 	Image            string                        `json:"image,omitempty"`
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
 	// +kubebuilder:default:={"requests":{"cpu":"100m","memory":"200Mi"},"limits":{"cpu":"200m","memory":"500Mi"}}

api/v1/marklogiccluster_types.go

@@ -66,7 +66,7 @@ type MarklogicClusterSpec struct {
 	EnableConverters          bool                                 `json:"enableConverters,omitempty"`
 	// +kubebuilder:default:={enabled: false, mountPath: "/dev/hugepages"}
 	HugePages *HugePages `json:"hugePages,omitempty"`
-	// +kubebuilder:default:={enabled: false, image: "fluent/fluent-bit:3.2.5", resources: {requests: {cpu: "100m", memory: "200Mi"}, limits: {cpu: "200m", memory: "500Mi"}}, files: {errorLogs: true, accessLogs: true, requestLogs: true}, outputs: "stdout"}
+	// +kubebuilder:default:={enabled: false, image: "fluent/fluent-bit:4.1.1", resources: {requests: {cpu: "100m", memory: "200Mi"}, limits: {cpu: "200m", memory: "500Mi"}}, files: {errorLogs: true, accessLogs: true, requestLogs: true}, outputs: "stdout"}
 	LogCollection                  *LogCollection                  `json:"logCollection,omitempty"`
 	HAProxy                        *HAProxy                        `json:"haproxy,omitempty"`
 	Tls                            *Tls                            `json:"tls,omitempty"`

api/v1/marklogicgroup_types.go

@@ -64,7 +64,7 @@ type MarklogicGroupSpec struct {
 	LivenessProbe ContainerProbe `json:"livenessProbe,omitempty"`
 	// +kubebuilder:default:={enabled: false, initialDelaySeconds: 10, timeoutSeconds: 5, periodSeconds: 30, successThreshold: 1, failureThreshold: 3}
 	ReadinessProbe ContainerProbe `json:"readinessProbe,omitempty"`
-	// +kubebuilder:default:={enabled: false, image: "fluent/fluent-bit:3.2.5", resources: {requests: {cpu: "100m", memory: "200Mi"}, limits: {cpu: "200m", memory: "500Mi"}}, files: {errorLogs: true, accessLogs: true, requestLogs: true}, outputs: "stdout"}
+	// +kubebuilder:default:={enabled: false, image: "fluent/fluent-bit:4.1.1", resources: {requests: {cpu: "100m", memory: "200Mi"}, limits: {cpu: "200m", memory: "500Mi"}}, files: {errorLogs: true, accessLogs: true, requestLogs: true}, outputs: "stdout"}
 	LogCollection *LogCollection `json:"logCollection,omitempty"`
 	// +kubebuilder:default:={name: "Default", enableXdqpSsl: true}
 	GroupConfig                    *GroupConfig                    `json:"groupConfig,omitempty"`

charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml

@@ -4703,7 +4703,7 @@ spec:
                     accessLogs: true
                     errorLogs: true
                     requestLogs: true
-                  image: fluent/fluent-bit:3.2.5
+                  image: fluent/fluent-bit:4.1.1
                   outputs: stdout
                   resources:
                     limits:
@@ -4736,7 +4736,7 @@ spec:
                         type: boolean
                     type: object
                   image:
-                    default: fluent/fluent-bit:3.2.5
+                    default: fluent/fluent-bit:4.1.1
                     type: string
                   imagePullSecrets:
                     items:
@@ -8285,7 +8285,7 @@ spec:
                               type: boolean
                           type: object
                         image:
-                          default: fluent/fluent-bit:3.2.5
+                          default: fluent/fluent-bit:4.1.1
                           type: string
                         imagePullSecrets:
                           items:

charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml

@@ -3455,7 +3455,7 @@ spec:
                     accessLogs: true
                     errorLogs: true
                     requestLogs: true
-                  image: fluent/fluent-bit:3.2.5
+                  image: fluent/fluent-bit:4.1.1
                   outputs: stdout
                   resources:
                     limits:
@@ -3488,7 +3488,7 @@ spec:
                         type: boolean
                     type: object
                   image:
-                    default: fluent/fluent-bit:3.2.5
+                    default: fluent/fluent-bit:4.1.1
                     type: string
                   imagePullSecrets:
                     items: