misc: Shifted the dbConfigs under global

charts/devtron/devtron-bom.yaml

@@ -8,6 +8,11 @@ global:
     runAsUser: 1000
     runAsNonRoot: true
   containerRegistry: "quay.io/devtron"
+  dbConfig:
+    PG_ADDR: postgresql-postgresql.devtroncd
+    PG_PORT: "5432"
+    PG_USER: postgres
+    PG_DATABASE: orchestrator
 extraManifests: []
 installer:
   release: "v1.6.0"
@@ -72,11 +77,7 @@ components:
       MANIFEST_FETCH_BATCH_SIZE: "2"
       NATS_MSG_PROCESSING_BATCH_SIZE: "1"
       NATS_SERVER_HOST: nats://devtron-nats.devtroncd:4222
-      PG_ADDR: postgresql-postgresql.devtroncd
-      PG_DATABASE: orchestrator
       PG_LOG_QUERY: "true"
-      PG_PORT: "5432"
-      PG_USER: postgres
     dbconfig:
       secretName: postgresql-postgresql
       keyName: postgresql-password
@@ -101,11 +102,7 @@ components:
       ACD_NAMESPACE: "devtroncd"
       ACD_INFORMER: "true"
       NATS_STREAM_MAX_AGE: "10800"
-      PG_ADDR: postgresql-postgresql.devtroncd
-      PG_DATABASE: orchestrator
       PG_LOG_QUERY: "true"
-      PG_PORT: "5432"
-      PG_USER: postgres
       CLUSTER_ARGO_CD_TYPE: "ALL_CLUSTER"
     dbconfig:
       secretName: postgresql-postgresql
@@ -126,8 +123,7 @@ components:
     persistence:
       volumeSize: 2Gi
     configs:
-      PG_ADDR: postgresql-postgresql.devtroncd
-      PG_USER: postgres
+      PG_DATABASE: git_sensor
       COMMIT_STATS_TIMEOUT_IN_SEC: "2"
       ENABLE_FILE_STATS: "true"
       USE_GIT_CLI: "true"
@@ -144,9 +140,6 @@ components:
       GIT_SENSOR_PROTOCOL: GRPC
       GIT_SENSOR_URL: git-sensor-service.devtroncd:90
       NATS_SERVER_HOST: nats://devtron-nats.devtroncd:4222
-      PG_ADDR: postgresql-postgresql.devtroncd
-      PG_PORT: "5432"
-      PG_USER: postgres
       PG_DATABASE: lens
     dbconfig:
       secretName: postgresql-postgresql
@@ -174,23 +167,10 @@ components:
     kubectlImage: "kubectl:latest"
     duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0
     entMigratorImage: "devtron-utils:geni-v1.1.4"
-    configs:
-      PG_ADDR: postgresql-postgresql.devtroncd
-    envVars:
-      devtron:
-        DB_NAME: "orchestrator"
-      casbin:
-        DB_NAME: "casbin"
-      gitsensor:
-        DB_NAME: "git_sensor"
-      lens:
-        DB_NAME: "lens"
   chartSync:
     registry: ""
     image: chart-sync:da156379-836-32914
     schedule: "0 19 * * *"
-    extraConfigs:
-      PG_ADDR: postgresql-postgresql.devtroncd
     podSecurityContext:
       fsGroup: 1001
       runAsGroup: 1001
@@ -256,10 +236,7 @@ devtronEnterprise:
     image: "casbin:f6ff5f74-064b67e5-462-30822"
     imagePullPolicy: IfNotPresent
     configs:
-      PG_ADDR: postgresql-postgresql.devtroncd
       PG_DATABASE: casbin
-      PG_PORT: "5432"
-      PG_USER: postgres
     dbconfig:
       secretName: postgresql-postgresql
       keyName: postgresql-password

charts/devtron/templates/app-sync-job.yaml

@@ -31,11 +31,6 @@ spec:
       - name: chart-sync
         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_DATABASE
-          value: orchestrator
-        - name: PG_USER
-          value: postgres
         envFrom:
         - configMapRef: 
             name: app-sync-cm
@@ -79,11 +74,6 @@ spec:
           - name: chart-sync
             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_DATABASE
-              value: orchestrator
-            - name: PG_USER
-              value: postgres
             envFrom:
             - secretRef:
                 name: devtron-secret
@@ -110,6 +100,7 @@ metadata:
     app: app-sync-cronjob
     release: devtron
 data:
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
 {{- if $.Values.components.chartSync.extraConfigs }}
 {{ toYaml $.Values.components.chartSync.extraConfigs | indent 2 }}
 {{- end }}

charts/devtron/templates/casbin.yaml

@@ -96,6 +96,7 @@ metadata:
     release: casbin
 {{- if .configs }}
 data:
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
 {{ toYaml .configs | indent 2 }}
 {{- end }}
 ---

charts/devtron/templates/configmap-secret.yaml

@@ -206,9 +206,13 @@ data:
 apiVersion: v1
 kind: Secret
 data:
+{{- if and $.Values.global.externalPostgres $.Values.global.externalPostgres.enabled }}
+  postgresql-password: {{ $.Values.global.externalPostgres.PG_PASSWORD | b64enc }}
+{{- else }}
   postgresql-password: {{ $postgresPwd }}
-  POSTGRES_USER: cG9zdGdyZXM=
-  POSTGRES_DB: b3JjaGVzdHJhdG9y
+{{- end }}
+  POSTGRES_USER: {{ $.Values.global.dbConfig.PG_USER | b64enc }}
+  POSTGRES_DB: {{ $.Values.global.dbConfig.PG_DATABASE | b64enc }}
 metadata:
   name: postgresql-postgresql
   labels:
@@ -224,7 +228,11 @@ type: Opaque
 apiVersion: v1
 kind: Secret
 data:
+{{- if and $.Values.global.externalPostgres $.Values.global.externalPostgres.enabled }}
+  DB_PASSWORD: {{ $.Values.global.externalPostgres.PG_PASSWORD | b64enc }}
+{{- else }}
   DB_PASSWORD: {{ $postgresPwd }}
+{{- end }}
 metadata:
   name: postgresql-migrator
   labels:
@@ -248,7 +256,11 @@ metadata:
     "helm.sh/hook-weight": "-3"
     "helm.sh/resource-policy": keep
 data:
+{{- if and $.Values.global.externalPostgres $.Values.global.externalPostgres.enabled }}
+  PG_PASSWORD: {{ $.Values.global.externalPostgres.PG_PASSWORD | b64enc }}
+{{- else }}
   PG_PASSWORD: {{ $postgresPwd }}
+{{- end }}
 {{- if $.Values.installer.modules }}
 {{- if has "cicd" $.Values.installer.modules }}
   EXTERNAL_CI_API_SECRET: {{ $EXTERNAL_CI_API_SECRET }}

charts/devtron/templates/devtron.yaml

@@ -13,15 +13,10 @@ data:
   DEVTRON_HELM_RELEASE_NAME: {{ $.Release.Name }}
   DEVTRON_HELM_RELEASE_NAMESPACE: {{ $.Release.Namespace }}
   FEATURE_MIGRATE_ARGOCD_APPLICATION_ENABLE: "true"
-  PG_USER: postgres
-  {{- if not $.Values.devtronEnterprise.enabled }}
-  PG_ADDR: postgresql-postgresql.devtroncd
-  {{- end }}
-  PG_PORT: "5432"
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
   HELM_CLIENT_URL: kubelink-service-headless:50051
   DASHBOARD_PORT: "80"
   DASHBOARD_HOST: dashboard-service.devtroncd
-  PG_DATABASE: orchestrator
   DEX_HOST: http://argocd-dex-server.devtroncd
   DEX_PORT: "5556"
   APP_SYNC_IMAGE: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }}

charts/devtron/templates/gitsensor.yaml

@@ -25,6 +25,7 @@ metadata:
     release: devtron
 {{- if .configs }}
 data:
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
 {{ toYaml .configs | indent 2 }}
 {{- end }}
 

charts/devtron/templates/kubelink.yaml

@@ -27,6 +27,7 @@ metadata:
     "helm.sh/resource-policy": keep
 {{- if .configs }}
 data:
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
 {{ toYaml .configs | indent 2 }}
 {{- if $.Values.installer.modules }}
 {{- if has "cicd" $.Values.installer.modules }}

charts/devtron/templates/kubewatch.yaml

@@ -31,6 +31,7 @@ rules:
     - events
     - workflows
     - secrets
+    - configmaps
     verbs:
     - list
     - watch
@@ -144,6 +145,7 @@ metadata:
     release: devtron
     app: kubewatch
 data:
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
 {{- if .configs}}
 {{ toYaml .configs | indent 2 }}
 {{- end }}

charts/devtron/templates/lens.yaml

@@ -25,6 +25,7 @@ metadata:
     release: devtron
 {{- if .configs }}
 data:
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
 {{ toYaml .configs | indent 2 }}
 {{- end }}
 ---