Merge pull request kubernetes#129452 from SataQiu/fix-20250102

k8s-ci-robot · web-flow · commit 87cf098f34b6 · 2025-01-02T12:00:14.000+01:00
kubeadm: fix a bug where the 'node.skipPhases' in UpgradeConfiguration is not respected by 'kubeadm upgrade node' command
diff --git a/cmd/kubeadm/app/cmd/upgrade/node.go b/cmd/kubeadm/app/cmd/upgrade/node.go
@@ -87,6 +87,13 @@ func newCmdNode(out io.Writer) *cobra.Command {
 				return err
 			}
 
+			data, err := nodeRunner.InitData(args)
+			if err != nil {
+				return err
+			}
+			if _, ok := data.(*nodeData); !ok {
+				return errors.New("invalid data struct")
+			}
 			if err := nodeRunner.Run(args); err != nil {
 				return err
 			}

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,13 @@ func newCmdNode(out io.Writer) *cobra.Command {`
`87`	`87`	`return err`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ data, err := nodeRunner.InitData(args)`
	`91`	`+ if err != nil {`
	`92`	`+ return err`
	`93`	`+ }`
	`94`	`+ if _, ok := data.(*nodeData); !ok {`
	`95`	`+ return errors.New("invalid data struct")`
	`96`	`+ }`
`90`	`97`	`if err := nodeRunner.Run(args); err != nil {`
`91`	`98`	`return err`
`92`	`99`	`}`