diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go index dce6605889d..dc7b0d44300 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go +++ b/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 diff --git a/cmd/kubeadm/app/cmd/options/constant.go b/cmd/kubeadm/app/cmd/options/constant.go index dba685a7c62..e7a0360bdc4 100644 --- a/cmd/kubeadm/app/cmd/options/constant.go +++ b/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" ) diff --git a/cmd/kubeadm/app/cmd/options/generic.go b/cmd/kubeadm/app/cmd/options/generic.go index d0579c21967..9d1d9b672ec 100644 --- a/cmd/kubeadm/app/cmd/options/generic.go +++ b/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.") } diff --git a/cmd/kubeadm/app/cmd/phases/init/controlplane.go b/cmd/kubeadm/app/cmd/phases/init/controlplane.go index 7b3022d4b06..b13b4d2cd53 100644 --- a/cmd/kubeadm/app/cmd/phases/init/controlplane.go +++ b/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 { diff --git a/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go b/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go index c89a2a7ae1a..e854c11c343 100644 --- a/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go +++ b/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) diff --git a/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go b/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go index 967e33849ae..8aafd7aa7fa 100644 --- a/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go +++ b/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{} diff --git a/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go b/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go index e3bbfe67602..015567c31e0 100644 --- a/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go +++ b/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