Skip to content

K
k3s
Commit d79c8fe4 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #49898 from mikedanese/clober-tokens

Automatic merge from submit-queue (batch tested with PRs 49898, 49897, 49919, 48860, 49491) gce: extend CLOBBER_CONFIG to support known_tokens.csv Helps with #49895
parents 5941f7b6 a1209067
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cluster/gce/gci/configure-helper.sh
View file @ d79c8fe4
...@@ -359,7 +359,11 @@ function create-master-auth { ...@@ -359,7 +359,11 @@ function create-master-auth {
fi fi
append_or_replace_prefixed_line "${basic_auth_csv}" "${KUBE_PASSWORD},${KUBE_USER}," "admin,system:masters" append_or_replace_prefixed_line "${basic_auth_csv}" "${KUBE_PASSWORD},${KUBE_USER}," "admin,system:masters"
fi fi
local -r known_tokens_csv="${auth_dir}/known_tokens.csv" local -r known_tokens_csv="${auth_dir}/known_tokens.csv"
if [[ -e "${known_tokens_csv}" && "${METADATA_CLOBBERS_CONFIG:-false}" == "true" ]]; then
rm "${known_tokens_csv}"
fi
if [[ -n "${KUBE_BEARER_TOKEN:-}" ]]; then if [[ -n "${KUBE_BEARER_TOKEN:-}" ]]; then
append_or_replace_prefixed_line "${known_tokens_csv}" "${KUBE_BEARER_TOKEN}," "admin,admin,system:masters" append_or_replace_prefixed_line "${known_tokens_csv}" "${KUBE_BEARER_TOKEN}," "admin,admin,system:masters"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment