From 1769af78fa6ce9aa9cd4411673beace2fc72cd95 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Fri, 21 Apr 2017 15:58:39 -0700 Subject: [PATCH] Comment extension --- cluster/gce/gci/configure-helper.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 827681d31dc..66cfdae6865 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -286,8 +286,11 @@ function create-master-auth { local -r auth_dir="/etc/srv/kubernetes" local -r basic_auth_csv="${auth_dir}/basic_auth.csv" if [[ -n "${KUBE_PASSWORD:-}" && -n "${KUBE_USER:-}" ]]; then - # Remove basic_auth_csv because we will rewrite it. if [[ -e "${basic_auth_csv}" && "${METADATA_CLOBBERS_CONFIG:-false}" == "true" ]]; then + # If METADATA_CLOBBERS_CONFIG is true, we want to rewrite the file + # completely, because if we're changing KUBE_USER and KUBE_PASSWORD, we + # have nothing to match on. The file is replaced just below with + # append_or_replace_prefixed_line. rm "${basic_auth_csv}" fi append_or_replace_prefixed_line "${basic_auth_csv}" "${KUBE_PASSWORD},${KUBE_USER}," "admin,system:masters"