CLOUDP-318799 Drop “community” from search values in the helm chart (#441)

fealebenpae · lsierant · web-flow · commit ba0a38c55ff9 · 2025-09-15T18:25:54.000+02:00
# Summary Also update to the public Quay search repo. ## Proof of Work  ## Checklist - [x] Have you linked a jira ticket and/or is the ticket in the title? - [x] Have you checked whether your jira ticket required DOCSP changes? - [x] Have you added changelog file? - use `skip-changelog` label if not needed - refer to [Changelog files and Release Notes](https://github.com/mongodb/mongodb-kubernetes/blob/master/CONTRIBUTING.md#changelog-files-and-release-notes) section in CONTRIBUTING.md for more details --------- Co-authored-by: Łukasz Sierant <lukasz.sierant@mongodb.com>
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -299,9 +299,11 @@ spec:
               value: "quay.io/mongodb/mongodb-enterprise-server:8.0.0-ubi8"
             - name: RELATED_IMAGE_MONGODB_IMAGE_8_0_0_ubi9
               value: "quay.io/mongodb/mongodb-enterprise-server:8.0.0-ubi9"
-            - name: MDB_SEARCH_COMMUNITY_REPO_URL
+            - name: RELATED_IMAGE_MDB_SEARCH_IMAGE_0_53_0
+              value: "quay.io/mongodb/mongodb-search:0.53.0"
+            - name: MDB_SEARCH_REPO_URL
               value: "quay.io/mongodb"
-            - name: MDB_SEARCH_COMMUNITY_NAME
-              value: "mongodb-search-community"
-            - name: MDB_SEARCH_COMMUNITY_VERSION
-              value: "1.47.0"
+            - name: MDB_SEARCH_NAME
+              value: "mongodb-search"
+            - name: MDB_SEARCH_VERSION
+              value: "0.53.0"
diff --git a/helm_chart/templates/operator.yaml b/helm_chart/templates/operator.yaml
@@ -262,14 +262,18 @@ spec:
             - name: RELATED_IMAGE_{{ $mongodbImageEnv }}_{{ $version | replace "." "_" | replace "-" "_" }}
               value: "{{ $.Values.mongodb.repo }}/{{ $.Values.mongodb.name }}:{{ $version }}"
       {{- end }}
+      {{- if .Values.search }}
+            - name: RELATED_IMAGE_MDB_SEARCH_IMAGE_{{ .Values.search.version | replace "." "_" | replace "-" "_" }}
+              value: "{{ .Values.search.repo }}/{{ .Values.search.name }}:{{ $.Values.search.version }}"
+      {{- end }}
     {{- end }}
     {{- if .Values.search }}
-            - name: MDB_SEARCH_COMMUNITY_REPO_URL
-              value: "{{ .Values.search.community.repo }}"
-            - name: MDB_SEARCH_COMMUNITY_NAME
-              value: "{{ .Values.search.community.name }}"
-            - name: MDB_SEARCH_COMMUNITY_VERSION
-              value: "{{ .Values.search.community.version }}"
+            - name: MDB_SEARCH_REPO_URL
+              value: "{{ .Values.search.repo }}"
+            - name: MDB_SEARCH_NAME
+              value: "{{ .Values.search.name }}"
+            - name: MDB_SEARCH_VERSION
+              value: "{{ .Values.search.version }}"
     {{- end }}
     {{- if .Values.customEnvVars }}
       {{- range split "&" .Values.customEnvVars }}
diff --git a/helm_chart/values.yaml b/helm_chart/values.yaml
@@ -218,9 +218,8 @@ community:
 
 # MongoDBSearch settings
 search:
-  community:
-    # Full Search container image url used for the MongoDB Community Search container will be constructed as {search.community.repo}/{search.community.name}:{search.community.version}
-    repo: quay.io/mongodb
-    name: mongodb-search-community
-    # default MongoDB Search version used; can be overridden by setting MongoDBSearch.spec.version field.
-    version: 1.47.0
+  # Full Search container image url used for the MongoDB Search container will be constructed as {search.repo}/{search.name}:{search.version}
+  repo: quay.io/mongodb
+  name: mongodb-search
+  # default MongoDB Search version used; can be overridden by setting MongoDBSearch.spec.version field.
+  version: 0.53.0
diff --git a/main.go b/main.go
@@ -391,9 +391,9 @@ func setupMongoDBMultiClusterCRD(ctx context.Context, mgr manager.Manager, image
 
 func setupMongoDBSearchCRD(ctx context.Context, mgr manager.Manager) error {
 	return operator.AddMongoDBSearchController(ctx, mgr, searchcontroller.OperatorSearchConfig{
-		SearchRepo:    env.ReadOrPanic("MDB_SEARCH_COMMUNITY_REPO_URL"),
-		SearchName:    env.ReadOrPanic("MDB_SEARCH_COMMUNITY_NAME"),
-		SearchVersion: env.ReadOrPanic("MDB_SEARCH_COMMUNITY_VERSION"),
+		SearchRepo:    env.ReadOrPanic("MDB_SEARCH_REPO_URL"),
+		SearchName:    env.ReadOrPanic("MDB_SEARCH_NAME"),
+		SearchVersion: env.ReadOrPanic("MDB_SEARCH_VERSION"),
 	})
 }
 
diff --git a/public/mongodb-kubernetes-multi-cluster.yaml b/public/mongodb-kubernetes-multi-cluster.yaml
@@ -431,12 +431,12 @@ spec:
             - name: MDB_COMMUNITY_IMAGE_TYPE
               value: "ubi8"
             # Community Env Vars End
-            - name: MDB_SEARCH_COMMUNITY_REPO_URL
+            - name: MDB_SEARCH_REPO_URL
               value: "quay.io/mongodb"
-            - name: MDB_SEARCH_COMMUNITY_NAME
-              value: "mongodb-search-community"
-            - name: MDB_SEARCH_COMMUNITY_VERSION
-              value: "1.47.0"
+            - name: MDB_SEARCH_NAME
+              value: "mongodb-search"
+            - name: MDB_SEARCH_VERSION
+              value: "0.53.0"
       volumes:
         - name: kube-config-volume
           secret:
diff --git a/public/mongodb-kubernetes-openshift.yaml b/public/mongodb-kubernetes-openshift.yaml
@@ -603,9 +603,11 @@ spec:
               value: "quay.io/mongodb/mongodb-enterprise-server:8.0.0-ubi8"
             - name: RELATED_IMAGE_MONGODB_IMAGE_8_0_0_ubi9
               value: "quay.io/mongodb/mongodb-enterprise-server:8.0.0-ubi9"
-            - name: MDB_SEARCH_COMMUNITY_REPO_URL
+            - name: RELATED_IMAGE_MDB_SEARCH_IMAGE_0_53_0
+              value: "quay.io/mongodb/mongodb-search:0.53.0"
+            - name: MDB_SEARCH_REPO_URL
               value: "quay.io/mongodb"
-            - name: MDB_SEARCH_COMMUNITY_NAME
-              value: "mongodb-search-community"
-            - name: MDB_SEARCH_COMMUNITY_VERSION
-              value: "1.47.0"
+            - name: MDB_SEARCH_NAME
+              value: "mongodb-search"
+            - name: MDB_SEARCH_VERSION
+              value: "0.53.0"
diff --git a/public/mongodb-kubernetes.yaml b/public/mongodb-kubernetes.yaml
@@ -427,9 +427,9 @@ spec:
             - name: MDB_COMMUNITY_IMAGE_TYPE
               value: "ubi8"
             # Community Env Vars End
-            - name: MDB_SEARCH_COMMUNITY_REPO_URL
+            - name: MDB_SEARCH_REPO_URL
               value: "quay.io/mongodb"
-            - name: MDB_SEARCH_COMMUNITY_NAME
-              value: "mongodb-search-community"
-            - name: MDB_SEARCH_COMMUNITY_VERSION
-              value: "1.47.0"
+            - name: MDB_SEARCH_NAME
+              value: "mongodb-search"
+            - name: MDB_SEARCH_VERSION
+              value: "0.53.0"
diff --git a/release.json b/release.json
@@ -12,9 +12,7 @@
     "minimumSupportedVersion": "4.6"
   },
   "search": {
-    "community": {
-      "version": "1.47.0"
-    }
+    "version": "0.53.0"
   },
   "supportedImages": {
     "readinessprobe": {
diff --git a/scripts/dev/contexts/root-context b/scripts/dev/contexts/root-context
@@ -113,11 +113,11 @@ export MDB_COMMUNITY_REPO_URL=quay.io/mongodb
 export MDB_COMMUNITY_AGENT_IMAGE=${AGENT_IMAGE}
 export MDB_COMMUNITY_IMAGE_TYPE=ubi8
 
-MDB_SEARCH_COMMUNITY_VERSION="$(jq -r '.search.community.version' "${PROJECT_DIR}/release.json")"
-export MDB_SEARCH_COMMUNITY_VERSION
+MDB_SEARCH_VERSION="$(jq -r '.search.version' "${PROJECT_DIR}/release.json")"
+export MDB_SEARCH_VERSION
 
-export MDB_SEARCH_COMMUNITY_NAME="mongodb-search-community"
-export MDB_SEARCH_COMMUNITY_REPO_URL="quay.io/mongodb"
+export MDB_SEARCH_NAME="mongodb-search"
+export MDB_SEARCH_REPO_URL="quay.io/mongodb"
 
 
 if [[ ${MDB_BASH_DEBUG:-0} == 1 ]]; then
diff --git a/scripts/dev/contexts/variables/mongodb_search_dev b/scripts/dev/contexts/variables/mongodb_search_dev
@@ -3,6 +3,6 @@
 set -Eeou pipefail
 
 # Temporary development images built from mongot master
-export MDB_SEARCH_COMMUNITY_VERSION="1.53.0-78-g227f2593f" # Sep 2nd mongot master
-export MDB_SEARCH_COMMUNITY_NAME="mongot/community"
-export MDB_SEARCH_COMMUNITY_REPO_URL="268558157000.dkr.ecr.eu-west-1.amazonaws.com"
+#export MDB_SEARCH_VERSION="1.53.0-78-g227f2593f" # Sep 2nd mongot master
+#export MDB_SEARCH_NAME="mongot/community"
+#export MDB_SEARCH_REPO_URL="268558157000.dkr.ecr.eu-west-1.amazonaws.com"
diff --git a/scripts/dev/print_operator_env.sh b/scripts/dev/print_operator_env.sh
@@ -37,9 +37,9 @@ MDB_COMMUNITY_AGENT_IMAGE=\"${MDB_COMMUNITY_AGENT_IMAGE}\"
 MDB_COMMUNITY_IMAGE_TYPE=\"${MDB_COMMUNITY_IMAGE_TYPE}\"
 VERSION_UPGRADE_HOOK_IMAGE=\"${VERSION_UPGRADE_HOOK_IMAGE}\"
 READINESS_PROBE_IMAGE=\"${READINESS_PROBE_IMAGE}\"
-MDB_SEARCH_COMMUNITY_VERSION=\"${MDB_SEARCH_COMMUNITY_VERSION}\"
-MDB_SEARCH_COMMUNITY_NAME=\"${MDB_SEARCH_COMMUNITY_NAME}\"
-MDB_SEARCH_COMMUNITY_REPO_URL=\"${MDB_SEARCH_COMMUNITY_REPO_URL}\"
+MDB_SEARCH_VERSION=\"${MDB_SEARCH_VERSION}\"
+MDB_SEARCH_NAME=\"${MDB_SEARCH_NAME}\"
+MDB_SEARCH_REPO_URL=\"${MDB_SEARCH_REPO_URL}\"
 OPERATOR_NAME=\"${OPERATOR_NAME}\"
 "
 
diff --git a/scripts/evergreen/release/update_helm_values_files.py b/scripts/evergreen/release/update_helm_values_files.py
@@ -86,9 +86,7 @@ def update_helm_charts(operator_version, release):
     set_value_in_yaml_file("helm_chart/values.yaml", "operator.version", operator_version)
     set_value_in_yaml_file("helm_chart/Chart.yaml", "version", operator_version)
 
-    set_value_in_yaml_file(
-        "helm_chart/values.yaml", "search.community.version", release["search"]["community"]["version"]
-    )
+    set_value_in_yaml_file("helm_chart/values.yaml", "search.version", release["search"]["version"])
 
 
 def update_cluster_service_version(operator_version):
diff --git a/scripts/funcs/operator_deployment b/scripts/funcs/operator_deployment
@@ -33,9 +33,9 @@ get_operator_helm_values() {
     "operator.telemetry.send.enabled=${MDB_OPERATOR_TELEMETRY_SEND_ENABLED:-false}"
     # lets collect and save in the configmap as frequently as we can
     "operator.telemetry.collection.frequency=${MDB_OPERATOR_TELEMETRY_COLLECTION_FREQUENCY:-1m}"
-    "search.community.repo=${MDB_SEARCH_COMMUNITY_REPO_URL}"
-    "search.community.name=${MDB_SEARCH_COMMUNITY_NAME}"
-    "search.community.version=${MDB_SEARCH_COMMUNITY_VERSION}"
+    "search.repo=${MDB_SEARCH_REPO_URL}"
+    "search.name=${MDB_SEARCH_NAME}"
+    "search.version=${MDB_SEARCH_VERSION}"
     "community.registry.agent=${AGENT_BASE_REGISTRY:-${REGISTRY}}"
   )
 
