Merge pull request kubernetes#130023 from SataQiu/fix-20250207

kubeadm: add --etcd-upgrade flag to kubeadm upgrade plan

Author: k8s-ci-robot

cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go

@@ -169,5 +169,7 @@ func fuzzUpgradeConfiguration(obj *kubeadm.UpgradeConfiguration, c fuzz.Continue
 	obj.Apply.ImagePullPolicy = corev1.PullIfNotPresent
 	obj.Apply.ImagePullSerial = ptr.To(true)
 
+	obj.Plan.EtcdUpgrade = ptr.To(true)
+
 	kubeadm.SetDefaultTimeouts(&obj.Timeouts)
 }

cmd/kubeadm/app/apis/kubeadm/types.go

@@ -657,6 +657,9 @@ type UpgradePlanConfiguration struct {
 	// DryRun tells if the dry run mode is enabled, don't apply any change if it is and just output what would be done.
 	DryRun *bool
 
+	// EtcdUpgrade instructs kubeadm to execute etcd upgrade during upgrades.
+	EtcdUpgrade *bool
+
 	// IgnorePreflightErrors provides a slice of pre-flight errors to be ignored during the upgrade process, e.g. 'IsPrivilegedUser,Swap'.
 	// Value 'all' ignores errors from all checks.
 	IgnorePreflightErrors []string

cmd/kubeadm/app/apis/kubeadm/v1beta4/defaults.go

@@ -299,6 +299,10 @@ func SetDefaults_UpgradeConfiguration(obj *UpgradeConfiguration) {
 		obj.Apply.ImagePullSerial = ptr.To(true)
 	}
 
+	if obj.Plan.EtcdUpgrade == nil {
+		obj.Plan.EtcdUpgrade = ptr.To(true)
+	}
+
 	if obj.Timeouts == nil {
 		obj.Timeouts = &Timeouts{}
 	}

cmd/kubeadm/app/apis/kubeadm/v1beta4/doc.go

@@ -24,6 +24,11 @@ limitations under the License.
 //
 // A list of changes since v1beta3:
 //
+// v1.33:
+//   - Add an `EtcdUpgrade` field into `UpgradeConfiguration.Plan` that can be used to control whether the etcd upgrade plan
+//     should be displayed.
+//
+// v1.31:
 //   - Support custom environment variables in control plane components under `ClusterConfiguration`.
 //     Use `APIServer.ExtraEnvs`, `ControllerManager.ExtraEnvs`, `Scheduler.ExtraEnvs`, `Etcd.Local.ExtraEnvs`.
 //   - The `ResetConfiguration` API type is now supported in v1beta4. Users are able to reset a node by passing

cmd/kubeadm/app/apis/kubeadm/v1beta4/types.go

@@ -749,6 +749,11 @@ type UpgradePlanConfiguration struct {
 	// +optional
 	DryRun *bool `json:"dryRun,omitempty"`
 
+	// EtcdUpgrade instructs kubeadm to execute etcd upgrade during upgrades.
+	// Defaults to true.
+	// +optional
+	EtcdUpgrade *bool `json:"etcdUpgrade,omitempty"`
+
 	// IgnorePreflightErrors provides a slice of pre-flight errors to be ignored during the upgrade process, e.g. 'IsPrivilegedUser,Swap'.
 	// Value 'all' ignores errors from all checks.
 	// +optional

cmd/kubeadm/app/apis/kubeadm/v1beta4/zz_generated.conversion.go

@@ -50,7 +50,6 @@ type applyFlags struct {
 	nonInteractiveMode bool
 	force              bool
 	dryRun             bool
-	etcdUpgrade        bool
 	renewCerts         bool
 	patchesDir         string
 }
@@ -81,7 +80,6 @@ type applyData struct {
 func newCmdApply(apf *applyPlanFlags) *cobra.Command {
 	flags := &applyFlags{
 		applyPlanFlags: apf,
-		etcdUpgrade:    true,
 		renewCerts:     true,
 	}
 
@@ -126,7 +124,6 @@ func newCmdApply(apf *applyPlanFlags) *cobra.Command {
 	cmd.Flags().BoolVarP(&flags.nonInteractiveMode, "yes", "y", flags.nonInteractiveMode, "Perform the upgrade and do not prompt for confirmation (non-interactive mode).")
 	cmd.Flags().BoolVarP(&flags.force, options.Force, "f", flags.force, "Force upgrading although some requirements might not be met. This also implies non-interactive mode.")
 	cmd.Flags().BoolVar(&flags.dryRun, options.DryRun, flags.dryRun, "Do not change any state, just output what actions would be performed.")
-	cmd.Flags().BoolVar(&flags.etcdUpgrade, options.EtcdUpgrade, flags.etcdUpgrade, "Perform the upgrade of etcd.")
 	cmd.Flags().BoolVar(&flags.renewCerts, options.CertificateRenewal, flags.renewCerts, "Perform the renewal of certificates used by component changed during upgrades.")
 	options.AddPatchesFlag(cmd.Flags(), &flags.patchesDir)
 

cmd/kubeadm/app/apis/kubeadm/v1beta4/zz_generated.deepcopy.go

@@ -120,6 +120,7 @@ func TestNewApplyData(t *testing.T) {
 				allowExperimentalUpgrades: false,
 				allowRCUpgrades:           false,
 				printConfig:               false,
+				etcdUpgrade:               true,
 				out:                       os.Stdout,
 			}
 
@@ -132,7 +133,6 @@ func TestNewApplyData(t *testing.T) {
 
 			flags := &applyFlags{
 				applyPlanFlags: apf,
-				etcdUpgrade:    true,
 				renewCerts:     true,
 			}