Replace kubectl's --prune-whitelist with --prune-allowlist (#12496)

linkerd · Apr 24, 2024 · 7545d13 · 7545d13
1 parent 2d5085b
commit 7545d13
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/test/integration/install/install_test.go b/test/integration/install/install_test.go
@@ -167,9 +167,9 @@ func TestInstallOrUpgradeCli(t *testing.T) {
 		out, err = TestHelper.KubectlApplyWithArgs(out, []string{
 			"--prune",
 			"-l", "linkerd.io/control-plane-ns=linkerd",
-			"--prune-whitelist", "rbac.authorization.k8s.io/v1/clusterrole",
-			"--prune-whitelist", "rbac.authorization.k8s.io/v1/clusterrolebinding",
-			"--prune-whitelist", "apiregistration.k8s.io/v1/apiservice",
+			"--prune-allowlist", "rbac.authorization.k8s.io/v1/clusterrole",
+			"--prune-allowlist", "rbac.authorization.k8s.io/v1/clusterrolebinding",
+			"--prune-allowlist", "apiregistration.k8s.io/v1/apiservice",
 		}...)
 		if err != nil {
 			testutil.AnnotatedFatalf(t, "'kubectl apply' command failed",
@@ -255,9 +255,9 @@ func TestInstallOrUpgradeCli(t *testing.T) {
 	cmdOut, err := TestHelper.KubectlApplyWithArgs(out, []string{
 		"--prune",
 		"-l", "linkerd.io/control-plane-ns=linkerd",
-		"--prune-whitelist", "apps/v1/deployment",
-		"--prune-whitelist", "core/v1/service",
-		"--prune-whitelist", "core/v1/configmap",
+		"--prune-allowlist", "apps/v1/deployment",
+		"--prune-allowlist", "core/v1/service",
+		"--prune-allowlist", "core/v1/configmap",
 	}...)
 	if err != nil {
 		testutil.AnnotatedFatalf(t, "'kubectl apply' command failed",

diff --git a/test/integration/upgrade-edge/upgrade_edge_test.go b/test/integration/upgrade-edge/upgrade_edge_test.go
@@ -213,9 +213,9 @@ func TestUpgradeCli(t *testing.T) {
 	cmdOut, err = TestHelper.KubectlApplyWithArgs(out, []string{
 		"--prune",
 		"-l", "linkerd.io/control-plane-ns=linkerd",
-		"--prune-whitelist", "apps/v1/deployment",
-		"--prune-whitelist", "core/v1/service",
-		"--prune-whitelist", "core/v1/configmap",
+		"--prune-allowlist", "apps/v1/deployment",
+		"--prune-allowlist", "core/v1/service",
+		"--prune-allowlist", "core/v1/configmap",
 	}...)
 	if err != nil {
 		testutil.AnnotatedFatalf(t, "'kubectl apply' command failed",

diff --git a/test/integration/upgrade-stable/upgrade_stable_test.go b/test/integration/upgrade-stable/upgrade_stable_test.go
@@ -226,9 +226,9 @@ func TestUpgradeCli(t *testing.T) {
 	cmdOut, err = TestHelper.KubectlApplyWithArgs(out, []string{
 		"--prune",
 		"-l", "linkerd.io/control-plane-ns=linkerd",
-		"--prune-whitelist", "apps/v1/deployment",
-		"--prune-whitelist", "core/v1/service",
-		"--prune-whitelist", "core/v1/configmap",
+		"--prune-allowlist", "apps/v1/deployment",
+		"--prune-allowlist", "core/v1/service",
+		"--prune-allowlist", "core/v1/configmap",
 	}...)
 	if err != nil {
 		testutil.AnnotatedFatalf(t, "'kubectl apply' command failed",