diff --git a/charts/consul/test/unit/client-daemonset.bats b/charts/consul/test/unit/client-daemonset.bats index 09d15b0b5d..497aa51a43 100755 --- a/charts/consul/test/unit/client-daemonset.bats +++ b/charts/consul/test/unit/client-daemonset.bats @@ -1859,9 +1859,9 @@ rollingUpdate: [ "${actual}" = "${expected}" ] } -@test "client/DaemonSet: vault no CONSUL_LICENSE_PATH env variable and command defines CONSUL_LICENSE_PATH" { +@test "client/DaemonSet: vault CONSUL_LICENSE_PATH is set to /vault/secrets/enterpriselicense.txt" { cd `chart_dir` - local object=$(helm template \ + local env=$(helm template \ -s templates/client-daemonset.yaml \ --set 'global.secretsBackend.vault.enabled=true' \ --set 'global.secretsBackend.vault.consulClientRole=foo' \ @@ -1869,16 +1869,12 @@ rollingUpdate: --set 'global.enterpriseLicense.secretName=a/b/c/d' \ --set 'global.enterpriseLicense.secretKey=enterpriselicense' \ . | tee /dev/stderr | - yq -r '.spec.template.spec' | tee /dev/stderr) + yq -r '.spec.template.spec.containers[0].env[]' | tee /dev/stderr) - local actual=$(echo $object | - yq -r '.containers[] | select(.name=="consul") | .env[] | select(.name == "CONSUL_LICENSE_PATH")' | tee /dev/stderr) - [ "${actual}" = "" ] + local actual - local actual=$(echo $object | - yq -r '.containers[] | select(.name=="consul") | .command | any(contains("CONSUL_LICENSE_PATH="))' \ - | tee /dev/stderr) - [ "${actual}" = "true" ] + local actual=$(echo $env | jq -r '. | select(.name == "CONSUL_LICENSE_PATH") | .value' | tee /dev/stderr) + [ "${actual}" = "/vault/secrets/enterpriselicense.txt" ] } @test "client/DaemonSet: vault does not add volume for license secret" { diff --git a/charts/consul/test/unit/client-snapshot-agent-deployment.bats b/charts/consul/test/unit/client-snapshot-agent-deployment.bats index 231ff888e5..8e345189d7 100644 --- a/charts/consul/test/unit/client-snapshot-agent-deployment.bats +++ b/charts/consul/test/unit/client-snapshot-agent-deployment.bats @@ -607,9 +607,9 @@ exec /bin/consul snapshot agent \' [ "${actual}" = "${expected}" ] } -@test "client/SnapshotAgentDeployment: vault no CONSUL_LICENSE_PATH env variable and command defines CONSUL_LICENSE_PATH" { +@test "client/SnapshotAgentDeployment: vault CONSUL_LICENSE_PATH is set to /vault/secrets/enterpriselicense.txt" { cd `chart_dir` - local object=$(helm template \ + local env=$(helm template \ -s templates/client-snapshot-agent-deployment.yaml \ --set 'client.snapshotAgent.enabled=true' \ --set 'global.secretsBackend.vault.enabled=true' \ @@ -618,16 +618,12 @@ exec /bin/consul snapshot agent \' --set 'global.enterpriseLicense.secretName=a/b/c/d' \ --set 'global.enterpriseLicense.secretKey=enterpriselicense' \ . | tee /dev/stderr | - yq -r '.spec.template.spec' | tee /dev/stderr) + yq -r '.spec.template.spec.containers[0].env[]' | tee /dev/stderr) - local actual=$(echo $object | - yq -r '.containers[] | select(.name=="consul-snapshot-agent") | .env[] | select(.name == "CONSUL_LICENSE_PATH")' | tee /dev/stderr) - [ "${actual}" = "" ] + local actual - local actual=$(echo $object | - yq -r '.containers[] | select(.name=="consul-snapshot-agent") | .command | any(contains("CONSUL_LICENSE_PATH="))' \ - | tee /dev/stderr) - [ "${actual}" = "true" ] + local actual=$(echo $env | jq -r '. | select(.name == "CONSUL_LICENSE_PATH") | .value' | tee /dev/stderr) + [ "${actual}" = "/vault/secrets/enterpriselicense.txt" ] } @test "client/SnapshotAgentDeployment: vault does not add volume for license secret" { diff --git a/charts/consul/test/unit/server-statefulset.bats b/charts/consul/test/unit/server-statefulset.bats index 6f4cf6d9dd..b6942c3912 100755 --- a/charts/consul/test/unit/server-statefulset.bats +++ b/charts/consul/test/unit/server-statefulset.bats @@ -1888,26 +1888,22 @@ load _helpers [ "${actual}" = "${expected}" ] } -@test "server/StatefulSet: vault no CONSUL_LICENSE_PATH env variable and command defines CONSUL_LICENSE_PATH" { +@test "server/StatefulSet: vault CONSUL_LICENSE_PATH is set to /vault/secrets/enterpriselicense.txt" { cd `chart_dir` - local object=$(helm template \ - -s templates/server-statefulset.yaml \ + local env=$(helm template \ + -s templates/server-statefulset.yaml \ --set 'global.secretsBackend.vault.enabled=true' \ --set 'global.secretsBackend.vault.consulClientRole=foo' \ --set 'global.secretsBackend.vault.consulServerRole=test' \ --set 'global.enterpriseLicense.secretName=a/b/c/d' \ --set 'global.enterpriseLicense.secretKey=enterpriselicense' \ . | tee /dev/stderr | - yq -r '.spec.template.spec' | tee /dev/stderr) + yq -r '.spec.template.spec.containers[0].env[]' | tee /dev/stderr) - local actual=$(echo $object | - yq -r '.containers[] | select(.name=="consul") | .env[] | select(.name == "CONSUL_LICENSE_PATH")' | tee /dev/stderr) - [ "${actual}" = "" ] + local actual - local actual=$(echo $object | - yq -r '.containers[] | select(.name=="consul") | .command | any(contains("CONSUL_LICENSE_PATH="))' \ - | tee /dev/stderr) - [ "${actual}" = "true" ] + local actual=$(echo $env | jq -r '. | select(.name == "CONSUL_LICENSE_PATH") | .value' | tee /dev/stderr) + [ "${actual}" = "/vault/secrets/enterpriselicense.txt" ] } @test "server/StatefulSet: vault does not add volume for license secret" {