From e35a4e922a2fe2af061439e1a922730bb3161da5 Mon Sep 17 00:00:00 2001 From: Badal Kumar Prusty Date: Wed, 14 May 2025 18:14:48 +0530 Subject: [PATCH 1/2] exposed the postgres endpoint --- charts/devtron/templates/app-sync-job.yaml | 6 ++---- charts/devtron/templates/migrator.yaml | 12 ++++++------ charts/devtron/values.yaml | 4 +++- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/devtron/templates/app-sync-job.yaml b/charts/devtron/templates/app-sync-job.yaml index f0ba041a84..28907cc333 100644 --- a/charts/devtron/templates/app-sync-job.yaml +++ b/charts/devtron/templates/app-sync-job.yaml @@ -32,13 +32,13 @@ spec: image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }} {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.chartSync.containerSecurityContext "global" $.Values.global) | indent 8 }} env: - - name: PG_ADDR - value: postgresql-postgresql.devtroncd - name: PG_DATABASE value: orchestrator - name: PG_USER value: postgres envFrom: + - configMapRef: + name: app-sync-cm - secretRef: name: devtron-secret - configMapRef: @@ -80,8 +80,6 @@ spec: image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }} {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.chartSync.containerSecurityContext "global" $.Values.global) | indent 12 }} env: - - name: PG_ADDR - value: postgresql-postgresql.devtroncd - name: PG_DATABASE value: orchestrator - name: PG_USER diff --git a/charts/devtron/templates/migrator.yaml b/charts/devtron/templates/migrator.yaml index e600750c02..c6aff6abfd 100644 --- a/charts/devtron/templates/migrator.yaml +++ b/charts/devtron/templates/migrator.yaml @@ -27,7 +27,7 @@ spec: - name: PG_USER value: postgres - name: PG_ADDR - value: postgresql-postgresql.devtroncd + value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: PG_DATABASE @@ -80,7 +80,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: postgresql-postgresql.devtroncd + value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -186,7 +186,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: postgresql-postgresql.devtroncd + value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -273,7 +273,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: postgresql-postgresql.devtroncd + value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -355,7 +355,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: postgresql-postgresql.devtroncd + value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -430,7 +430,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: postgresql-postgresql.devtroncd + value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml index 82e65a1e65..08b5e3a2c4 100644 --- a/charts/devtron/values.yaml +++ b/charts/devtron/values.yaml @@ -246,6 +246,7 @@ components: kubectlImage: "kubectl:latest" duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0 entMigratorImage: "devtron-utils:geni-v1.1.4" + postgresEndpoint: postgresql-postgresql.devtroncd envVars: devtron: DB_NAME: "orchestrator" @@ -259,7 +260,8 @@ components: registry: "" image: chart-sync:c49b4aa5-836-32103 schedule: "0 19 * * *" - extraConfigs: {} + extraConfigs: + PG_ADDR: postgresql-postgresql.devtroncd podSecurityContext: fsGroup: 1001 runAsGroup: 1001 From e128625b2ffc64f0518d7afa6b92a280c763a910 Mon Sep 17 00:00:00 2001 From: Badal Kumar Prusty Date: Wed, 14 May 2025 18:51:41 +0530 Subject: [PATCH 2/2] renamed the parameter --- charts/devtron/templates/migrator.yaml | 12 ++++++------ charts/devtron/values.yaml | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/charts/devtron/templates/migrator.yaml b/charts/devtron/templates/migrator.yaml index c6aff6abfd..461dd588a0 100644 --- a/charts/devtron/templates/migrator.yaml +++ b/charts/devtron/templates/migrator.yaml @@ -27,7 +27,7 @@ spec: - name: PG_USER value: postgres - name: PG_ADDR - value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: PG_DATABASE @@ -80,7 +80,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -186,7 +186,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -273,7 +273,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -355,7 +355,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -430,7 +430,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: {{ .postgresEndpoint | default "postgresql-postgresql.devtroncd" }} + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml index 08b5e3a2c4..7738715a54 100644 --- a/charts/devtron/values.yaml +++ b/charts/devtron/values.yaml @@ -246,7 +246,8 @@ components: kubectlImage: "kubectl:latest" duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0 entMigratorImage: "devtron-utils:geni-v1.1.4" - postgresEndpoint: postgresql-postgresql.devtroncd + configs: + PG_ADDR: postgresql-postgresql.devtroncd envVars: devtron: DB_NAME: "orchestrator"