Merge branch 'NET-581-Configure-Vault-namespaces-for-Connect-CA-via-H…

…elm-Stanza' of ssh://github.com/hashicorp/consul-k8s into NET-581-Configure-Vault-namespaces-for-Connect-CA-via-Helm-Stanza
hashicorp · Sep 4, 2023 · 825fb42 · 825fb42
2 parents ed1026e + 1f3e23a
commit 825fb42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/charts/consul/templates/server-config-configmap.yaml b/charts/consul/templates/server-config-configmap.yaml
@@ -72,7 +72,7 @@ data:
               "ca_file": "/consul/vault-ca/tls.crt",
               {{- end }}
               "intermediate_pki_path": "{{ .connectCA.intermediatePKIPath }}",
-              {{- if .vaultNamespace }}
+              {{- if (and (.vaultNamespace) (not (hasKey (default "" .connectCA.additionalConfig | fromJson) "namespace"))) }}
               "namespace": "{{ .vaultNamespace }}",
               {{- end }}
               "root_pki_path": "{{ .connectCA.rootPKIPath }}",

diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml
@@ -115,7 +115,7 @@ global:
   secretsBackend:
     vault:
       # Vault namespace (optional). This sets the Vault namespace for the `vault.hashicorp.com/namespace` 
-      # agent annotation and [Vault Connect CA configuration](https://developer.hashicorp.com/consul/docs/connect/ca/vault#namespace).
+      # agent annotation and [Vault Connect CA namespace](https://developer.hashicorp.com/consul/docs/connect/ca/vault#namespace).
       # To override one of these values individually, see `agentAnnotations` and `connectCA.additionalConfig`.
       vaultNamespace: ""