commit b3a2c0905044d31e0481d7cb8106223a47bc677e
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Mar 22 11:56:30 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Mar 22 11:56:30 2019 +0000
tree d75c092f1f0ba120c16fb186c6402628ffab1a20
parent cfc7cf5c0b50d3ed15222802a427b3df435f1d7d
parent 76145167bc7cc74db7a2048635244c821207fe38

Merge "Execute namespace creation/removal only if namespaces defined" into release/2019.2.0

kubernetes/master/controller.sls

diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index 112f2d7..fe95cbd 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -335,6 +335,7 @@
 
 {%- endif %}
 
+{%- if master.namespace is defined %}
 
 {%- for name,namespace in master.namespace.items() %}
 
@@ -360,6 +361,8 @@
 
 {%- endfor %}
 
+{%- endif %}
+
 {%- if master.registry.secret is defined %}
 
 {%- for name,registry in master.registry.secret.items() %}