github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/6/head
Kubernetes Submit Queue 2017-03-10 09:54:23 -08:00 committed by GitHub
parent e261cabb09 1b8084fc2f
commit 60dd611da5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/common.sh
View File

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