Merge pull request syseleven#88 from FaniD/helm_chart_image_configura…

…tion Helm chart container configuration restructure
vzabawski · Sep 26, 2022 · 46bbe23 · 46bbe23
2 parents d3c8eda + fa6166c
commit 46bbe23
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/helm/designate-certmanager-webhook/Chart.yaml b/helm/designate-certmanager-webhook/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "0.2.18"
 description: ACME webhook Implementation for OpenStack Designate
 name: designate-certmanager-webhook
-version: "0.3.1"
+version: "0.4.0"
diff --git a/helm/designate-certmanager-webhook/templates/deployment.yaml b/helm/designate-certmanager-webhook/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
       serviceAccountName: {{ include "designate-certmanager-webhook.fullname" . }}
       initContainers:
         - name: wait-for-tls-secret
-          image: "{{ .Values.image.alpine.repository }}:{{ .Values.image.alpine.tag }}"
+          image: "{{ .Values.alpine.image.repository }}:{{ .Values.alpine.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           - name: certs
@@ -38,7 +38,7 @@ spec:
             - -c
             - "while [ ! -f /tls/tls.key ]; do sleep 5; done"
         - name: add-apiservice
-          image: "{{ .Values.image.kubectl.repository }}:{{ .Values.image.kubectl.tag }}"
+          image: "{{ .Values.kubectl.image.repository }}:{{ .Values.kubectl.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             - name: apiservice-config

diff --git a/helm/designate-certmanager-webhook/templates/uninstall.yaml b/helm/designate-certmanager-webhook/templates/uninstall.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: {{ include "designate-certmanager-webhook.fullname" . }}
       containers:
         - name: remove-apiservice
-          image: "{{ .Values.image.kubectl.repository }}:{{ .Values.image.kubectl.tag }}"
+          image: "{{ .Values.kubectl.image.repository }}:{{ .Values.kubectl.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - kubectl

diff --git a/helm/designate-certmanager-webhook/values.yaml b/helm/designate-certmanager-webhook/values.yaml
@@ -8,10 +8,13 @@ image:
   repository: syseleven/designate-certmanager-webhook
   tag: 0.2.18
   pullPolicy: IfNotPresent
-  alpine:
+
+alpine:
+  image:
     repository: alpine
     tag: latest
-  kubectl:
+kubectl:
+  image:
     repository: bitnami/kubectl
     tag: latest