Skip to content

MLE-24871/Update default image version to ML 12 #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2025
Merged

MLE-24871/Update default image version to ML 12 #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3028dc
MLE-24871: update default MarkLogic Image version to 12
Oct 30, 2025
d4c1766
update defualt image for minimal-production.yaml
Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion api/v1/marklogiccluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion api/v1/marklogicgroup_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/marklogic.progress.com_marklogicclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/marklogic.progress.com_marklogicgroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/samples/complete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/samples/minimal-production.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/samples/quick-start.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/marklogicgroup_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8sutil/haProxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading