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

Addon Manager: Fix parsing KUBECTL_EXTRA_PRUNE_WHITELIST

Browse Source 
When there are two or more values in KUBECTL_EXTRA_PRUNE_WHITELIST
kube-addons.sh wrongly generates "--prune-whitelist value1 value2"
Which kubectl parses as additional unknown flag[s]

Change-Id: I7661bda41ab7435e0e65eb0a662d1b16d2c14991
This commit is contained in:
Jacek Kaniuk 2019-11-15 12:54:27 +01:00
parent 8548a253de
commit 936ee6fb15
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[@]}")