modified the chart to support global-image-repo

Author: Ubuntu

charts/security/Chart.yaml

@@ -10,12 +10,12 @@ keywords:
   - image scanning
   - source code scanning
 type: application
-maintaintainers:
+maintainers:
   - name: Pawan Kumar
     email: [email protected]
 sources:
   - https://github.com/devtron-labs/charts
-version: 0.1.5
+version: 0.1.6
 appVersion: "0.1.1"
 dependencies:
 - name: clair

charts/security/templates/_helpers.tpl

@@ -0,0 +1,31 @@
+{{/*
+Return full image
+{{ include "common.image" ( dict "component" .Values.path.to.the.component "global" .Values.global .extraImage .extraImageTag .extraImageDigest ) }}
+*/}}
+{{- define "common.image" -}}
+{{- $registryName := .component.registry | default .global.containerRegistry -}}
+{{- $imageName := .extraImage | default .component.image -}}
+{{- $imageTag := .extraImageTag | default .component.tag -}}
+{{- $imageDigest := .extraImageDigest | default .component.digest -}}
+{{- if $registryName }}
+    {{- if and $imageTag $imageDigest }}
+        {{- printf "%s/%s@%s" $registryName $imageName $imageDigest -}}
+    {{- else if $imageTag }}
+        {{- printf "%s/%s:%s" $registryName $imageName $imageTag -}}
+    {{- else if $imageDigest }}
+        {{- printf "%s/%s@%s" $registryName $imageName $imageDigest -}}
+    {{- else }}
+        {{- printf "%s/%s" $registryName $imageName -}}
+    {{- end }}
+{{- else -}}
+    {{- if and $imageTag $imageDigest }}
+        {{- printf "%s@%s" $imageName $imageDigest -}}
+    {{- else if $imageTag }}
+        {{- printf "%s:%s" $imageName $imageTag -}}
+    {{- else if $imageDigest }}
+        {{- printf "%s@%s" $imageName $imageDigest -}}
+    {{- else }}
+        {{- printf "%s" $imageName -}}
+    {{- end }}
+{{- end -}}
+{{- end -}}

charts/security/templates/image-scanner.yaml

@@ -99,7 +99,7 @@ spec:
       {{- end }}
       containers:
         - name: image-scanner
-          image: {{ .image }}
+          image: {{ include "common.image" (dict "component" $.Values.imageScanner "global" $.Values.global ) }}
           imagePullPolicy: {{ .imagePullPolicy }}
           {{- if and $.Values.global $.Values.global.containerSecurityContext }}
           securityContext:

charts/security/values.yaml

@@ -1,3 +1,5 @@
+global:
+  containerRegistry: "quay.io/devtron"
 imageScanner:
   configs:
     CLAIR_ADDR: clair.devtroncd:6060
@@ -13,7 +15,7 @@ imageScanner:
   dbconfig:
     secretName: postgresql-postgresql
     keyName: postgresql-password
-  image: "quay.io/devtron/image-scanner:b278f42b-334-11119"
+  image: "image-scanner:b278f42b-334-11119"
   imagePullPolicy: IfNotPresent
   labels: {}
   replicaCount: 1