Fix check for controller ready by using kubectl get nodes
Also removed --register-node=False from kubelet
Change-Id: I751d2970523b5bdfe578deeb081e4d7f2f9793d4
diff --git a/kubernetes/files/kubelet/default.master b/kubernetes/files/kubelet/default.master
index c7329cd..b388671 100644
--- a/kubernetes/files/kubelet/default.master
+++ b/kubernetes/files/kubelet/default.master
@@ -5,7 +5,6 @@
--pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged={{ master.kubelet.allow_privileged }} \
--cluster_dns={{ master.addons.dns.server }} \
---register-node=false \
--cluster_domain={{ master.addons.dns.domain }} \
--cni-bin-dir={{ master.apiserver.get('cni_bin_dir', '/opt/cni/bin') }} \
--v={{ master.get('verbosity', 2) }} \
diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index 1850df8..80c4e53 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -228,16 +228,16 @@
{%- endfor %}
{%- if master.get('unschedulable', 'false') %}
-kubelet_ready:
+kubernetes_node_ready_{{ master.host.name}}:
cmd.run:
- - name: bash -c 'while [[ "$(curl -sS -o /dev/null -w ''%{http_code}'' http://127.0.0.1:10248/healthz)" != "200" ]]; do sleep 5; done'
+ - name: bash -c 'while ! kubectl get nodes {{ master.host.name }}; do sleep 5; done'
- timeout: 180
kubernetes_taint_master_{{ master.host.name }}:
cmd.run:
- name: kubectl taint --overwrite nodes {{ master.host.name }} node-role.kubernetes.io/master=:NoSchedule
- require:
- - cmd: kubelet_ready
+ - cmd: kubernetes_node_ready_{{ master.host.name}}
{%- endif %}
{%- if master.registry.secret is defined %}