From f373debf549d3dc7de0dd365046b52fb5e0a4282 Mon Sep 17 00:00:00 2001 From: Davide Imola Date: Tue, 29 Mar 2022 18:11:59 +0200 Subject: [PATCH] fix: fixing the helm chart --- charts/capsule/templates/configuration-default.yaml | 6 +++++- charts/capsule/templates/post-install-job.yaml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/capsule/templates/configuration-default.yaml b/charts/capsule/templates/configuration-default.yaml index 7506c24c..1c5ca644 100644 --- a/charts/capsule/templates/configuration-default.yaml +++ b/charts/capsule/templates/configuration-default.yaml @@ -4,8 +4,12 @@ metadata: name: default labels: {{- include "capsule.labels" . | nindent 4 }} - {{- with .Values.customAnnotations }} annotations: + capsule.clastix.io/ca-secret-name: {{ include "capsule.secretCaName" . }} + capsule.clastix.io/mutating-webhook-configuration-name: {{ include "capsule.fullname" . }}-mutating-webhook-configuration + capsule.clastix.io/tls-secret-name: {{ include "capsule.secretTlsName" . }} + capsule.clastix.io/validating-webhook-configuration-name: {{ include "capsule.fullname" . }}-validating-webhook-configuration + {{- with .Values.customAnnotations }} {{- toYaml . | nindent 4 }} {{- end }} spec: diff --git a/charts/capsule/templates/post-install-job.yaml b/charts/capsule/templates/post-install-job.yaml index 3a40bece..58358aad 100644 --- a/charts/capsule/templates/post-install-job.yaml +++ b/charts/capsule/templates/post-install-job.yaml @@ -1,4 +1,4 @@ -{{- $cmd := "while [ -z $$(kubectl -n $NAMESPACE get secret capsule-tls -o jsonpath='{.data.tls\\\\.crt}') ];" -}} +{{- $cmd := printf "while [ -z $$(kubectl -n $NAMESPACE get secret %s -o jsonpath='{.data.tls\\\\.crt}') ];" (include "capsule.secretCaName" .) -}} {{- $cmd = printf "%s do echo 'waiting Capsule to be up and running...' && sleep 5;" $cmd -}} {{- $cmd = printf "%s done" $cmd -}} apiVersion: batch/v1