Merge pull request #322 from devtron-labs/trivy-pg

feat: shifted the database configurations to global level

Author: akshatsinha007

charts/security/Chart.yaml

@@ -15,8 +15,8 @@ maintainers:
     email: [email protected]
 sources:
   - https://github.com/devtron-labs/charts
-version: 0.2.1
-appVersion: "0.2.1"
+version: 0.2.2
+appVersion: "0.2.2"
 dependencies:
 - name: clair
   version: "0.x.x"

charts/security/templates/image-scanner.yaml

@@ -30,6 +30,9 @@ metadata:
 {{ toYaml .labels | indent 4 }}    
 {{- end}} 
 data:
+{{- if $.Values.global.dbConfig }}
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
+{{- end}}
 {{- if .configs}}
 {{ toYaml .configs | indent 2 }}
 ---
@@ -148,10 +151,10 @@ spec:
           envFrom:
           - configMapRef:
               name: image-scanner-cm
-          - configMapRef:
-              name: devtron-common-cm
           - secretRef:
               name: image-scanner-secret
+          - configMapRef:
+              name: devtron-common-cm
 {{- if .resources }}
           resources:
 {{ toYaml .resources | indent 12 }}

charts/security/values.yaml

@@ -10,17 +10,19 @@ global:
   #     effect: "NoSchedule"
   # imagePullSecrets:
   #     - name: yoursecret
+  dbConfig:
+    PG_ADDR: postgresql-postgresql.devtroncd
+    PG_PORT: "5432"
+    PG_USER: postgres
+    PG_DATABASE: orchestrator
+
 imageScanner:
   healthPort: 8080
   configs:
     CLAIR_ADDR: clair.devtroncd:6060
     CLIENT_ID: client-2
     NATS_SERVER_HOST: nats://devtron-nats.devtroncd:4222
-    PG_ADDR: postgresql-postgresql.devtroncd
-    PG_DATABASE: orchestrator
     PG_LOG_QUERY: "false"
-    PG_PORT: "5432"
-    PG_USER: postgres
   # secrets:
   #   PG_PASSWORD: "devtron"
 
@@ -36,6 +38,8 @@ imageScanner:
 clair:
   enabled: false
   fullnameOverride: clair
+  config:
+    PG_DATABASE: clairv4
   extraEnv:
   - name: CLAIR_CONF
     value: /etc/clair/config.yaml