github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 12:17:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31486 from jlowdermilk/feature-gate-salt

Browse Source 
Automatic merge from submit-queue

fix feature_gates salt plumbing

Fix salt plumbing for `--feature-gate` from `FEATURE_GATES kube env.

Was generating grains.conf and kube-env for master only. Verified it works now for gci and debian master/nodes.

cc @thockin @timstclair
This commit is contained in:
Kubernetes Submit Queue
2016-08-26 22:43:02 -07:00
committed by GitHub
parent eada47a1ef e7c42280f8
commit 35ddfcba1a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/configure-vm.sh
View File

@@ -960,7 +960,6 @@ EOF
fi
env-to-grains "runtime_config"
env-to-grains "feature_gates"
env-to-grains "kube_user"
}
@@ -1004,6 +1003,7 @@ function salt-grains() {
env-to-grains "docker_opts"
env-to-grains "docker_root"
env-to-grains "kubelet_root"
env-to-grains "feature_gates"
}
function configure-salt() {