Merge 9bdb469 into backport/dans/NET-4256/helm-resource-values-for-se…

…rver-acl-init/sincerely-immortal-tapir
hashicorp · Jun 23, 2023 · 2e42f10 · 2e42f10
2 parents 66b6640 + 9bdb469
commit 2e42f10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/charts/consul/test/unit/server-acl-init-cleanup-job.bats b/charts/consul/test/unit/server-acl-init-cleanup-job.bats
@@ -166,7 +166,8 @@ load _helpers
 @test "serverACLInitCleanup/Job: resources defined by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -s templates/server-acl-init-cleanup-job.yaml  \
+      -s templates/server-acl-init-cleanup-job.yaml \
+      --set 'global.acls.manageSystemACLs=true' \
       . | tee /dev/stderr |
       yq -rc '.spec.template.spec.containers[0].resources' | tee /dev/stderr)
   [ "${actual}" = '{"limits":{"cpu":"50m","memory":"50Mi"},"requests":{"cpu":"50m","memory":"50Mi"}}' ]
@@ -175,7 +176,8 @@ load _helpers
 @test "serverACLInitCleanup/Job: resources can be overridden" {
   cd `chart_dir`
   local actual=$(helm template \
-      -s templates/server-acl-init-cleanup-job.yaml  \
+      -s templates/server-acl-init-cleanup-job.yaml \
+      --set 'global.acls.manageSystemACLs=true' \
       --set 'global.acls.resources.foo=bar' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].resources.foo' | tee /dev/stderr)

diff --git a/charts/consul/test/unit/server-acl-init-job.bats b/charts/consul/test/unit/server-acl-init-job.bats
@@ -2209,7 +2209,8 @@ load _helpers
 @test "serverACLInit/Job: resources defined by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -s templates/server-acl-init-job.yaml  \
+      -s templates/server-acl-init-job.yaml \
+      --set 'global.acls.manageSystemACLs=true' \
       . | tee /dev/stderr |
       yq -rc '.spec.template.spec.containers[0].resources' | tee /dev/stderr)
   [ "${actual}" = '{"limits":{"cpu":"50m","memory":"50Mi"},"requests":{"cpu":"50m","memory":"50Mi"}}' ]
@@ -2218,7 +2219,8 @@ load _helpers
 @test "serverACLInit/Job: resources can be overridden" {
   cd `chart_dir`
   local actual=$(helm template \
-      -s templates/server-acl-init-job.yaml  \
+      -s templates/server-acl-init-job.yaml \
+      --set 'global.acls.manageSystemACLs=true' \
       --set 'global.acls.resources.foo=bar' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].resources.foo' | tee /dev/stderr)