Skip to content

Commit

Permalink
Replace kubectl's --prune-whitelist with --prune-allowlist
Browse files Browse the repository at this point in the history
The former is no longer supported in latest kubectl versions.
  • Loading branch information
alpeb committed Apr 24, 2024
1 parent 725d76b commit e373272
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 44 deletions.
6 changes: 3 additions & 3 deletions linkerd.io/content/2-edge/tasks/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
```
Expand Down
14 changes: 7 additions & 7 deletions linkerd.io/content/2.10/tasks/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 -
```
Expand Down
14 changes: 7 additions & 7 deletions linkerd.io/content/2.11/tasks/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 -
```
Expand Down
14 changes: 7 additions & 7 deletions linkerd.io/content/2.12/tasks/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 -
```
Expand Down
6 changes: 3 additions & 3 deletions linkerd.io/content/2.13/tasks/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
```
Expand Down
6 changes: 3 additions & 3 deletions linkerd.io/content/2.14/tasks/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
```
Expand Down
6 changes: 3 additions & 3 deletions linkerd.io/content/2.15/tasks/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
```
Expand Down
8 changes: 4 additions & 4 deletions linkerd.io/content/2.9/tasks/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions linkerd.io/data/cli-2-11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions linkerd.io/data/cli-2-12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit e373272

Please sign in to comment.