diff --git a/templates/server-acl-init-job.yaml b/templates/server-acl-init-job.yaml index 532dcfbba..24cd6197f 100644 --- a/templates/server-acl-init-job.yaml +++ b/templates/server-acl-init-job.yaml @@ -2,7 +2,7 @@ {{- if (and $serverEnabled .Values.externalServers.enabled) }}{{ fail "only one of server.enabled or externalServers.enabled can be set" }}{{ end -}} {{- if (or $serverEnabled .Values.externalServers.enabled) }} {{- if and .Values.global.acls.createReplicationToken (not .Values.global.acls.manageSystemACLs) }}{{ fail "if global.acls.createReplicationToken is true, global.acls.manageSystemACLs must be true" }}{{ end -}} -{{- if .Values.global.bootstrapACLs }}{{ fail "global.bootstrapACLs is removed, use global.acls.manageSystemACLs instead" }}{{ end -}} +{{- if .Values.global.bootstrapACLs }}{{ fail "global.bootstrapACLs was removed, use global.acls.manageSystemACLs instead" }}{{ end -}} {{- if .Values.global.acls.manageSystemACLs }} {{- /* We don't render this job when server.updatePartition > 0 because that means a server rollout is in progress and this job won't complete unless diff --git a/test/unit/server-acl-init-job.bats b/test/unit/server-acl-init-job.bats index 0e83f20e6..e2b94c8e0 100644 --- a/test/unit/server-acl-init-job.bats +++ b/test/unit/server-acl-init-job.bats @@ -102,7 +102,7 @@ load _helpers -x templates/server-acl-init-job.yaml \ --set 'global.bootstrapACLs=true' . [ "$status" -eq 1 ] - [[ "$output" =~ "global.bootstrapACLs is removed, use global.acls.manageSystemACLs instead" ]] + [[ "$output" =~ "global.bootstrapACLs was removed, use global.acls.manageSystemACLs instead" ]] } @test "serverACLInit/Job: does not set -create-client-token=false when client is enabled (the default)" {