diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 5306d236716..2365542379e 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -653,10 +653,12 @@ function start-kube-apiserver { fi local -r src_dir="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty" - local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl" - remove-salt-config-comments "${abac_policy_json}" - sed -i -e "s@{{kube_user}}@${KUBE_USER}@g" "${abac_policy_json}" - cp "${abac_policy_json}" /etc/srv/kubernetes/ + if [[ -n "${KUBE_USER:-}" ]]; then + local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl" + remove-salt-config-comments "${abac_policy_json}" + sed -i -e "s@{{kube_user}}@${KUBE_USER}@g" "${abac_policy_json}" + cp "${abac_policy_json}" /etc/srv/kubernetes/ + fi src_file="${src_dir}/kube-apiserver.manifest" remove-salt-config-comments "${src_file}" diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index 2df724088d3..691cca0da3e 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -558,10 +558,12 @@ start_kube_apiserver() { src_dir="/home/kubernetes/kube-manifests/kubernetes/gci-trusty" - local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl" - remove_salt_config_comments "${abac_policy_json}" - sed -i -e "s@{{kube_user}}@${KUBE_USER}@g" "${abac_policy_json}" - cp "${abac_policy_json}" /etc/srv/kubernetes/ + if [[ -n "${KUBE_USER:-}" ]]; then + local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl" + remove_salt_config_comments "${abac_policy_json}" + sed -i -e "s@{{kube_user}}@${KUBE_USER}@g" "${abac_policy_json}" + cp "${abac_policy_json}" /etc/srv/kubernetes/ + fi src_file="${src_dir}/kube-apiserver.manifest" remove_salt_config_comments "${src_file}"