fixes for kubernetes boostrap
Change-Id: I0fdbe768908836462ee08c955bbd071faa719cd1
diff --git a/kubernetes/master/kube-addons.sls b/kubernetes/master/kube-addons.sls
index d1b4b37..d50c8c9 100644
--- a/kubernetes/master/kube-addons.sls
+++ b/kubernetes/master/kube-addons.sls
@@ -49,7 +49,7 @@
create_dashboard:
cmd.run:
- name: hyperkube kubectl create -f /etc/kubernetes/addons/dashboard/
- - unless: hyperkube kubectl describe rc kubernetes-dashboard-v1.1.0 --namespace=kube-system
+ - unless: hyperkube kubectl get rc --namespace=kube-system | grep dashboard
- require:
- service: kubelet
@@ -126,4 +126,4 @@
{% endif %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/kubernetes/pool/cni.sls b/kubernetes/pool/cni.sls
index 76db340..8c696bc 100644
--- a/kubernetes/pool/cni.sls
+++ b/kubernetes/pool/cni.sls
@@ -4,7 +4,6 @@
cni-tar:
archive:
- extracted
- - user: root
- name: /opt/cni/bin
- source: https://github.com/containernetworking/cni/releases/download/{{ pool.cni.version }}/cni-{{ pool.cni.version }}.tgz
- tar_options: v
@@ -12,4 +11,4 @@
- archive_format: tar
- if_missing: /opt/cni/bin/loopback
-{%- endif %}
\ No newline at end of file
+{%- endif %}