fix includes check

hashicorp · Sep 1, 2023 · b1fd0fd · b1fd0fd
1 parent faec4c2
commit b1fd0fd
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/charts/consul/templates/api-gateway-controller-deployment.yaml b/charts/consul/templates/api-gateway-controller-deployment.yaml
@@ -39,7 +39,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 }}
         {{- if and .Values.global.secretsBackend.vault.ca.secretName .Values.global.secretsBackend.vault.ca.secretKey }}

diff --git a/charts/consul/templates/client-daemonset.yaml b/charts/consul/templates/client-daemonset.yaml
@@ -75,7 +75,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 }}
         {{- if and .Values.global.enterpriseLicense.secretName (not .Values.global.acls.manageSystemACLs) }}

diff --git a/charts/consul/templates/connect-inject-deployment.yaml b/charts/consul/templates/connect-inject-deployment.yaml
@@ -85,7 +85,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/mesh-gateway-deployment.yaml b/charts/consul/templates/mesh-gateway-deployment.yaml
@@ -70,7 +70,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/partition-init-job.yaml b/charts/consul/templates/partition-init-job.yaml
@@ -59,7 +59,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/server-acl-init-job.yaml b/charts/consul/templates/server-acl-init-job.yaml
@@ -93,7 +93,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/server-statefulset.yaml b/charts/consul/templates/server-statefulset.yaml
@@ -98,7 +98,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 }}
         {{- if .Values.global.enterpriseLicense.secretName }}