From ec1a3974baff1c862ff2d09c3d6d7650f53cd1ed Mon Sep 17 00:00:00 2001 From: SataQiu Date: Thu, 2 Jan 2025 17:44:05 +0800 Subject: [PATCH] kubeadm: fix a bug where the node.skipPhases in UpgradeNodeConfiguration is not respected by 'kubeadm upgrade node' --- cmd/kubeadm/app/cmd/upgrade/node.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/cmd/upgrade/node.go b/cmd/kubeadm/app/cmd/upgrade/node.go index 90eea2875f1..1f10efe0251 100644 --- a/cmd/kubeadm/app/cmd/upgrade/node.go +++ b/cmd/kubeadm/app/cmd/upgrade/node.go @@ -17,6 +17,7 @@ limitations under the License. package upgrade import ( + "fmt" "io" "os" @@ -83,7 +84,22 @@ func newCmdNode(out io.Writer) *cobra.Command { return err } - return nodeRunner.Run(args) + 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 + } + if nodeOptions.dryRun { + fmt.Println("[upgrade/successful] Finished dryrunning successfully!") + return nil + } + + return nil }, Args: cobra.NoArgs, }