Merge pull request #104065 from pacoxu/kubeadm-patches

kubeadm: disallow the mixture of --config and --patches & remove deprecated --experimental-patches

cmd/kubeadm/app/apis/kubeadm/validation/validation.go

@@ -570,9 +570,6 @@ func isAllowedFlag(flagName string) bool {
 		kubeadmcmdoptions.NodeName,
 		kubeadmcmdoptions.KubeconfigDir,
 		kubeadmcmdoptions.UploadCerts,
-		kubeadmcmdoptions.Patches,
-		// TODO: https://github.com/kubernetes/kubeadm/issues/2046 remove in 1.23
-		kubeadmcmdoptions.ExperimentalPatches,
 		"print-join-command", "rootfs", "v", "log-file")
 	if allowedFlags.Has(flagName) {
 		return true

cmd/kubeadm/app/cmd/options/constant.go

@@ -145,8 +145,4 @@ const (
 
 	// Patches flag sets the folder where kubeadm component patches are stored
 	Patches = "patches"
-
-	// ExperimentalPatches (DEPRECATED) is the same as Patches
-	// TODO: https://github.com/kubernetes/kubeadm/issues/2046 remove in 1.23
-	ExperimentalPatches = "experimental-patches"
 )

cmd/kubeadm/app/cmd/options/generic.go

@@ -102,7 +102,4 @@ func AddPatchesFlag(fs *pflag.FlagSet, patchesDir *string) {
 		`"json" or "yaml". "suffix" is an optional string that can be used to determine ` +
 		`which patches are applied first alpha-numerically.`
 	fs.StringVar(patchesDir, Patches, *patchesDir, usage)
-	// TODO: https://github.com/kubernetes/kubeadm/issues/2046 remove in 1.23
-	fs.StringVar(patchesDir, ExperimentalPatches, *patchesDir, usage)
-	fs.MarkDeprecated(ExperimentalPatches, "This flag will be removed in a future version. Please use '--patches' instead.")
 }

cmd/kubeadm/app/cmd/phases/init/controlplane.go

@@ -101,8 +101,6 @@ func getControlPlanePhaseFlags(name string) []string {
 		options.KubernetesVersion,
 		options.ImageRepository,
 		options.Patches,
-		// TODO: https://github.com/kubernetes/kubeadm/issues/2046 remove in 1.23
-		options.ExperimentalPatches,
 		options.DryRun,
 	}
 	if name == "all" || name == kubeadmconstants.KubeAPIServer {

cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go

@@ -44,8 +44,6 @@ func getControlPlaneJoinPhaseFlags(name string) []string {
 	}
 	if name == "etcd" || name == "all" {
 		flags = append(flags, options.Patches)
-		// TODO: https://github.com/kubernetes/kubeadm/issues/2046 remove in 1.23
-		flags = append(flags, options.ExperimentalPatches)
 	}
 	if name != "mark-control-plane" {
 		flags = append(flags, options.APIServerAdvertiseAddress)

cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go

@@ -81,8 +81,6 @@ func getControlPlanePreparePhaseFlags(name string) []string {
 			options.TokenStr,
 			options.CertificateKey,
 			options.Patches,
-			// TODO: https://github.com/kubernetes/kubeadm/issues/2046 remove in 1.23
-			options.ExperimentalPatches,
 		}
 	case "download-certs":
 		flags = []string{
@@ -128,8 +126,6 @@ func getControlPlanePreparePhaseFlags(name string) []string {
 			options.CfgPath,
 			options.ControlPlane,
 			options.Patches,
-			// TODO: https://github.com/kubernetes/kubeadm/issues/2046 remove in 1.23
-			options.ExperimentalPatches,
 		}
 	default:
 		flags = []string{}

cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go

@@ -40,8 +40,6 @@ func NewControlPlane() workflow.Phase {
 			options.CertificateRenewal,
 			options.EtcdUpgrade,
 			options.Patches,
-			// TODO: https://github.com/kubernetes/kubeadm/issues/2046 remove in 1.23
-			options.ExperimentalPatches,
 		},
 	}
 	return phase