build(helm): making customizable components Docker images (#209)

charts/capsule/Chart.yaml

@@ -21,7 +21,7 @@ sources:
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.0.11
+version: 0.0.12
 
 # This is the version number of the application being deployed.
 # This version number should be incremented each time you make changes to the application.

charts/capsule/templates/_helpers.tpl

@@ -62,12 +62,26 @@ Create the name of the service account to use
 {{- end }}
 
 {{/*
-Create the fully-qualified Docker image to use
+Create the manager fully-qualified Docker image to use
 */}}
-{{- define "capsule.fullyQualifiedDockerImage" -}}
+{{- define "capsule.managerFullyQualifiedDockerImage" -}}
 {{- printf "%s:%s" .Values.manager.image.repository ( .Values.manager.image.tag | default (printf "v%s" .Chart.AppVersion) ) -}}
 {{- end }}
 
+{{/*
+Create the proxy fully-qualified Docker image to use
+*/}}
+{{- define "capsule.proxyFullyQualifiedDockerImage" -}}
+{{- printf "%s:%s" .Values.proxy.image.repository .Values.proxy.image.tag -}}
+{{- end }}
+
+{{/*
+Create the jobs fully-qualified Docker image to use
+*/}}
+{{- define "capsule.jobsFullyQualifiedDockerImage" -}}
+{{- printf "%s:%s" .Values.jobs.image.repository .Values.jobs.image.tag -}}
+{{- end }}
+
 {{/*
 Create the Capsule Deployment name to use
 */}}

charts/capsule/templates/deployment.yaml

@@ -52,7 +52,7 @@ spec:
           {{ if .Values.manager.options.forceTenantPrefix }}- --force-tenant-prefix={{ .Values.manager.options.forceTenantPrefix }}{{ end }}
           {{ if .Values.manager.options.capsuleUserGroup }}- --capsule-user-group={{ .Values.manager.options.capsuleUserGroup }}{{ end }}
           {{ if .Values.manager.options.protectedNamespaceRegex }}- --protected-namespace-regex={{ .Values.manager.options.protectedNamespaceRegex }}{{ end }}
-          image: {{ include "capsule.fullyQualifiedDockerImage" . }}
+          image: {{ include "capsule.managerFullyQualifiedDockerImage" . }}
           imagePullPolicy: {{ .Values.manager.image.pullPolicy }}
           env:
           - name: NAMESPACE
@@ -80,8 +80,8 @@ spec:
           securityContext:
             allowPrivilegeEscalation: false
         - name: kube-rbac-proxy
-          image: {{ .Values.proxy.image.repository }}:{{ .Values.proxy.image.tag }}
-          imagePullPolicy: IfNotPresent
+          image: {{ include "capsule.proxyFullyQualifiedDockerImage" . }}
+          imagePullPolicy: {{ .Values.proxy.image.pullPolicy }}
           args:
           - --secure-listen-address=0.0.0.0:8443
           - --upstream=http://127.0.0.1:8080/

charts/capsule/templates/post-install-job.yaml

@@ -28,7 +28,8 @@ spec:
       restartPolicy: Never
       containers:
       - name: post-install-job
-        image: "bitnami/kubectl:1.18"
+        image: {{ include "capsule.jobsFullyQualifiedDockerImage" . }}
+        imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
         command: ["sh", "-c", "{{ $cmd }}"]
         env:
         - name: NAMESPACE

charts/capsule/templates/pre-delete-job.yaml

@@ -29,7 +29,8 @@ spec:
       restartPolicy: Never
       containers:
         - name: pre-delete-job
-          image: "bitnami/kubectl:1.18"
+          image: {{ include "capsule.jobsFullyQualifiedDockerImage" . }}
+          imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
           command: [ "sh", "-c",  "{{ $cmd }}"]
           env:
             - name: NAMESPACE

charts/capsule/values.yaml

@@ -32,6 +32,11 @@ proxy:
     requests:
       cpu: 10m
       memory: 64Mi
+jobs:
+  image:
+    repository: bitnami/kubectl
+    pullPolicy: IfNotPresent
+    tag: "1.18"
 mutatingWebhooksTimeoutSeconds: 30
 validatingWebhooksTimeoutSeconds: 30
 imagePullSecrets: []