Skip to content

Commit a299367

Browse files
pengzhoumlPeng Zhou
andauthored
MLE-24871/Update default image version to ML 12 (#109)
* MLE-24871: update default MarkLogic Image version to 12 * update defualt image for minimal-production.yaml --------- Co-authored-by: Peng Zhou <[email protected]>
1 parent 8b7d852 commit a299367

File tree

13 files changed

+13
-16
lines changed

13 files changed

+13
-16
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ VERIFY_HUGE_PAGES ?= false
1313
export E2E_DOCKER_IMAGE ?= $(IMG)
1414
export E2E_KUSTOMIZE_VERSION ?= $(KUSTOMIZE_VERSION)
1515
export E2E_CONTROLLER_TOOLS_VERSION ?= $(CONTROLLER_TOOLS_VERSION)
16-
export E2E_MARKLOGIC_IMAGE_VERSION ?= progressofficial/marklogic-db:11.3.1-ubi-rootless-2.1.3
16+
export E2E_MARKLOGIC_IMAGE_VERSION ?= progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2
1717
export E2E_KUBERNETES_VERSION ?= v1.31.13
1818

1919
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

api/v1/marklogiccluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type MarklogicClusterSpec struct {
3535
// +kubebuilder:default:="cluster.local"
3636
ClusterDomain string `json:"clusterDomain,omitempty"`
3737

38-
// +kubebuilder:default:="progressofficial/marklogic-db:11.3.0-ubi-rootless"
38+
// +kubebuilder:default:="progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2"
3939
Image string `json:"image"`
4040
// +kubebuilder:default:="IfNotPresent"
4141
ImagePullPolicy string `json:"imagePullPolicy,omitempty"`

api/v1/marklogicgroup_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type MarklogicGroupSpec struct {
3434
Annotations map[string]string `json:"annotations,omitempty"`
3535
// +kubebuilder:default:="cluster.local"
3636
ClusterDomain string `json:"clusterDomain,omitempty"`
37-
// +kubebuilder:default:="progressofficial/marklogic-db:11.3.0-ubi-rootless"
37+
// +kubebuilder:default:="progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2"
3838
Image string `json:"image"`
3939
// +kubebuilder:default:="IfNotPresent"
4040
ImagePullPolicy string `json:"imagePullPolicy,omitempty"`

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4666,7 +4666,7 @@ spec:
46664666
type: string
46674667
type: object
46684668
image:
4669-
default: progressofficial/marklogic-db:11.3.0-ubi-rootless
4669+
default: progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2
46704670
type: string
46714671
imagePullPolicy:
46724672
default: IfNotPresent

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3382,7 +3382,7 @@ spec:
33823382
type: string
33833383
type: object
33843384
image:
3385-
default: progressofficial/marklogic-db:11.3.0-ubi-rootless
3385+
default: progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2
33863386
type: string
33873387
imagePullPolicy:
33883388
default: IfNotPresent

config/crd/bases/marklogic.progress.com_marklogicclusters.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
@@ -4676,7 +4675,7 @@ spec:
46764675
type: string
46774676
type: object
46784677
image:
4679-
default: progressofficial/marklogic-db:11.3.0-ubi-rootless
4678+
default: progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2
46804679
type: string
46814680
imagePullPolicy:
46824681
default: IfNotPresent

config/crd/bases/marklogic.progress.com_marklogicgroups.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
@@ -3390,7 +3389,7 @@ spec:
33903389
type: string
33913390
type: object
33923391
image:
3393-
default: progressofficial/marklogic-db:11.3.0-ubi-rootless
3392+
default: progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2
33943393
type: string
33953394
imagePullPolicy:
33963395
default: IfNotPresent

config/rbac/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
21
---
32
apiVersion: rbac.authorization.k8s.io/v1
43
kind: ClusterRole

config/samples/complete.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: prod
88
annotations: {}
99
spec:
10-
image: "progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.1"
10+
image: "progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2"
1111
imagePullPolicy: IfNotPresent
1212
imagePullSecrets:
1313
- name: regcred
@@ -206,7 +206,7 @@ spec:
206206
name: dnode
207207
enableXdqpSsl: true
208208
isBootstrap: true
209-
image: "progressofficial/marklogic-db:11.3.0-ubi-rootless"
209+
image: "progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2"
210210
imagePullPolicy: IfNotPresent
211211
imagePullSecrets:
212212
- name: regcred # secret name to pull the image from private repository

config/samples/minimal-production.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
name: ml-cluster
88
namespace: prod
99
spec:
10-
image: "progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.1"
10+
image: "progressofficial/marklogic-db:12.0.0-ubi9-rootless-2.2.2"
1111
## It is recommended to use Kubernetes secrets to store the admin credentials
1212
## To create a secret, run the following command in the same namespace as the CR:
1313
## kubectl create secret generic admincreds --from-literal=username=admin --from-literal=password=admin

0 commit comments

Comments
 (0)