From e37327233d0921e416eb1056d0ee8301f20e8c88 Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Wed, 24 Apr 2024 14:59:40 -0500 Subject: [PATCH] Replace kubectl's `--prune-whitelist` with `--prune-allowlist` The former is no longer supported in latest kubectl versions. --- linkerd.io/content/2-edge/tasks/upgrade.md | 6 +++--- linkerd.io/content/2.10/tasks/upgrade.md | 14 +++++++------- linkerd.io/content/2.11/tasks/upgrade.md | 14 +++++++------- linkerd.io/content/2.12/tasks/upgrade.md | 14 +++++++------- linkerd.io/content/2.13/tasks/upgrade.md | 6 +++--- linkerd.io/content/2.14/tasks/upgrade.md | 6 +++--- linkerd.io/content/2.15/tasks/upgrade.md | 6 +++--- linkerd.io/content/2.9/tasks/upgrade.md | 8 ++++---- linkerd.io/data/cli-2-11.yaml | 6 +++--- linkerd.io/data/cli-2-12.yaml | 8 ++++---- 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/linkerd.io/content/2-edge/tasks/upgrade.md b/linkerd.io/content/2-edge/tasks/upgrade.md index 0ae9a86c7b..71fecedc61 100644 --- a/linkerd.io/content/2-edge/tasks/upgrade.md +++ b/linkerd.io/content/2-edge/tasks/upgrade.md @@ -571,9 +571,9 @@ and then invoke those commands through `linkerd viz stat`, linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - # Prune cluster-scoped resources linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - # Install the Linkerd-Viz extension to restore viz functionality. linkerd viz install | kubectl apply -f - ``` diff --git a/linkerd.io/content/2.10/tasks/upgrade.md b/linkerd.io/content/2.10/tasks/upgrade.md index 047d4603c1..3bb4c692b9 100644 --- a/linkerd.io/content/2.10/tasks/upgrade.md +++ b/linkerd.io/content/2.10/tasks/upgrade.md @@ -90,15 +90,15 @@ resources from the previous version which no longer exist in the new version. linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - ``` -Next, run this command again with some `--prune-whitelist` flags added. This is +Next, run this command again with some `--prune-allowlist` flags added. This is necessary to make sure that certain cluster-scoped resources are correctly pruned. ```bash linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - ``` For upgrading a multi-stage installation setup, follow the instructions at @@ -224,9 +224,9 @@ and then invoke those commands through `linkerd viz stat`, linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - # Prune cluster-scoped resources linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - # Install the Linkerd-Viz extension to restore viz functionality. linkerd viz install | kubectl apply -f - ``` diff --git a/linkerd.io/content/2.11/tasks/upgrade.md b/linkerd.io/content/2.11/tasks/upgrade.md index 88ed6f3a11..79010faf20 100644 --- a/linkerd.io/content/2.11/tasks/upgrade.md +++ b/linkerd.io/content/2.11/tasks/upgrade.md @@ -118,15 +118,15 @@ which no longer exist in the new version. linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - ``` -Next, run this command again with some `--prune-whitelist` flags added. This is +Next, run this command again with some `--prune-allowlist` flags added. This is necessary to make sure that certain cluster-scoped resources are correctly pruned. ```bash linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - ``` ### With Helm @@ -340,9 +340,9 @@ and then invoke those commands through `linkerd viz stat`, linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - # Prune cluster-scoped resources linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - # Install the Linkerd-Viz extension to restore viz functionality. linkerd viz install | kubectl apply -f - ``` diff --git a/linkerd.io/content/2.12/tasks/upgrade.md b/linkerd.io/content/2.12/tasks/upgrade.md index 67c8b82372..3b7237d82e 100644 --- a/linkerd.io/content/2.12/tasks/upgrade.md +++ b/linkerd.io/content/2.12/tasks/upgrade.md @@ -119,15 +119,15 @@ which no longer exist in the new version. linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - ``` -Next, run this command again with some `--prune-whitelist` flags added. This is +Next, run this command again with some `--prune-allowlist` flags added. This is necessary to make sure that certain cluster-scoped resources are correctly pruned. ```bash linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - ``` ### With Helm @@ -547,9 +547,9 @@ and then invoke those commands through `linkerd viz stat`, linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - # Prune cluster-scoped resources linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - # Install the Linkerd-Viz extension to restore viz functionality. linkerd viz install | kubectl apply -f - ``` diff --git a/linkerd.io/content/2.13/tasks/upgrade.md b/linkerd.io/content/2.13/tasks/upgrade.md index 5f18ce96fe..e8e96c554f 100644 --- a/linkerd.io/content/2.13/tasks/upgrade.md +++ b/linkerd.io/content/2.13/tasks/upgrade.md @@ -560,9 +560,9 @@ and then invoke those commands through `linkerd viz stat`, linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - # Prune cluster-scoped resources linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - # Install the Linkerd-Viz extension to restore viz functionality. linkerd viz install | kubectl apply -f - ``` diff --git a/linkerd.io/content/2.14/tasks/upgrade.md b/linkerd.io/content/2.14/tasks/upgrade.md index c34c8fe026..3870076aca 100644 --- a/linkerd.io/content/2.14/tasks/upgrade.md +++ b/linkerd.io/content/2.14/tasks/upgrade.md @@ -575,9 +575,9 @@ and then invoke those commands through `linkerd viz stat`, linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - # Prune cluster-scoped resources linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - # Install the Linkerd-Viz extension to restore viz functionality. linkerd viz install | kubectl apply -f - ``` diff --git a/linkerd.io/content/2.15/tasks/upgrade.md b/linkerd.io/content/2.15/tasks/upgrade.md index 9b66adb6a7..336b464456 100644 --- a/linkerd.io/content/2.15/tasks/upgrade.md +++ b/linkerd.io/content/2.15/tasks/upgrade.md @@ -590,9 +590,9 @@ and then invoke those commands through `linkerd viz stat`, linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - # Prune cluster-scoped resources linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - # Install the Linkerd-Viz extension to restore viz functionality. linkerd viz install | kubectl apply -f - ``` diff --git a/linkerd.io/content/2.9/tasks/upgrade.md b/linkerd.io/content/2.9/tasks/upgrade.md index 8eec3e9664..67d280c49f 100644 --- a/linkerd.io/content/2.9/tasks/upgrade.md +++ b/linkerd.io/content/2.9/tasks/upgrade.md @@ -86,15 +86,15 @@ resources from the previous version which no longer exist in the new version. linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - ``` -Next, run this command again with some `--prune-whitelist` flags added. This is +Next, run this command again with some `--prune-allowlist` flags added. This is necessary to make sure that certain cluster-scoped resources are correctly pruned. ```bash linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - ``` For upgrading a multi-stage installation setup, follow the instructions at diff --git a/linkerd.io/data/cli-2-11.yaml b/linkerd.io/data/cli-2-11.yaml index 8d50ee9a49..371273c891 100644 --- a/linkerd.io/data/cli-2-11.yaml +++ b/linkerd.io/data/cli-2-11.yaml @@ -1942,9 +1942,9 @@ CLIReference: # Then run this again to make sure that certain cluster-scoped resources are correctly pruned linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - # Similar to install, upgrade may also be broken up into two stages, by user # privilege. diff --git a/linkerd.io/data/cli-2-12.yaml b/linkerd.io/data/cli-2-12.yaml index 5aab7505e8..32da2ae854 100644 --- a/linkerd.io/data/cli-2-12.yaml +++ b/linkerd.io/data/cli-2-12.yaml @@ -1415,16 +1415,16 @@ CLIReference: A full list of configurable values can be found at https://www.github.com/linkerd/linkerd2/tree/main/charts/linkerd2/README.md Example: |2- # Upgrade CRDs first - linkerd upgrade --crds | kubectl apply --prune --prune-whitelist=apiextensions.k8s.io/v1/customresourcedefinitions + linkerd upgrade --crds | kubectl apply --prune --prune-allowlist=apiextensions.k8s.io/v1/customresourcedefinitions # Then upgrade the controle-plane and remove linkerd resources that no longer exist in the current version linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f - # Then run this again to make sure that certain cluster-scoped resources are correctly pruned linkerd upgrade | kubectl apply --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 -f - + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrole \ + --prune-allowlist=rbac.authorization.k8s.io/v1/clusterrolebinding \ + --prune-allowlist=apiregistration.k8s.io/v1/apiservice -f - InheritedOptions: null Name: upgrade Options: