commit 964f2f75c878eba18ebc31a60d8cb373040f3edc
author Vasyl Saienko <vsaienko@mirantis.com> Tue Mar 05 10:48:34 2019 +0200
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Mon Mar 11 13:45:03 2019 +0000
tree f9571f9ebb87e07c110cc85c5368edb751bd5d33
parent 05fd604f2697159687ef85c7d00fabd783c54433

Add kubernetes.client exclude

When applying whole kubernetes state on control plane we shouldn't run
kubernetes.client state as it will require working compute nodes
which will be added later.

Change-Id: I0335cec4d1f4caa5c201b21fe43d31ece5f55be2
Related-Prod: PROD-27977
(cherry picked from commit d96805b2ba7c8461e90474917650a3a1f85842f0)

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index c6d262a..111a3be 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -656,12 +656,12 @@
         // Run k8s on first node without master.setup and master.kube-addons
         salt.enforceStateWithExclude([saltId: master, target: "${first_target} ${extra_tgt}", state: "kubernetes.master", excludedStates: "kubernetes.master.setup,kubernetes.master.kube-addons"])
         // Run k8s without master.setup and master.kube-addons
-        salt.enforceStateWithExclude([saltId: master, target: "I@kubernetes:master ${extra_tgt}", state: "kubernetes", excludedStates: "kubernetes.master.setup,kubernetes.master.kube-addons"])
+        salt.enforceStateWithExclude([saltId: master, target: "I@kubernetes:master ${extra_tgt}", state: "kubernetes", excludedStates: "kubernetes.master.setup,kubernetes.master.kube-addons,kubernetes.client"])
     } else {
         // Run k8s on first node without master.setup and master.kube-addons
         salt.enforceStateWithExclude([saltId: master, target: "${first_target} ${extra_tgt}", state: "kubernetes.master", excludedStates: "kubernetes.master.setup"])
         // Run k8s without master.setup
-        salt.enforceStateWithExclude([saltId: master, target: "I@kubernetes:master ${extra_tgt}", state: "kubernetes", excludedStates: "kubernetes.master.setup"])
+        salt.enforceStateWithExclude([saltId: master, target: "I@kubernetes:master ${extra_tgt}", state: "kubernetes", excludedStates: "kubernetes.master.setup,kubernetes.client"])
     }
 
     // Run k8s master setup