github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29687 from cjcullen/customuser

Browse Source 
Fix potential unbound KUBE_USER variable in gci/trusty.
This commit is contained in:
Dawn Chen 2016-07-27 11:31:12 -07:00 committed by GitHub
commit 1aaea5fe09
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/gce/gci/configure-helper.sh
View File

@ -653,10 +653,12 @@ function start-kube-apiserver {
fi fi
local -r src_dir="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty" local -r src_dir="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty"
local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl" if [[ -n "${KUBE_USER:-}" ]]; then
remove-salt-config-comments "${abac_policy_json}" local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl"
sed -i -e "s@{{kube_user}}@${KUBE_USER}@g" "${abac_policy_json}" remove-salt-config-comments "${abac_policy_json}"
cp "${abac_policy_json}" /etc/srv/kubernetes/ 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" src_file="${src_dir}/kube-apiserver.manifest"
remove-salt-config-comments "${src_file}" remove-salt-config-comments "${src_file}"

10
cluster/gce/trusty/configure-helper.sh
View File

@ -558,10 +558,12 @@ start_kube_apiserver() {
src_dir="/home/kubernetes/kube-manifests/kubernetes/gci-trusty" src_dir="/home/kubernetes/kube-manifests/kubernetes/gci-trusty"
local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl" if [[ -n "${KUBE_USER:-}" ]]; then
remove_salt_config_comments "${abac_policy_json}" local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl"
sed -i -e "s@{{kube_user}}@${KUBE_USER}@g" "${abac_policy_json}" remove_salt_config_comments "${abac_policy_json}"
cp "${abac_policy_json}" /etc/srv/kubernetes/ 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" src_file="${src_dir}/kube-apiserver.manifest"
remove_salt_config_comments "${src_file}" remove_salt_config_comments "${src_file}"