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

Merge pull request #31177 from jlowdermilk/fix-feature-gates 

Automatic merge from submit-queue

fix feature_gate env plumbing

Fix gci configure-helper.sh plumbing.
pull/6/head
Kubernetes Submit Queue 2016-08-22 23:38:41 -07:00 committed by GitHub
parent 5866476a89 5def8f674a
commit f696fd4b5c
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/gce/gci/configure-helper.sh
View File

@ -504,7 +504,7 @@ function start-kubelet {
flags+=" --configure-cbr0=${ALLOCATE_NODE_CIDRS}"
fi
if [[ -n "${FEATURE_GATES:-}" ]]; then
flags+=" --feature-gates=${feature_gates}"
flags+=" --feature-gates=${FEATURE_GATES}"
fi
echo "KUBELET_OPTS=\"${flags}\"" > /etc/default/kubelet