modified the chart to support global-image-repo

Author: Ubuntu

charts/clair/Chart.yaml

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

charts/clair/templates/_helpers.tpl

@@ -24,10 +24,30 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
-{{/*
-Create a default fully qualified postgresql name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "postgresql.fullname" -}}
-{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
+{{- define "common.clair.image" -}}
+{{- $registryName := .component.registry | default .global.containerRegistry -}}
+{{- $imageName := .extraImage | default .component.repository -}}
+{{- $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/clair/templates/deployment.yaml

@@ -38,13 +38,13 @@ spec:
       {{- end }}
       initContainers:
       - name: pg-ready-wait
-        image: postgres:11.3
+        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 }};
           do echo waiting for database; sleep 1; done;"]
       containers:
       - name: {{ .Chart.Name }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: {{ include "common.clair.image" (dict "component" $.Values.image "global" $.Values.global ) }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         {{- if .Values.extraEnv }}
         env: {{ toYaml .Values.extraEnv | nindent 8 }}

charts/clair/values.yaml

@@ -1,3 +1,6 @@
+global:
+  containerRegistry: "quay.io/projectquay"
+
 config:
   postgresHost: postgresql-postgresql.devtroncd
   postgresPort: 5432
@@ -34,8 +37,11 @@ config:
     extraConfig: {}
 image:
   pullPolicy: IfNotPresent
-  repository: quay.io/projectquay/clair
+  repository: clair
   tag: 4.3.6
+  initContainer:
+    image:  postgres
+    tag: "11.3"
 ingress:
   annotations: null
   enabled: false