From 4c6368d7aa68e4dbe97433cdbaecd84066af65b8 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 12 Oct 2022 12:08:02 +0300 Subject: [PATCH] Deprecate `--api-loadbalancer-class` flag --- cmd/kops/create_cluster.go | 9 +++++---- docs/cli/kops_create_cluster.md | 7 +++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go index e42db1903d..067b959997 100644 --- a/cmd/kops/create_cluster.go +++ b/cmd/kops/create_cluster.go @@ -357,15 +357,16 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command { cmd.Flags().StringVar(&options.NodeTenancy, "node-tenancy", options.NodeTenancy, "Tenancy of the node group (AWS only): default or dedicated") cmd.RegisterFlagCompletionFunc("node-tenancy", completeTenancy) - cmd.Flags().StringVar(&options.APILoadBalancerClass, "api-loadbalancer-class", options.APILoadBalancerClass, "Class of loadbalancer for the Kubernetes API (AWS only): classic or network") + cmd.Flags().StringVar(&options.APILoadBalancerClass, "api-loadbalancer-class", options.APILoadBalancerClass, "Class of load balancer for the Kubernetes API (AWS only): classic or network") + cmd.Flags().MarkDeprecated("api-loadbalancer-class", "network load balancer should be used for all newly created clusters") cmd.RegisterFlagCompletionFunc("api-loadbalancer-class", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { return []string{"classic", "network"}, cobra.ShellCompDirectiveNoFileComp }) - cmd.Flags().StringVar(&options.APILoadBalancerType, "api-loadbalancer-type", options.APILoadBalancerType, "Type of loadbalancer for the Kubernetes API: public or internal") + cmd.Flags().StringVar(&options.APILoadBalancerType, "api-loadbalancer-type", options.APILoadBalancerType, "Type of load balancer for the Kubernetes API: public or internal") cmd.RegisterFlagCompletionFunc("api-loadbalancer-type", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { return []string{"public", "internal"}, cobra.ShellCompDirectiveNoFileComp }) - cmd.Flags().StringVar(&options.APISSLCertificate, "api-ssl-certificate", options.APISSLCertificate, "ARN of the SSL Certificate to use for the Kubernetes API loadbalancer (AWS only)") + cmd.Flags().StringVar(&options.APISSLCertificate, "api-ssl-certificate", options.APISSLCertificate, "ARN of the SSL Certificate to use for the Kubernetes API load balancer (AWS only)") cmd.RegisterFlagCompletionFunc("api-ssl-certificate", completeSSLCertificate) // Allow custom public master name @@ -431,7 +432,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command { cmd.Flags().StringVar(&options.OpenstackLBSubnet, "os-lb-floating-subnet", options.OpenstackLBSubnet, "External subnet to use with the kubernetes api") cmd.RegisterFlagCompletionFunc("os-lb-floating-subnet", completeOpenstackLBSubnet) cmd.Flags().BoolVar(&options.OpenstackStorageIgnoreAZ, "os-kubelet-ignore-az", options.OpenstackStorageIgnoreAZ, "Attach volumes across availability zones") - cmd.Flags().BoolVar(&options.OpenstackLBOctavia, "os-octavia", options.OpenstackLBOctavia, "Use octavia loadbalancer API") + cmd.Flags().BoolVar(&options.OpenstackLBOctavia, "os-octavia", options.OpenstackLBOctavia, "Use octavia load balancer API") cmd.Flags().StringVar(&options.OpenstackOctaviaProvider, "os-octavia-provider", options.OpenstackOctaviaProvider, "Octavia provider to use") cmd.RegisterFlagCompletionFunc("os-octavia-provider", completeOpenstackOctaviaProvider) cmd.Flags().StringVar(&options.OpenstackDNSServers, "os-dns-servers", options.OpenstackDNSServers, "comma separated list of DNS Servers which is used in network") diff --git a/docs/cli/kops_create_cluster.md b/docs/cli/kops_create_cluster.md index 4db3949e4d..ad7728880d 100644 --- a/docs/cli/kops_create_cluster.md +++ b/docs/cli/kops_create_cluster.md @@ -66,9 +66,8 @@ kops create cluster [CLUSTER] [flags] ``` --admin-access strings Restrict API access to this CIDR. If not set, access will not be restricted by IP. (default [0.0.0.0/0,::/0]) - --api-loadbalancer-class string Class of loadbalancer for the Kubernetes API (AWS only): classic or network - --api-loadbalancer-type string Type of loadbalancer for the Kubernetes API: public or internal - --api-ssl-certificate string ARN of the SSL Certificate to use for the Kubernetes API loadbalancer (AWS only) + --api-loadbalancer-type string Type of load balancer for the Kubernetes API: public or internal + --api-ssl-certificate string ARN of the SSL Certificate to use for the Kubernetes API load balancer (AWS only) --associate-public-ip Specify --associate-public-ip=[true|false] to enable/disable association of public IP for master ASG and nodes. Default is 'true'. --authorization string Authorization mode: AlwaysAllow or RBAC (default "RBAC") --bastion Enable a bastion instance group. Only applies to private topology. @@ -111,7 +110,7 @@ kops create cluster [CLUSTER] [flags] --os-kubelet-ignore-az Attach volumes across availability zones --os-lb-floating-subnet string External subnet to use with the kubernetes api --os-network string ID of the existing OpenStack network to use - --os-octavia Use octavia loadbalancer API + --os-octavia Use octavia load balancer API --os-octavia-provider string Octavia provider to use --out string Path to write any local output -o, --output string Output format. One of json or yaml. Used with the --dry-run flag.