github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85344 from jkaniuk/prune-whitelist

Browse Source 
Addon Manager: Fix parsing KUBECTL_EXTRA_PRUNE_WHITELIST
This commit is contained in:
Kubernetes Prow Robot 2019-11-18 05:25:42 -08:00 committed by GitHub
commit 5bac42bff9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/addon-manager/kube-addons.sh
View File

@ -120,7 +120,7 @@ function generate_prune_whitelist_flags() {
# besides the default ones. # besides the default ones.
extra_prune_whitelist= extra_prune_whitelist=
if [ -n "${KUBECTL_EXTRA_PRUNE_WHITELIST:-}" ]; then if [ -n "${KUBECTL_EXTRA_PRUNE_WHITELIST:-}" ]; then
extra_prune_whitelist=( "${KUBECTL_EXTRA_PRUNE_WHITELIST:-}" ) read -ra extra_prune_whitelist <<< "${KUBECTL_EXTRA_PRUNE_WHITELIST}"
fi fi
prune_whitelist=( "${KUBECTL_PRUNE_WHITELIST[@]}" "${extra_prune_whitelist[@]}" ) prune_whitelist=( "${KUBECTL_PRUNE_WHITELIST[@]}" "${extra_prune_whitelist[@]}" )
prune_whitelist_flags=$(generate_prune_whitelist_flags "${prune_whitelist[@]}") prune_whitelist_flags=$(generate_prune_whitelist_flags "${prune_whitelist[@]}")