Merge "Add kubernets.client state" into release/2019.2.0
diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index aaabd23..92c2856 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -36,6 +36,7 @@
/etc/containerd/config.toml:
file.managed:
- source: salt://kubernetes/files/containerd/config.toml
+ - makedirs: True
- template: jinja
- user: root
- group: root
diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index fe95cbd..19b744c 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -346,7 +346,11 @@
kubernetes_namespace_create_{{ name }}:
cmd.run:
- name: kubectl create ns "{{ name }}"
- - name: kubectl get ns -o=custom-columns=NAME:.metadata.name | grep -v NAME | grep "{{ name }}" > /dev/null || kubectl create ns "{{ name }}"
+ - unless: kubectl get ns -o=custom-columns=NAME:.metadata.name | grep -v NAME | grep "{{ name }}"
+ - retry:
+ attempts: 3
+ until: True
+ interval: 10
{%- if grains.get('noservices') %}
- onlyif: /bin/false
{%- endif %}
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index afeb317..c611cda 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -47,9 +47,6 @@
ca: kubernetes
storage:
engine: none
- namespace:
- kube-system:
- enabled: True
network:
calico:
etcd:
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index be5d701..a9314b1 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -65,9 +65,6 @@
ca: kubernetes
storage:
engine: none
- namespace:
- kube-system:
- enabled: True
network:
calico:
etcd: