From 903d95285421e00e5ab83c74c697c20328c433bd Mon Sep 17 00:00:00 2001 From: Wyatt Walter Date: Tue, 23 Sep 2025 09:41:54 -0500 Subject: [PATCH] fix: bitnami image hardcoded in init container definition (#41257) ## Description Hardcoded image reference was missed in the previous Bitnami image fix. see: https://github.com/bitnami/charts/issues/35256 Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="" ### :mag: Cypress test results > [!CAUTION] > If you modify the content in this section, you are likely to disrupt the CI result for your PR. ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No ## Summary by CodeRabbit - New Features - Init container images for Redis, MongoDB, and PostgreSQL now respect chart values for registry, repository, and tag, allowing customization and private registry support. Defaults are no longer hardcoded; behavior for explicitly provided custom images remains unchanged. This helps with compliance, air-gapped deployments, and consistency. - Chores - Bumped Helm chart to 3.6.5. --- deploy/helm/Chart.yaml | 2 +- deploy/helm/templates/deployment.yaml | 6 +++--- .../__snapshot__/defaults_snapshot_test.yaml.snap | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml index 3fd18d3eae..04d7136d98 100644 --- a/deploy/helm/Chart.yaml +++ b/deploy/helm/Chart.yaml @@ -11,7 +11,7 @@ sources: - https://github.com/appsmithorg/appsmith home: https://www.appsmith.com/ icon: https://assets.appsmith.com/appsmith-icon.png -version: 3.6.4 +version: 3.6.5 dependencies: - condition: redis.enabled name: redis diff --git a/deploy/helm/templates/deployment.yaml b/deploy/helm/templates/deployment.yaml index b04241be18..acbaa5e6e6 100644 --- a/deploy/helm/templates/deployment.yaml +++ b/deploy/helm/templates/deployment.yaml @@ -65,7 +65,7 @@ spec: {{- if ((.Values.initContainer.redis).image) }} image: {{ .Values.initContainer.redis.image }} {{- else }} - image: "docker.io/redis:7.0.15" + image: "{{ .Values.redis.image.registry }}/{{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}" {{- end }} command: ['sh', '-c', "until redis-cli -h {{.Release.Name}}-redis-master.{{.Release.Namespace}}.svc.cluster.local ping ; do echo waiting for redis; sleep 2; done"] {{- end }} @@ -74,7 +74,7 @@ spec: {{- if ((.Values.initContainer.mongodb).image) }} image: {{ .Values.initContainer.mongodb.image }} {{- else }} - image: "docker.io/bitnami/mongodb:6.0.13" + image: "{{ .Values.mongodb.image.registry }}/{{ .Values.mongodb.image.repository }}:{{ .Values.mongodb.image.tag }}" {{- end }} command: ['sh', '-c', "until mongosh --host appsmith-mongodb.{{.Release.Namespace}}.svc.cluster.local --eval 'db.runCommand({ping:1})' ; do echo waiting for mongo; sleep 2; done"] {{- end }} @@ -83,7 +83,7 @@ spec: {{- if ((.Values.initContainer.postgresql).image) }} image: {{ .Values.initContainer.postgresql.image }} {{- else}} - image: docker.io/bitnami/postgresql:14.5.0-debian-11-r21 + image: "{{ .Values.postgresql.image.registry }}/{{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}" {{- end}} command: ['sh', '-c', "until pg_isready -U $postgresuser -d $postgresdb -h {{.Release.Name}}-postgresql.{{.Release.Namespace}}.svc.cluster.local; do echo waiting for postgresql; sleep 2; done"] {{- end }} diff --git a/deploy/helm/tests/__snapshot__/defaults_snapshot_test.yaml.snap b/deploy/helm/tests/__snapshot__/defaults_snapshot_test.yaml.snap index 80f1daa190..d114faf213 100644 --- a/deploy/helm/tests/__snapshot__/defaults_snapshot_test.yaml.snap +++ b/deploy/helm/tests/__snapshot__/defaults_snapshot_test.yaml.snap @@ -25,7 +25,7 @@ app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: appsmith - appsmith.sh/chart: appsmith-3.6.4 + appsmith.sh/chart: appsmith-3.6.5 name: RELEASE-NAME-appsmith namespace: NAMESPACE 3: | @@ -36,7 +36,7 @@ app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: appsmith - appsmith.sh/chart: appsmith-3.6.4 + appsmith.sh/chart: appsmith-3.6.5 name: RELEASE-NAME-appsmith namespace: NAMESPACE spec: @@ -114,13 +114,13 @@ - sh - -c - until mongosh --host appsmith-mongodb.NAMESPACE.svc.cluster.local --eval 'db.runCommand({ping:1})' ; do echo waiting for mongo; sleep 2; done - image: docker.io/bitnami/mongodb:6.0.13 + image: docker.io/bitnamilegacy/mongodb:6.0.13 name: mongo-init-container - command: - sh - -c - until pg_isready -U $postgresuser -d $postgresdb -h RELEASE-NAME-postgresql.NAMESPACE.svc.cluster.local; do echo waiting for postgresql; sleep 2; done - image: docker.io/bitnami/postgresql:14.5.0-debian-11-r21 + image: docker.io/bitnamilegacy/postgresql:14.12.0 name: psql-init-container securityContext: {} serviceAccountName: RELEASE-NAME-appsmith @@ -143,7 +143,7 @@ app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: appsmith - appsmith.sh/chart: appsmith-3.6.4 + appsmith.sh/chart: appsmith-3.6.5 name: RELEASE-NAME-appsmith-headless namespace: NAMESPACE spec: @@ -182,7 +182,7 @@ app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: appsmith - appsmith.sh/chart: appsmith-3.6.4 + appsmith.sh/chart: appsmith-3.6.5 name: RELEASE-NAME-appsmith namespace: NAMESPACE spec: @@ -203,7 +203,7 @@ app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: appsmith - appsmith.sh/chart: appsmith-3.6.4 + appsmith.sh/chart: appsmith-3.6.5 name: RELEASE-NAME-appsmith namespace: NAMESPACE secrets: