diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go index 228df4caa59..c86ee55a259 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go @@ -55,7 +55,7 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} { obj.CIImageRepository = "" obj.UnifiedControlPlaneImage = "foo" obj.FeatureGates = map[string]bool{"foo": true} - obj.ClusterName = "kubernetes" + obj.ClusterName = "foo" obj.APIServerExtraArgs = map[string]string{"foo": "foo"} obj.APIServerExtraVolumes = []kubeadm.HostPathMount{{ Name: "foo", @@ -133,7 +133,7 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} { obj.TLSBootstrapToken = "foo" obj.Token = "foo" obj.CRISocket = "foo" - obj.ClusterName = "kubernetes" + obj.ClusterName = "foo" }, } } diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index a1b7218ae90..f762b5969c9 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -185,10 +185,6 @@ func AddInitConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiext.MasterConfigur &cfg.NodeName, "node-name", cfg.NodeName, `Specify the node name.`, ) - flagSet.StringVar( - &cfg.ClusterName, "cluster-name", cfg.ClusterName, - `Specify the cluster name`, - ) flagSet.StringVar( &cfg.Token, "token", cfg.Token, "The token to use for establishing bidirectional trust between nodes and masters.", diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go index d6fc5bfbeac..6791f9abf4d 100644 --- a/cmd/kubeadm/app/cmd/join.go +++ b/cmd/kubeadm/app/cmd/join.go @@ -153,9 +153,6 @@ func AddJoinConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiext.NodeConfigurat flagSet.StringVar( &cfg.NodeName, "node-name", "", "Specify the node name.") - flagSet.StringVar( - &cfg.ClusterName, "cluster-name", cfg.ClusterName, - "Specify the cluster name.") flagSet.StringVar( &cfg.TLSBootstrapToken, "tls-bootstrap-token", "", "A token used for TLS bootstrapping.") diff --git a/cmd/kubeadm/app/cmd/phases/kubeconfig.go b/cmd/kubeadm/app/cmd/phases/kubeconfig.go index a2dae4946c7..7934c12dce3 100644 --- a/cmd/kubeadm/app/cmd/phases/kubeconfig.go +++ b/cmd/kubeadm/app/cmd/phases/kubeconfig.go @@ -189,7 +189,6 @@ func getKubeConfigSubCommands(out io.Writer, outDir, defaultKubernetesVersion st cmd.Flags().StringVar(&token, "token", token, "The token that should be used as the authentication mechanism for this kubeconfig (instead of client certificates)") cmd.Flags().StringVar(&clientName, "client-name", clientName, "The name of user. It will be used as the CN if client certificates are created") } - cmd.Flags().StringVar(&cfg.ClusterName, "cluster-name", cfg.ClusterName, "Specify the cluster name.") subCmds = append(subCmds, cmd) }