Merge pull request #78585 from neolit123/kubeadm-fix-upgrade-node

kubeadm: fix conditional control-plane upgrade
2019-06-02 03:02:14 -07:00
parent 0216ccf80a aede153310
commit 79dc1d4c49
1 changed files with 1 additions and 0 deletions
--- a/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go
+++ b/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go
@@ -52,6 +52,7 @@ func runControlPlane() func(c workflow.RunData) error {
 		// if this is not a control-plande node, this phase should not be executed
 		if !data.IsControlPlaneNode() {
 			fmt.Printf("[upgrade] Skipping phase. Not a control plane node")
+			return nil
 		}

 		// otherwise, retrieve all the info required for control plane upgrade