Merge "Upgrade k8s addons after control plane upgrade"
diff --git a/k8s-upgrade-pipeline.groovy b/k8s-upgrade-pipeline.groovy
index 530a256..98a4338 100644
--- a/k8s-upgrade-pipeline.groovy
+++ b/k8s-upgrade-pipeline.groovy
@@ -95,6 +95,13 @@
stage("Upgrading Addons at ${target}") {
salt.enforceState(pepperEnv, target, "kubernetes.master.kube-addons")
+ }
+}
+
+def updateAddonManager(pepperEnv, target) {
+ def salt = new com.mirantis.mk.Salt()
+
+ stage("Upgrading AddonManager at ${target}") {
salt.enforceState(pepperEnv, target, "kubernetes.master.setup")
}
}
@@ -139,13 +146,19 @@
upgradeDocker(pepperEnv, t)
}
performKubernetesControlUpdate(pepperEnv, t)
- updateAddons(pepperEnv, t)
+ updateAddonManager(pepperEnv, t)
uncordonNode(pepperEnv, t)
}
}
} else {
performKubernetesControlUpdate(pepperEnv, target)
}
+ if (!SIMPLE_UPGRADE.toBoolean()) {
+ // Addons upgrade should be performed after all nodes will upgraded
+ updateAddons(pepperEnv, target)
+ // Wait for 90 sec for addons reconciling
+ sleep(90)
+ }
}
if (updates.contains("cmp")) {