Merge pull request #42853 from mikedanese/fix-bug

Automatic merge from submit-queue (batch tested with PRs 42877, 42853) discriminate more when parsing kube-env :( Exactly match the key. Right now CA_KEY matches ETCD_CA_KEY and we just pick the first because fml. I HATE BASH more fixes for kubelet rbac enablement upgrades.

Merge pull request #42853 from mikedanese/fix-bug
60dd611d · Kubernetes Submit Queue · GitHub · e261cabb · 1b8084fc · 60dd611d
Commit 60dd611d authored Mar 10, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.sh cluster/common.sh +1 -1

No files found.
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -1052,7 +1052,7 @@ function generate-certs {
 # $1 master env (kube-env of master; result of calling get-master-env)
 # $2 env key to use
 function get-env-val() {
-  local match=`(echo "${1}" | grep ${2}) || echo ""`
+  local match=`(echo "${1}" | grep -E "^${2}:") || echo ""`
  if [[ -z ${match} ]]; then
    echo ""
  fi