Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
kind: other
date: 2025-12-10
---

* **Operator configuration**: Removed the unused `MDB_IMAGE_TYPE` environment variable and the corresponding `mongodb.imageType` Helm value. This variable was deprecated in v1.28.0 of the MongoDB Enterprise Kubernetes Operator when it switched to architecture-based image selection (ubi9 for static, ubi8 for non-static). This is a cleanup change with no functional impact.
Comment on lines +1 to +6
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

2 changes: 0 additions & 2 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ spec:
value: mongodb-enterprise-server
- name: MONGODB_REPO_URL
value: quay.io/mongodb
- name: MDB_IMAGE_TYPE
value: ubi8
- name: PERFORM_FAILOVER
value: 'true'
- name: MDB_WEBHOOK_REGISTER_CONFIGURATION
Expand Down
6 changes: 0 additions & 6 deletions helm_chart/templates/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,6 @@ spec:
value: {{ .Values.mongodb.name }}
- name: MONGODB_REPO_URL
value: {{ .Values.mongodb.repo }}
- name: MDB_IMAGE_TYPE
{{- if eq .Values.operator.mdbDefaultArchitecture "static" }}
value: "ubi9"
{{- else }}
value: {{ .Values.mongodb.imageType }}
{{- end }}
{{- if eq .Values.mongodb.appdbAssumeOldFormat true }}
- name: MDB_APPDB_ASSUME_OLD_FORMAT
value: 'true'
Expand Down
1 change: 0 additions & 1 deletion helm_chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ mongodb:
name: mongodb-enterprise-server
repo: quay.io/mongodb
appdbAssumeOldFormat: false
imageType: ubi8

## Registry
registry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ var OfficialMongodbRepoUrls = []string{"docker.io/mongodb", "quay.io/mongodb"}

// Environment variables used to configure the MongoDB StatefulSet.
const (
MongodbRepoUrlEnv = "MONGODB_REPO_URL"
MongodbImageEnv = "MONGODB_IMAGE"
MongoDBImageTypeEnv = "MDB_IMAGE_TYPE"
AgentImageEnv = "AGENT_IMAGE"
MongodbRepoUrlEnv = "MONGODB_REPO_URL"
MongodbImageEnv = "MONGODB_IMAGE"
AgentImageEnv = "AGENT_IMAGE"
)

// MCO only
Expand Down
2 changes: 0 additions & 2 deletions pkg/images/Imageurls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ func TestGetAppDBImage(t *testing.T) {
want: "quay.io/mongodb/mongodb-enterprise-server:4.2.11-ubi8",
setupEnvs: func(t *testing.T) {
t.Setenv("RELATED_IMAGE_MONGODB_IMAGE_4_2_11_ubi8", "quay.io/mongodb/mongodb-enterprise-server:4.2.11-ubi8")
t.Setenv(construct.MongoDBImageTypeEnv, "ubi8")
t.Setenv(construct.MongodbImageEnv, util.DeprecatedImageAppdbUbiUrl)
t.Setenv(construct.MongodbRepoUrlEnv, construct.OfficialMongodbRepoUrls[1])
},
Expand All @@ -141,7 +140,6 @@ func TestGetAppDBImage(t *testing.T) {
setupEnvs: func(t *testing.T) {
t.Setenv("RELATED_IMAGE_MONGODB_IMAGE_4_2_11_ubi8", "quay.io/mongodb/mongodb-enterprise-server:4.2.11-ubi8")
t.Setenv("RELATED_IMAGE_MONGODB_IMAGE_4_2_11_ent", "quay.io/mongodb/mongodb-enterprise-server:4.2.11-ent")
t.Setenv(construct.MongoDBImageTypeEnv, "ubi8")
t.Setenv(construct.MongodbImageEnv, util.OfficialEnterpriseServerImageUrl)
t.Setenv(construct.MongodbRepoUrlEnv, construct.OfficialMongodbRepoUrls[1])
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,6 @@ spec:
value: mongodb-enterprise-server
- name: MONGODB_REPO_URL
value: quay.io/mongodb
- name: MDB_IMAGE_TYPE
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a reference architecture file

value: ubi8
- name: PERFORM_FAILOVER
value: 'true'
- name: MDB_MAX_CONCURRENT_RECONCILES
Expand Down
2 changes: 0 additions & 2 deletions public/mongodb-kubernetes-multi-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,6 @@ spec:
value: mongodb-enterprise-server
- name: MONGODB_REPO_URL
value: quay.io/mongodb
- name: MDB_IMAGE_TYPE
value: ubi8
- name: PERFORM_FAILOVER
value: 'true'
- name: MDB_MAX_CONCURRENT_RECONCILES
Expand Down
2 changes: 0 additions & 2 deletions public/mongodb-kubernetes-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,6 @@ spec:
value: mongodb-enterprise-server
- name: MONGODB_REPO_URL
value: quay.io/mongodb
- name: MDB_IMAGE_TYPE
value: ubi8
- name: PERFORM_FAILOVER
value: 'true'
- name: MDB_MAX_CONCURRENT_RECONCILES
Expand Down
2 changes: 0 additions & 2 deletions public/mongodb-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,6 @@ spec:
value: mongodb-enterprise-server
- name: MONGODB_REPO_URL
value: quay.io/mongodb
- name: MDB_IMAGE_TYPE
value: ubi8
- name: PERFORM_FAILOVER
value: 'true'
- name: MDB_MAX_CONCURRENT_RECONCILES
Expand Down
1 change: 0 additions & 1 deletion scripts/dev/contexts/root-context
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ export SIGNING_PUBLIC_KEY_URL="https://cosign.mongodb.com/mongodb-enterprise-kub
export CLUSTER_DOMAIN="cluster.local"

export MDB_MAX_CONCURRENT_RECONCILES=10
export MDB_IMAGE_TYPE="ubi9"

# leaving them empty for now
export OM_HOST=https://cloud-qa.mongodb.com
Expand Down
1 change: 0 additions & 1 deletion scripts/dev/print_operator_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ MONGODB_AGENT_VERSION=\"${MONGODB_AGENT_VERSION:-}\"
MONGODB_REPO_URL=\"${MONGODB_REPO_URL:-}\"
IMAGE_PULL_SECRETS=\"image-registries-secret\"
MDB_DEFAULT_ARCHITECTURE=\"${MDB_DEFAULT_ARCHITECTURE:-non-static}\"
MDB_IMAGE_TYPE=\"${MDB_IMAGE_TYPE:-ubi8}\"
MDB_OPERATOR_TELEMETRY_COLLECTION_FREQUENCY=\"${MDB_OPERATOR_TELEMETRY_COLLECTION_FREQUENCY:-1m}\"
MDB_OPERATOR_TELEMETRY_SEND_ENABLED=\"${MDB_OPERATOR_TELEMETRY_SEND_ENABLED:-false}\"
MDB_COMMUNITY_IMAGE=\"${MDB_COMMUNITY_IMAGE}\"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ spec:
{{ end }}
- name: MDB_DEFAULT_ARCHITECTURE
value: {{ .Values.mdbDefaultArchitecture }}
- name: MDB_IMAGE_TYPE
value: {{ .Values.mdbImageType }}
- name: CLUSTER_DOMAIN
value: {{ .Values.clusterDomain }}
{{ if .Values.omDebugHttp }}
Expand Down
1 change: 0 additions & 1 deletion scripts/evergreen/deployments/test-app/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ otel_parent_id:
otel_endpoint:
otel_resource_attributes:
mdbDefaultArchitecture: "non-static"
mdbImageType: "ubi8"

# set to "true" to set OM_DEBUG_HTTP=true for the operator
omDebugHttp:
Expand Down
1 change: 0 additions & 1 deletion scripts/evergreen/e2e/single_e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ deploy_test_app() {
"--set" "managedSecurityContext=${MANAGED_SECURITY_CONTEXT:-false}"
"--set" "registry=${REGISTRY}"
"--set" "mdbDefaultArchitecture=${MDB_DEFAULT_ARCHITECTURE:-'non-static'}"
"--set" "mdbImageType=${MDB_IMAGE_TYPE:-'ubi8'}"
"--set" "clusterDomain=${CLUSTER_DOMAIN:-'cluster.local'}"
"--set" "cognito_user_pool_id=${cognito_user_pool_id}"
"--set" "cognito_workload_federation_client_id=${cognito_workload_federation_client_id}"
Expand Down
1 change: 0 additions & 1 deletion scripts/funcs/operator_deployment
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ get_operator_helm_values() {
"database.version=${DATABASE_VERSION}"
"agent.version=${AGENT_VERSION}"
"mongodb.name=mongodb-enterprise-server"
"mongodb.imageType=${MDB_IMAGE_TYPE:-ubi8}"
"operator.mdbDefaultArchitecture=${MDB_DEFAULT_ARCHITECTURE:-non-static}"
"operator.enablePVCResize=${MDB_ENABLE_PVC_RESIZE:-true}"
# only send the telemetry to the backend on a specific variant, thus default to false
Expand Down