Merge pull request kubernetes#94871 from neolit123/1.20-kubeadm-remove-experimental-kustomize

kubeadm: remove the --experimental-kustomize feature

Author: k8s-ci-robot

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

@@ -462,7 +462,6 @@ func isAllowedFlag(flagName string) bool {
 		kubeadmcmdoptions.NodeCRISocket,
 		kubeadmcmdoptions.KubeconfigDir,
 		kubeadmcmdoptions.UploadCerts,
-		kubeadmcmdoptions.Kustomize,
 		kubeadmcmdoptions.Patches,
 		"print-join-command", "rootfs", "v")
 	if knownFlags.Has(flagName) {

cmd/kubeadm/app/cmd/init.go

@@ -102,7 +102,6 @@ type initOptions struct {
 	externalClusterCfg      *kubeadmapiv1beta2.ClusterConfiguration
 	uploadCerts             bool
 	skipCertificateKeyPrint bool
-	kustomizeDir            string
 	patchesDir              string
 }
 
@@ -125,7 +124,6 @@ type initData struct {
 	outputWriter            io.Writer
 	uploadCerts             bool
 	skipCertificateKeyPrint bool
-	kustomizeDir            string
 	patchesDir              string
 }
 
@@ -282,7 +280,6 @@ func AddInitOtherFlags(flagSet *flag.FlagSet, initOptions *initOptions) {
 		&initOptions.skipCertificateKeyPrint, options.SkipCertificateKeyPrint, initOptions.skipCertificateKeyPrint,
 		"Don't print the key used to encrypt the control-plane certificates.",
 	)
-	options.AddKustomizePodsFlag(flagSet, &initOptions.kustomizeDir)
 	options.AddPatchesFlag(flagSet, &initOptions.patchesDir)
 }
 
@@ -419,7 +416,6 @@ func newInitData(cmd *cobra.Command, args []string, options *initOptions, out io
 		outputWriter:            out,
 		uploadCerts:             options.uploadCerts,
 		skipCertificateKeyPrint: options.skipCertificateKeyPrint,
-		kustomizeDir:            options.kustomizeDir,
 		patchesDir:              options.patchesDir,
 	}, nil
 }
@@ -553,11 +549,6 @@ func (d *initData) Tokens() []string {
 	return tokens
 }
 
-// KustomizeDir returns the folder where kustomize patches for static pod manifest are stored
-func (d *initData) KustomizeDir() string {
-	return d.kustomizeDir
-}
-
 // PatchesDir returns the folder where patches for components are stored
 func (d *initData) PatchesDir() string {
 	return d.patchesDir

cmd/kubeadm/app/cmd/join.go

@@ -129,7 +129,6 @@ type joinOptions struct {
 	ignorePreflightErrors []string
 	externalcfg           *kubeadmapiv1beta2.JoinConfiguration
 	joinControlPlane      *kubeadmapiv1beta2.JoinControlPlane
-	kustomizeDir          string
 	patchesDir            string
 }
 
@@ -145,7 +144,6 @@ type joinData struct {
 	clientSet             *clientset.Clientset
 	ignorePreflightErrors sets.String
 	outputWriter          io.Writer
-	kustomizeDir          string
 	patchesDir            string
 }
 
@@ -287,7 +285,6 @@ func addJoinOtherFlags(flagSet *flag.FlagSet, joinOptions *joinOptions) {
 		&joinOptions.controlPlane, options.ControlPlane, joinOptions.controlPlane,
 		"Create a new control plane instance on this node",
 	)
-	options.AddKustomizePodsFlag(flagSet, &joinOptions.kustomizeDir)
 	options.AddPatchesFlag(flagSet, &joinOptions.patchesDir)
 }
 
@@ -443,7 +440,6 @@ func newJoinData(cmd *cobra.Command, args []string, opt *joinOptions, out io.Wri
 		tlsBootstrapCfg:       tlsBootstrapCfg,
 		ignorePreflightErrors: ignorePreflightErrorsSet,
 		outputWriter:          out,
-		kustomizeDir:          opt.kustomizeDir,
 		patchesDir:            opt.patchesDir,
 	}, nil
 }
@@ -510,11 +506,6 @@ func (j *joinData) OutputWriter() io.Writer {
 	return j.outputWriter
 }
 
-// KustomizeDir returns the folder where kustomize patches for static pod manifest are stored
-func (j *joinData) KustomizeDir() string {
-	return j.kustomizeDir
-}
-
 // PatchesDir returns the folder where patches for components are stored
 func (j *joinData) PatchesDir() string {
 	return j.patchesDir

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

@@ -143,9 +143,6 @@ const (
 	// EtcdUpgrade flag instruct kubeadm to execute etcd upgrade during upgrades
 	EtcdUpgrade = "etcd-upgrade"
 
-	// Kustomize flag sets the folder where kustomize patches for static pod manifest are stored
-	Kustomize = "experimental-kustomize"
-
 	// Patches flag sets the folder where kubeadm component patches are stored
 	Patches = "experimental-patches"
 )

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

@@ -17,7 +17,6 @@ limitations under the License.
 package options
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/spf13/pflag"
@@ -90,12 +89,6 @@ func AddKubeadmOtherFlags(flagSet *pflag.FlagSet, rootfsPath *string) {
 	)
 }
 
-// AddKustomizePodsFlag adds the --kustomize flag to the given flagset
-func AddKustomizePodsFlag(fs *pflag.FlagSet, kustomizeDir *string) {
-	fs.StringVarP(kustomizeDir, Kustomize, "k", *kustomizeDir, "The path where kustomize patches for static pod manifests are stored.")
-	fs.MarkDeprecated(Kustomize, fmt.Sprintf("This flag is deprecated and will be removed in a future version. Please use %s instead.", Patches))
-}
-
 // AddPatchesFlag adds the --patches flag to the given flagset
 func AddPatchesFlag(fs *pflag.FlagSet, patchesDir *string) {
 	fs.StringVar(patchesDir, Patches, *patchesDir, `Path to a directory that contains files named `+

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

@@ -100,7 +100,6 @@ func getControlPlanePhaseFlags(name string) []string {
 		options.CertificatesDir,
 		options.KubernetesVersion,
 		options.ImageRepository,
-		options.Kustomize,
 	}
 	if name == "all" || name == kubeadmconstants.KubeAPIServer {
 		flags = append(flags,
@@ -145,6 +144,6 @@ func runControlPlaneSubphase(component string) func(c workflow.RunData) error {
 		cfg := data.Cfg()
 
 		fmt.Printf("[control-plane] Creating static Pod manifest for %q\n", component)
-		return controlplane.CreateStaticPodFiles(data.ManifestDir(), data.KustomizeDir(), data.PatchesDir(), &cfg.ClusterConfiguration, &cfg.LocalAPIEndpoint, component)
+		return controlplane.CreateStaticPodFiles(data.ManifestDir(), data.PatchesDir(), &cfg.ClusterConfiguration, &cfg.LocalAPIEndpoint, component)
 	}
 }

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

@@ -45,6 +45,5 @@ type InitData interface {
 	OutputWriter() io.Writer
 	Client() (clientset.Interface, error)
 	Tokens() []string
-	KustomizeDir() string
 	PatchesDir() string
 }

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

@@ -48,5 +48,4 @@ func (t *testInitData) ExternalCA() bool                     { return false }
 func (t *testInitData) OutputWriter() io.Writer              { return nil }
 func (t *testInitData) Client() (clientset.Interface, error) { return nil, nil }
 func (t *testInitData) Tokens() []string                     { return nil }
-func (t *testInitData) KustomizeDir() string                 { return "" }
 func (t *testInitData) PatchesDir() string                   { return "" }

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

@@ -69,7 +69,6 @@ func getEtcdPhaseFlags() []string {
 		options.CertificatesDir,
 		options.CfgPath,
 		options.ImageRepository,
-		options.Kustomize,
 		options.Patches,
 	}
 	return flags
@@ -95,7 +94,7 @@ func runEtcdPhaseLocal() func(c workflow.RunData) error {
 				fmt.Printf("[dryrun] Would ensure that %q directory is present\n", cfg.Etcd.Local.DataDir)
 			}
 			fmt.Printf("[etcd] Creating static Pod manifest for local etcd in %q\n", data.ManifestDir())
-			if err := etcdphase.CreateLocalEtcdStaticPodManifestFile(data.ManifestDir(), data.KustomizeDir(), data.PatchesDir(), cfg.NodeRegistration.Name, &cfg.ClusterConfiguration, &cfg.LocalAPIEndpoint); err != nil {
+			if err := etcdphase.CreateLocalEtcdStaticPodManifestFile(data.ManifestDir(), data.PatchesDir(), cfg.NodeRegistration.Name, &cfg.ClusterConfiguration, &cfg.LocalAPIEndpoint); err != nil {
 				return errors.Wrap(err, "error creating local etcd static pod manifest file")
 			}
 		} else {

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

@@ -44,7 +44,7 @@ func getControlPlaneJoinPhaseFlags(name string) []string {
 		options.NodeName,
 	}
 	if name == "etcd" {
-		flags = append(flags, options.Kustomize, options.Patches)
+		flags = append(flags, options.Patches)
 	}
 	if name != "mark-control-plane" {
 		flags = append(flags, options.APIServerAdvertiseAddress)
@@ -147,7 +147,7 @@ func runEtcdPhase(c workflow.RunData) error {
 	// because it needs two members as majority to agree on the consensus. You will only see this behavior between the time
 	// etcdctl member add informs the cluster about the new member and the new member successfully establishing a connection to the
 	// existing one."
-	if err := etcdphase.CreateStackedEtcdStaticPodManifestFile(client, kubeadmconstants.GetStaticPodDirectory(), data.KustomizeDir(), data.PatchesDir(), cfg.NodeRegistration.Name, &cfg.ClusterConfiguration, &cfg.LocalAPIEndpoint); err != nil {
+	if err := etcdphase.CreateStackedEtcdStaticPodManifestFile(client, kubeadmconstants.GetStaticPodDirectory(), data.PatchesDir(), cfg.NodeRegistration.Name, &cfg.ClusterConfiguration, &cfg.LocalAPIEndpoint); err != nil {
 		return errors.Wrap(err, "error creating local etcd static pod manifest file")
 	}