Merge pull request #321 from devtron-labs/clair-pg

feat: shifted the database configurations to global level

Author: akshatsinha007

charts/clair/Chart.yaml

@@ -12,4 +12,4 @@ maintainers:
 name: clair
 sources:
 - https://github.com/coreos/clair
-version: 0.1.14
+version: 0.1.15

charts/clair/templates/_config.yaml.tpl

@@ -2,24 +2,16 @@ introspection_addr: {{ .Values.config.introspection_addr }}
 http_listen_addr: {{ .Values.config.http_listen_addr }}
 log_level: {{ .Values.config.log_level }}
 indexer:
-  {{- if .Values.config.postgresPassword }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} password={{ .Values.config.postgresPassword }} sslmode=disable"
-  {{- else }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} sslmode=disable"
-  {{- end }}
+  {{- include "clair.dbconnstring" . }}
   scanlock_retry: {{ .Values.config.indexer.scanlock_retry }}
   layer_scan_concurrency: {{ .Values.config.indexer.layer_scan_concurrency }}
   migrations: {{ .Values.config.indexer.migrations }}
   {{- if .Values.config.indexer.extraConfig }}
   {{- toYaml .Values.config.indexer.extraConfig | nindent 2 }}
   {{- end }}
 matcher:
+  {{- include "clair.dbconnstring" . }}
   indexer_addr: "{{ .Values.config.matcher.indexer_addr }}"
-  {{- if .Values.config.postgresPassword }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} password={{ .Values.config.postgresPassword }} sslmode=disable"
-  {{- else }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} sslmode=disable"
-  {{- end }}
   max_conn_pool: {{ .Values.config.matcher.max_conn_pool }}
   run: ""
   migrations: {{ .Values.config.matcher.migrations }}
@@ -31,11 +23,7 @@ matcher:
   {{- toYaml .Values.config.matcher.extraConfig | nindent 2 }}
   {{- end }}
 notifier:
-  {{- if .Values.config.postgresPassword }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} password={{ .Values.config.postgresPassword }} sslmode=disable"
-  {{- else }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} sslmode=disable"
-  {{- end }}
+  {{- include "clair.dbconnstring" . }}
   delivery_interval: {{ .Values.config.notifier.delivery_interval }}
   poll_interval: {{ .Values.config.notifier.poll_interval }}
   migrations: {{ .Values.config.notifier.migrations }}

charts/clair/templates/_helpers.tpl

@@ -81,4 +81,45 @@ imagePullSecrets:
 imagePullSecrets:
 {{ toYaml .global.imagePullSecrets | indent 2 }}
   {{- end }}
-{{- end }}
+{{- end }}
+
+{{/*
+Generate dbconnection String
+*/}}
+{{- define "clair.dbconnstring" -}}
+  {{- $globalDbConfig := dict -}}
+  {{- if .Values.global -}}
+    {{- $globalDbConfig = .Values.global.dbConfig | default dict -}}
+  {{- end -}}
+  {{- $pgAddr := .Values.config.PG_ADDR | default $globalDbConfig.PG_ADDR | default "postgresql-postgresql.devtroncd" -}}
+  {{- $pgPort := .Values.config.PG_PORT | default $globalDbConfig.PG_PORT | default "5432" -}}
+  {{- $pgDatabase := .Values.config.PG_DATABASE | default $globalDbConfig.PG_DATABASE | default "clairv4" -}}
+  {{- $pgUser := .Values.config.PG_USER | default $globalDbConfig.PG_USER | default "postgres" -}}
+  {{- if .Values.config.postgresPassword }}
+  connstring: "host={{ $pgAddr }} port={{ $pgPort }} dbname={{ $pgDatabase }} user={{ $pgUser }} password={{ .Values.config.postgresPassword }} sslmode=disable"
+  {{- else }}
+  connstring: "host={{ $pgAddr }} port={{ $pgPort }} dbname={{ $pgDatabase }} user={{ $pgUser }} sslmode=disable"
+  {{- end }}
+{{- end -}}
+
+{{/*
+Generate postgres host
+*/}}
+{{- define "clair.postgresHost" -}}
+  {{- $globalDbConfig := dict -}}
+  {{- if .Values.global -}}
+    {{- $globalDbConfig = .Values.global.dbConfig | default dict -}}
+  {{- end -}}
+  {{- .Values.config.PG_ADDR | default $globalDbConfig.PG_ADDR | default "postgresql-postgresql.devtroncd" -}}
+{{- end -}}
+
+{{/*
+Generate postgres port 
+*/}}
+{{- define "clair.postgresPort" -}}
+  {{- $globalDbConfig := dict -}}
+  {{- if .Values.global -}}
+    {{- $globalDbConfig = .Values.global.dbConfig | default dict -}}
+  {{- end -}}
+  {{- .Values.config.PG_PORT | default $globalDbConfig.PG_PORT | default "5432" -}}
+{{- end -}}

charts/clair/templates/deployment.yaml

@@ -34,7 +34,7 @@ spec:
       - name: pg-ready-wait
         image: {{ include "common.clair.image" (dict "component" $.Values.image "global" $.Values.global "extraImage" $.Values.image.initContainer.image "extraImageTag" $.Values.image.initContainer.tag ) }}
         command: [ "sh", "-c",
-          "until pg_isready -h {{ .Values.config.postgresHost }} -p {{ .Values.config.postgresPort }};
+          "until pg_isready -h {{ include "clair.postgresHost" . }} -p {{ include "clair.postgresPort" . }};
           do echo waiting for database; sleep 1; done;"]
         envFrom:
         - configMapRef:

charts/clair/values.yaml

@@ -11,11 +11,12 @@ global:
   # imagePullSecrets:
   #     - name: yoursecret
 
+  dbConfig:
+    PG_ADDR: postgresql-postgresql.devtroncd
+    PG_PORT: "5432"
+    PG_USER: postgres
+
 config:
-  postgresHost: postgresql-postgresql.devtroncd
-  postgresPort: 5432
-  postgresdbname: clairv4
-  postgresUser: postgres
   postgresPassword: ""
   introspection_addr: :6061
   http_listen_addr: :6060