fix yaml

hashicorp · Sep 1, 2023 · ffe4b1f · ffe4b1f
1 parent 666331a
commit ffe4b1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/charts/consul/templates/sync-catalog-deployment.yaml b/charts/consul/templates/sync-catalog-deployment.yaml
@@ -56,7 +56,7 @@ spec:
         {{- if .Values.global.secretsBackend.vault.agentAnnotations }}
         {{ tpl .Values.global.secretsBackend.vault.agentAnnotations . | nindent 8 | trim }}
         {{- end }}
-        {{- if (and (.Values.global.secretsBackend.vault.vaultNamespace) (not (contains "vault.hashicorp.com/namespace" .Values.global.secretsBackend.vault.agentAnnotations)))}}
+        {{- if (and (.Values.global.secretsBackend.vault.vaultNamespace) (not (has "vault.hashicorp.com/namespace" (toStrings .Values.global.secretsBackend.vault.agentAnnotations))))}}
         "vault.hashicorp.com/namespace": "{{ .Values.global.secretsBackend.vault.vaultNamespace }}"
         {{- end }}
         {{- end }}

diff --git a/charts/consul/templates/telemetry-collector-deployment.yaml b/charts/consul/templates/telemetry-collector-deployment.yaml
@@ -57,7 +57,8 @@ spec:
         {{- end }}
         {{- if .Values.global.secretsBackend.vault.agentAnnotations }}
         {{ tpl .Values.global.secretsBackend.vault.agentAnnotations . | nindent 8 | trim }}
-        {{- else if .Values.global.secretsBackend.vault.vaultNamespace }}
+        {{- end }}
+        {{- if (and (.Values.global.secretsBackend.vault.vaultNamespace) (not (has "vault.hashicorp.com/namespace" (toStrings .Values.global.secretsBackend.vault.agentAnnotations))))}}
         "vault.hashicorp.com/namespace": "{{ .Values.global.secretsBackend.vault.vaultNamespace }}"
         {{- end }}
         {{- end }}