diff --git a/Makefile b/Makefile index dd04cd8..7659f4e 100755 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ VERIFY_HUGE_PAGES ?= false export E2E_DOCKER_IMAGE ?= $(IMG) export E2E_KUSTOMIZE_VERSION ?= $(KUSTOMIZE_VERSION) export E2E_CONTROLLER_TOOLS_VERSION ?= $(CONTROLLER_TOOLS_VERSION) -export E2E_MARKLOGIC_IMAGE_VERSION ?= progressofficial/marklogic-db:11.3.1-ubi-rootless-2.1.3 +export E2E_MARKLOGIC_IMAGE_VERSION ?= progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2 export E2E_KUBERNETES_VERSION ?= v1.31.13 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/api/v1/marklogiccluster_types.go b/api/v1/marklogiccluster_types.go index 5f817f4..8ed682e 100644 --- a/api/v1/marklogiccluster_types.go +++ b/api/v1/marklogiccluster_types.go @@ -35,7 +35,7 @@ type MarklogicClusterSpec struct { // +kubebuilder:default:="cluster.local" ClusterDomain string `json:"clusterDomain,omitempty"` - // +kubebuilder:default:="progressofficial/marklogic-db:11.3.0-ubi-rootless" + // +kubebuilder:default:="progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2" Image string `json:"image"` // +kubebuilder:default:="IfNotPresent" ImagePullPolicy string `json:"imagePullPolicy,omitempty"` diff --git a/api/v1/marklogicgroup_types.go b/api/v1/marklogicgroup_types.go index 249a7ad..7582628 100644 --- a/api/v1/marklogicgroup_types.go +++ b/api/v1/marklogicgroup_types.go @@ -34,7 +34,7 @@ type MarklogicGroupSpec struct { Annotations map[string]string `json:"annotations,omitempty"` // +kubebuilder:default:="cluster.local" ClusterDomain string `json:"clusterDomain,omitempty"` - // +kubebuilder:default:="progressofficial/marklogic-db:11.3.0-ubi-rootless" + // +kubebuilder:default:="progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2" Image string `json:"image"` // +kubebuilder:default:="IfNotPresent" ImagePullPolicy string `json:"imagePullPolicy,omitempty"` diff --git a/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml b/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml index 8d48e9a..188de81 100644 --- a/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml +++ b/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml @@ -4666,7 +4666,7 @@ spec: type: string type: object image: - default: progressofficial/marklogic-db:11.3.0-ubi-rootless + default: progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2 type: string imagePullPolicy: default: IfNotPresent diff --git a/charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml b/charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml index 6aa88e3..aa07478 100644 --- a/charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml +++ b/charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml @@ -3382,7 +3382,7 @@ spec: type: string type: object image: - default: progressofficial/marklogic-db:11.3.0-ubi-rootless + default: progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2 type: string imagePullPolicy: default: IfNotPresent diff --git a/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml b/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml index aa575bc..083ae30 100644 --- a/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml +++ b/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml @@ -1,4 +1,3 @@ -# Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -4676,7 +4675,7 @@ spec: type: string type: object image: - default: progressofficial/marklogic-db:11.3.0-ubi-rootless + default: progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2 type: string imagePullPolicy: default: IfNotPresent diff --git a/config/crd/bases/marklogic.progress.com_marklogicgroups.yaml b/config/crd/bases/marklogic.progress.com_marklogicgroups.yaml index d539aa1..c7b2881 100644 --- a/config/crd/bases/marklogic.progress.com_marklogicgroups.yaml +++ b/config/crd/bases/marklogic.progress.com_marklogicgroups.yaml @@ -1,4 +1,3 @@ -# Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -3390,7 +3389,7 @@ spec: type: string type: object image: - default: progressofficial/marklogic-db:11.3.0-ubi-rootless + default: progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2 type: string imagePullPolicy: default: IfNotPresent diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 66afd09..c84ced7 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -1,4 +1,3 @@ -# Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole diff --git a/config/samples/complete.yaml b/config/samples/complete.yaml index 30d5aa2..ba02b20 100644 --- a/config/samples/complete.yaml +++ b/config/samples/complete.yaml @@ -7,7 +7,7 @@ metadata: namespace: prod annotations: {} spec: - image: "progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.1" + image: "progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2" imagePullPolicy: IfNotPresent imagePullSecrets: - name: regcred @@ -206,7 +206,7 @@ spec: name: dnode enableXdqpSsl: true isBootstrap: true - image: "progressofficial/marklogic-db:11.3.0-ubi-rootless" + image: "progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2" imagePullPolicy: IfNotPresent imagePullSecrets: - name: regcred # secret name to pull the image from private repository diff --git a/config/samples/minimal-production.yaml b/config/samples/minimal-production.yaml index f43f546..c26e11b 100644 --- a/config/samples/minimal-production.yaml +++ b/config/samples/minimal-production.yaml @@ -7,7 +7,7 @@ metadata: name: ml-cluster namespace: prod spec: - image: "progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.1" + image: "progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2" ## It is recommended to use Kubernetes secrets to store the admin credentials ## To create a secret, run the following command in the same namespace as the CR: ## kubectl create secret generic admincreds --from-literal=username=admin --from-literal=password=admin diff --git a/config/samples/quick-start.yaml b/config/samples/quick-start.yaml index 2f037e0..e26c620 100644 --- a/config/samples/quick-start.yaml +++ b/config/samples/quick-start.yaml @@ -6,7 +6,7 @@ metadata: name: single-node annotations: {} spec: - image: "progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.1" + image: "progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2" ## It is recommended to use Kubernetes secrets to store the admin credentials ## To create a secret, run the following command in the same namespace as the CR: ## kubectl create secret generic admincreds --from-literal=username=admin --from-literal=password=admin diff --git a/internal/controller/marklogicgroup_controller_test.go b/internal/controller/marklogicgroup_controller_test.go index 9e1371d..117b5c3 100644 --- a/internal/controller/marklogicgroup_controller_test.go +++ b/internal/controller/marklogicgroup_controller_test.go @@ -40,7 +40,7 @@ const ( duration = time.Second * 10 interval = time.Millisecond * 250 - imageName = "progressofficial/marklogic-db:11.3.0-ubi-rootless" + imageName = "progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2" ) var replicas = int32(2) diff --git a/pkg/k8sutil/haProxy.go b/pkg/k8sutil/haProxy.go index fbcc19d..46aa923 100644 --- a/pkg/k8sutil/haProxy.go +++ b/pkg/k8sutil/haProxy.go @@ -3,10 +3,10 @@ package k8sutil import ( + "context" "crypto/sha256" "encoding/hex" "sort" - "context" "github.com/cisco-open/k8s-objectmatcher/patch" marklogicv1 "github.com/marklogic/marklogic-operator-kubernetes/api/v1"