diff --git a/helm/template/Chart.yaml b/helm/template/Chart.yaml index 12c325c..de7fb01 100644 --- a/helm/template/Chart.yaml +++ b/helm/template/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: template description: A Helm library chart containing common templates, keeping application templates short type: library -version: 0.2.0 +version: 0.2.1 maintainers: - name: Jim Martens url: https://2martens.de @@ -10,8 +10,8 @@ sources: - https://git.2martens.de/2martens/cloud-configuration annotations: artifacthub.io/changes: | - - kind: added - description: Added support for Vault Secrets + - kind: fixed + description: No longer necessary to populate secrets value if vault is enabled. artifacthub.io/signKey: | fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8 url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc diff --git a/helm/template/_values.yaml b/helm/template/_values.yaml index b4171ac..59e75e0 100644 --- a/helm/template/_values.yaml +++ b/helm/template/_values.yaml @@ -137,6 +137,7 @@ autoscaling: # targetMemoryUtilizationPercentage: 80 vault: + # If enabled, no ordinary secret resource will be created, even if secrets value is populated. enabled: false # name of the Vault secrets applications applicationName: "" diff --git a/helm/template/templates/_deployment.yaml b/helm/template/templates/_deployment.yaml index f32af2a..b2a6de7 100644 --- a/helm/template/templates/_deployment.yaml +++ b/helm/template/templates/_deployment.yaml @@ -41,7 +41,7 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - {{- if .Values.secrets }} + {{- if or .Values.secrets .Values.vault.enabled }} envFrom: - secretRef: name: {{ include "template.fullname" . }}