github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Remove clusterName flag, just use config file

Browse Source
This commit is contained in:
Karan Goel 2018-04-12 10:25:55 -07:00
parent 73bb511a44
commit 2ca8d9553d
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go
View File

@ -55,7 +55,7 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} {
obj.CIImageRepository = "" obj.CIImageRepository = ""
obj.UnifiedControlPlaneImage = "foo" obj.UnifiedControlPlaneImage = "foo"
obj.FeatureGates = map[string]bool{"foo": true} obj.FeatureGates = map[string]bool{"foo": true}
obj.ClusterName = "kubernetes" obj.ClusterName = "foo"
obj.APIServerExtraArgs = map[string]string{"foo": "foo"} obj.APIServerExtraArgs = map[string]string{"foo": "foo"}
obj.APIServerExtraVolumes = []kubeadm.HostPathMount{{ obj.APIServerExtraVolumes = []kubeadm.HostPathMount{{
Name: "foo", Name: "foo",
@ -133,7 +133,7 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} {
obj.TLSBootstrapToken = "foo" obj.TLSBootstrapToken = "foo"
obj.Token = "foo" obj.Token = "foo"
obj.CRISocket = "foo" obj.CRISocket = "foo"
obj.ClusterName = "kubernetes" obj.ClusterName = "foo"
}, },
} }
} }

4
cmd/kubeadm/app/cmd/init.go
View File

@ -185,10 +185,6 @@ func AddInitConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiext.MasterConfigur
&cfg.NodeName, "node-name", cfg.NodeName, &cfg.NodeName, "node-name", cfg.NodeName,
`Specify the node name.`, `Specify the node name.`,
) )
flagSet.StringVar(
&cfg.ClusterName, "cluster-name", cfg.ClusterName,
`Specify the cluster name`,
)
flagSet.StringVar( flagSet.StringVar(
&cfg.Token, "token", cfg.Token, &cfg.Token, "token", cfg.Token,
"The token to use for establishing bidirectional trust between nodes and masters.", "The token to use for establishing bidirectional trust between nodes and masters.",

3
cmd/kubeadm/app/cmd/join.go
View File

@ -153,9 +153,6 @@ func AddJoinConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiext.NodeConfigurat
flagSet.StringVar( flagSet.StringVar(
&cfg.NodeName, "node-name", "", &cfg.NodeName, "node-name", "",
"Specify the node name.") "Specify the node name.")
flagSet.StringVar(
&cfg.ClusterName, "cluster-name", cfg.ClusterName,
"Specify the cluster name.")
flagSet.StringVar( flagSet.StringVar(
&cfg.TLSBootstrapToken, "tls-bootstrap-token", "", &cfg.TLSBootstrapToken, "tls-bootstrap-token", "",
"A token used for TLS bootstrapping.") "A token used for TLS bootstrapping.")

1
cmd/kubeadm/app/cmd/phases/kubeconfig.go
View File

@ -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(&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(&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) subCmds = append(subCmds, cmd)
} }