Adjust ns create part
Change-Id: Iafb60fb2d96af5536a00b547994863b29760e9e6
Related-PROD: PROD-27534 (PROD:27534)
diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index 90de94d..231f648 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -344,7 +344,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: