fix bats

hashicorp · Sep 1, 2023 · d05f340 · d05f340
1 parent 6c692df
commit d05f340
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/charts/consul/templates/sync-catalog-deployment.yaml b/charts/consul/templates/sync-catalog-deployment.yaml
@@ -55,6 +55,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 }}
+        "vault.hashicorp.com/namespace": "{{ .Values.global.secretsBackend.vault.vaultNamespace }}"
         {{- end }}
         {{- end }}
     spec:

diff --git a/charts/consul/test/unit/mesh-gateway-deployment.bats b/charts/consul/test/unit/mesh-gateway-deployment.bats
@@ -1336,7 +1336,8 @@ key2: value2' \
   cd `chart_dir`
   local cmd=$(helm template \
       -s templates/mesh-gateway-deployment.yaml  \
-      --set 'client.enabled=true' \
+      --set 'connectInject.enabled=true' \
+      --set 'meshGateway.enabled=true' \
       --set 'global.secretsBackend.vault.enabled=true' \
       --set 'global.secretsBackend.vault.consulClientRole=foo' \
       --set 'global.secretsBackend.vault.consulServerRole=bar' \
@@ -1357,7 +1358,8 @@ key2: value2' \
   cd `chart_dir`
   local cmd=$(helm template \
       -s templates/mesh-gateway-deployment.yaml  \
-      --set 'client.enabled=true' \
+      --set 'connectInject.enabled=true' \
+      --set 'meshGateway.enabled=true' \
       --set 'global.secretsBackend.vault.enabled=true' \
       --set 'global.secretsBackend.vault.consulClientRole=foo' \
       --set 'global.secretsBackend.vault.consulServerRole=bar' \

diff --git a/charts/consul/test/unit/partition-init-job.bats b/charts/consul/test/unit/partition-init-job.bats
@@ -330,7 +330,12 @@ reservedNameTest() {
   cd `chart_dir`
   local cmd=$(helm template \
       -s templates/partition-init-job.yaml  \
-      --set 'client.enabled=true' \
+      --set 'global.enabled=false' \
+      --set 'global.adminPartitions.enabled=true' \
+      --set "global.adminPartitions.name=bar" \
+      --set 'global.enableConsulNamespaces=true' \
+      --set 'externalServers.enabled=true' \
+      --set 'externalServers.hosts[0]=foo' \
       --set 'global.secretsBackend.vault.enabled=true' \
       --set 'global.secretsBackend.vault.consulClientRole=foo' \
       --set 'global.secretsBackend.vault.consulServerRole=bar' \
@@ -351,7 +356,12 @@ reservedNameTest() {
   cd `chart_dir`
   local cmd=$(helm template \
       -s templates/partition-init-job.yaml  \
-      --set 'client.enabled=true' \
+      --set 'global.enabled=false' \
+      --set 'global.adminPartitions.enabled=true' \
+      --set "global.adminPartitions.name=bar" \
+      --set 'externalServers.enabled=true' \
+      --set 'externalServers.hosts[0]=foo' \
+      --set 'global.enableConsulNamespaces=true' \
       --set 'global.secretsBackend.vault.enabled=true' \
       --set 'global.secretsBackend.vault.consulClientRole=foo' \
       --set 'global.secretsBackend.vault.consulServerRole=bar' \

diff --git a/charts/consul/test/unit/server-acl-init-job.bats b/charts/consul/test/unit/server-acl-init-job.bats
@@ -692,7 +692,9 @@ load _helpers
   cd `chart_dir`
   local cmd=$(helm template \
       -s templates/server-acl-init-job.yaml  \
-      --set 'client.enabled=true' \
+      --set 'global.acls.manageSystemACLs=true' \
+      --set 'global.acls.bootstrapToken.secretName=foo' \
+      --set 'global.acls.bootstrapToken.secretKey=bar' \
       --set 'global.secretsBackend.vault.enabled=true' \
       --set 'global.secretsBackend.vault.consulClientRole=foo' \
       --set 'global.secretsBackend.vault.consulServerRole=bar' \
@@ -701,6 +703,7 @@ load _helpers
       --set 'global.tls.enabled=true' \
       --set 'global.tls.caCert.secretName=foo' \
       --set 'global.tls.enableAutoEncrypt=true' \
+      --set 'global.secretsBackend.vault.manageSystemACLsRole=aclrole' \
       . | tee /dev/stderr |
       yq -r '.spec.template.metadata' | tee /dev/stderr)
 
@@ -713,7 +716,9 @@ load _helpers
   cd `chart_dir`
   local cmd=$(helm template \
       -s templates/server-acl-init-job.yaml  \
-      --set 'client.enabled=true' \
+      --set 'global.acls.manageSystemACLs=true' \
+      --set 'global.acls.bootstrapToken.secretName=foo' \
+      --set 'global.acls.bootstrapToken.secretKey=bar' \
       --set 'global.secretsBackend.vault.enabled=true' \
       --set 'global.secretsBackend.vault.consulClientRole=foo' \
       --set 'global.secretsBackend.vault.consulServerRole=bar' \
@@ -723,6 +728,7 @@ load _helpers
       --set 'global.tls.enabled=true' \
       --set 'global.tls.caCert.secretName=foo' \
       --set 'global.tls.enableAutoEncrypt=true' \
+      --set 'global.secretsBackend.vault.manageSystemACLsRole=aclrole' \
       . | tee /dev/stderr |
       yq -r '.spec.template.metadata' | tee /dev/stderr)
 

diff --git a/charts/consul/test/unit/sync-catalog-deployment.bats b/charts/consul/test/unit/sync-catalog-deployment.bats
@@ -1074,7 +1074,7 @@ load _helpers
   cd `chart_dir`
   local cmd=$(helm template \
       -s templates/sync-catalog-deployment.yaml  \
-      --set 'client.enabled=true' \
+      --set 'syncCatalog.enabled=true' \
       --set 'global.secretsBackend.vault.enabled=true' \
       --set 'global.secretsBackend.vault.consulClientRole=foo' \
       --set 'global.secretsBackend.vault.consulServerRole=bar' \
@@ -1095,7 +1095,7 @@ load _helpers
   cd `chart_dir`
   local cmd=$(helm template \
       -s templates/sync-catalog-deployment.yaml  \
-      --set 'client.enabled=true' \
+      --set 'syncCatalog.enabled=true' \
       --set 'global.secretsBackend.vault.enabled=true' \
       --set 'global.secretsBackend.vault.consulClientRole=foo' \
       --set 'global.secretsBackend.vault.consulServerRole=bar' \