From fc97d5cb70b90b0513328ad3994bbd1cc333a937 Mon Sep 17 00:00:00 2001 From: FaniD Date: Wed, 21 Sep 2022 14:05:02 +0300 Subject: [PATCH 1/3] Restructure configuration of alpine and kubectl containers --- .../templates/deployment.yaml | 4 ++-- .../designate-certmanager-webhook/templates/uninstall.yaml | 2 +- helm/designate-certmanager-webhook/values.yaml | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/helm/designate-certmanager-webhook/templates/deployment.yaml b/helm/designate-certmanager-webhook/templates/deployment.yaml index 3f5c1a90..592e6344 100644 --- 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 index bc8cb55a..03db51e7 100644 --- 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 index ccb287ef..ab2132aa 100644 --- 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 From e5de9a55af5af373457dbe25800a041b62c52af0 Mon Sep 17 00:00:00 2001 From: FaniD Date: Wed, 21 Sep 2022 14:13:46 +0300 Subject: [PATCH 2/3] Bump helm chart version --- helm/designate-certmanager-webhook/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/designate-certmanager-webhook/Chart.yaml b/helm/designate-certmanager-webhook/Chart.yaml index 5b1f4ff2..d85f1a49 100644 --- 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.3.2" From fa6166cc4481e0fac54222212432d9aa98d4f074 Mon Sep 17 00:00:00 2001 From: David Steiman Date: Mon, 26 Sep 2022 12:07:54 +0200 Subject: [PATCH 3/3] set version to 0.4.0 --- helm/designate-certmanager-webhook/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/designate-certmanager-webhook/Chart.yaml b/helm/designate-certmanager-webhook/Chart.yaml index d85f1a49..7e56aa6d 100644 --- 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.2" +version: "0.4.0"