kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't describe CloudLabels as being AWS-specific

This commit is contained in:
John Gardiner Myers 2021-06-01 23:31:37 -07:00
parent 04db0c9507
commit 326a4beb49
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kops/create_cluster.go
View File

@ -73,7 +73,7 @@ type CreateClusterOptions struct {
// Overrides allows settings values direct in the spec // Overrides allows settings values direct in the spec
Overrides []string Overrides []string
// Specify tags for AWS instance groups // CloudLabels are cloud-provider-level tags for instance groups and volumes.
CloudLabels string CloudLabels string
// Specify tenancy (default or dedicated) for masters and nodes // Specify tenancy (default or dedicated) for masters and nodes
@ -278,7 +278,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
cmd.Flags().BoolVar(&options.Bastion, "bastion", options.Bastion, "Pass the --bastion flag to enable a bastion instance group. Only applies to private topology.") cmd.Flags().BoolVar(&options.Bastion, "bastion", options.Bastion, "Pass the --bastion flag to enable a bastion instance group. Only applies to private topology.")
// Allow custom tags from the CLI // Allow custom tags from the CLI
cmd.Flags().StringVar(&options.CloudLabels, "cloud-labels", options.CloudLabels, "A list of KV pairs used to tag all instance groups in AWS (e.g. \"Owner=John Doe,Team=Some Team\").") cmd.Flags().StringVar(&options.CloudLabels, "cloud-labels", options.CloudLabels, "A list of key/value pairs used to tag all instance groups (for example \"Owner=John Doe,Team=Some Team\").")
// Master and Node Tenancy // Master and Node Tenancy
cmd.Flags().StringVar(&options.MasterTenancy, "master-tenancy", options.MasterTenancy, "The tenancy of the master group on AWS. Can either be default or dedicated.") cmd.Flags().StringVar(&options.MasterTenancy, "master-tenancy", options.MasterTenancy, "The tenancy of the master group on AWS. Can either be default or dedicated.")

2
docs/cli/kops_create_cluster.md generated
View File

@ -75,7 +75,7 @@ kops create cluster [flags]
--bastion Pass the --bastion flag to enable a bastion instance group. Only applies to private topology. --bastion Pass the --bastion flag to enable a bastion instance group. Only applies to private topology.
--channel string Channel for default versions and configuration to use (default "stable") --channel string Channel for default versions and configuration to use (default "stable")
--cloud string Cloud provider to use - gce, aws, openstack --cloud string Cloud provider to use - gce, aws, openstack
--cloud-labels string A list of KV pairs used to tag all instance groups in AWS (e.g. "Owner=John Doe,Team=Some Team"). --cloud-labels string A list of key/value pairs used to tag all instance groups (for example "Owner=John Doe,Team=Some Team").
--container-runtime string Container runtime to use: containerd, docker --container-runtime string Container runtime to use: containerd, docker
--disable-subnet-tags Set to disable automatic subnet tagging --disable-subnet-tags Set to disable automatic subnet tagging
--dns string DNS hosted zone to use: public|private. (default "Public") --dns string DNS hosted zone to use: public|private. (default "Public")