[VDEVOPS-000]: Support for vault ext secrets

Signed-off-by: adobrodey <[email protected]>
vinivia · Jun 3, 2024 · f060daa · f060daa
1 parent e89cf36
commit f060daa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/stable/deployment/Chart.yaml b/stable/deployment/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: deployment
-version: 1.8.5
+version: 1.8.6
 description: Typical microservice chart. Supports Ingress controller, horizontal-scalable containers
 type: application
 dependencies:

diff --git a/stable/deployment/templates/external-secret.yaml b/stable/deployment/templates/external-secret.yaml
@@ -34,9 +34,9 @@ spec:
 {{ end -}}
 
 {{- range .Values.sidecarContainers }}
-{{- $values := dict "Values" . "Release" $.Release "Template" $.Template -}}
+{{- $values := dict "Values" (merge . (dict "global" $.Values.global)) "Release" $.Release "Template" $.Template -}}
 {{ if and (hasKey $values.Values "env") (hasKey $values.Values.env "vaultSecret") }}
-{{ $name := default $.Release.Name $values.Values.global.serviceName }}
+{{ $name := default $.Release.Name $.Values.global.serviceName }}
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
@@ -73,9 +73,9 @@ spec:
 {{ end -}}
 
 {{- range .Values.initContainers }}
-{{- $values := dict "Values" . "Release" $.Release "Template" $.Template -}}
+{{- $values := dict "Values" (merge . (dict "global" $.Values.global)) "Release" $.Release "Chart" $.Chart "Template" $.Template -}}
 {{ if and (hasKey $values.Values "env") (hasKey $values.Values.env "vaultSecret") }}
-{{ $name := default $.Release.Name $values.Values.global.serviceName }}
+{{ $name := default $.Release.Name $.Values.global.serviceName }}
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
@@ -111,7 +111,6 @@ spec:
 {{ end -}}
 {{ end -}}
 
-
 {{- if .Values.vaultVolumesSupport -}}
 {{- $allVolumes := default (dict) .Values.volumes -}}
 {{- range $key, $value := $allVolumes }}

diff --git a/stable/statefulset/Chart.yaml b/stable/statefulset/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: statefulset
-version: 1.8.5
+version: 1.8.6
 description: Typical StateFul Set application
 type: application
 dependencies:

diff --git a/stable/statefulset/templates/external-secret.yaml b/stable/statefulset/templates/external-secret.yaml
@@ -34,9 +34,9 @@ spec:
 {{ end -}}
 
 {{- range .Values.sidecarContainers }}
-{{- $values := dict "Values" . "Release" $.Release "Template" $.Template -}}
+{{- $values := dict "Values" (merge . (dict "global" $.Values.global)) "Release" $.Release "Template" $.Template -}}
 {{ if and (hasKey $values.Values "env") (hasKey $values.Values.env "vaultSecret") }}
-{{ $name := default $.Release.Name $values.Values.global.serviceName }}
+{{ $name := default $.Release.Name $.Values.global.serviceName }}
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
@@ -65,17 +65,17 @@ spec:
           {{- else -}}
           secret-{{ $.Values.global.product }}/data/
           {{- $.Values.global.environment -}}
-          /k8s/{{ $value.path }}
+          /k8s/{{ $.Release.Namespace}}/{{ $value.path }}
         {{- end }}
         property: {{ default $key $value.secret }}
   {{ end -}}
 {{ end -}}
 {{ end -}}
 
 {{- range .Values.initContainers }}
-{{- $values := dict "Values" . "Release" $.Release "Template" $.Template -}}
+{{- $values := dict "Values" (merge . (dict "global" $.Values.global)) "Release" $.Release "Chart" $.Chart "Template" $.Template -}}
 {{ if and (hasKey $values.Values "env") (hasKey $values.Values.env "vaultSecret") }}
-{{ $name := default $.Release.Name $values.Values.global.serviceName }}
+{{ $name := default $.Release.Name $.Values.global.serviceName }}
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret