Fix secrets name from external secret

camptocamp · Sep 4, 2024 · 2bf9c44 · 2bf9c44
1 parent 1d8f87b
commit 2bf9c44
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/templates/external-secret-docker-registry.yaml b/templates/external-secret-docker-registry.yaml
@@ -5,7 +5,7 @@
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: {{ include "common.fullname" ( dict "root" $ "service" . ) }}
+  name: {{ include "common.fullname" ( dict "root" $ "service" . "serviceName" "docker-registry" ) }}
   {{- include "common.metadata" ( dict "root" $ "service" . ) | nindent 2 }}
 spec:
   {{- with .refreshInterval }}
@@ -15,8 +15,8 @@ spec:
   secretStoreRef: {{- toYaml . | nindent 4 }}
   {{- end }}
   target:
-    name: {{ include "common.fullname" ( dict "root" $ "service" . "serviceName" "external-secret" ) }}
-    template:
+    name: {{ include "common.fullname" ( dict "root" $ "service" . "serviceName" "docker-registry" ) }}
+git add     template:
       type: kubernetes.io/dockerconfigjson
       data:
         .dockerconfigjson: |-

diff --git a/templates/external-secret.yaml b/templates/external-secret.yaml
@@ -16,7 +16,7 @@ spec:
   {{- end }}
   target:
     {{- if not ( hasKey ( default ( dict ) .target ) "name" ) }}
-    name: {{ include "common.fullname" ( dict "root" $ "service" $definition "serviceName" "external-secret" ) }}
+    name: {{ include "common.fullname" ( dict "root" $ "service" $definition "serviceName" $name ) }}
     {{- end }}
     {{- with $definition.target }}
     {{- toYaml . | nindent 4 }}

diff --git a/tests/expected.yaml b/tests/expected.yaml
@@ -1405,7 +1405,7 @@ spec:
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: custom-custom-pod
+  name: custom-custom-pod-docker-registry
   labels:
     helm.sh/chart: custom-pod
     app.kubernetes.io/version: "1.0"
@@ -1417,7 +1417,7 @@ metadata:
     testAnnotation: annotation value
 spec:
   target:
-    name: custom-custom-pod-external-secret
+    name: custom-custom-pod-docker-registry
     template:
       type: kubernetes.io/dockerconfigjson
       data:
@@ -1495,7 +1495,7 @@ spec:
     kind: SecretStore
     name: my-secret-store
   target:
-    name: custom-custom-pod-external-secret
+    name: custom-custom-pod-app
   data:
     - secretKey: hostname
       remoteRef:
@@ -1519,7 +1519,7 @@ spec:
     kind: SecretStore
     name: my-global-secret-store
   target:
-    name: custom-custom-pod-external-secret
+    name: custom-custom-pod-global
   data:
     - secretKey: pass
       remoteRef: