Revert "bootstrap: Start hostNetwork pods even if network plugin not ready"

This commit is contained in:
Yu-Ju Hong
2016-10-25 08:38:59 -07:00
committed by GitHub
parent 0dc983a4c0
commit 94f580ef03
9 changed files with 17 additions and 23 deletions

View File

@@ -91,6 +91,7 @@ EOF
if [[ ! -z "${KUBELET_APISERVER:-}" ]] && [[ ! -z "${KUBELET_CERT:-}" ]] && [[ ! -z "${KUBELET_KEY:-}" ]]; then
cat <<EOF >>/etc/salt/minion.d/grains.conf
kubelet_api_servers: '${KUBELET_APISERVER}'
cbr-cidr: 10.123.45.0/29
EOF
else
# If the kubelet is running disconnected from a master, give it a fixed
@@ -109,6 +110,7 @@ salt-node-role() {
grains:
roles:
- kubernetes-pool
cbr-cidr: 10.123.45.0/29
cloud: aws
api_servers: '${API_SERVERS}'
EOF