From 7582109b230239b7457649b9e6feb8e56e5bfdb8 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Mon, 6 Jul 2020 17:40:21 -0500 Subject: [PATCH] Update AWS VPC CNI docs to use --networking amazonvpc --- cmd/kops/create_cluster.go | 2 +- docs/cli/kops_create_cluster.md | 2 +- docs/networking/aws-vpc.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go index 9c7991b947..c414dabbd4 100644 --- a/cmd/kops/create_cluster.go +++ b/cmd/kops/create_cluster.go @@ -279,7 +279,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command { cmd.Flags().BoolVar(&options.EncryptEtcdStorage, "encrypt-etcd-storage", options.EncryptEtcdStorage, "Generate key in aws kms and use it for encrypt etcd volumes") cmd.Flags().StringVar(&options.EtcdStorageType, "etcd-storage-type", options.EtcdStorageType, "The default storage type for etc members") - cmd.Flags().StringVar(&options.Networking, "networking", options.Networking, "Networking mode to use. kubenet, external, weave, flannel-vxlan (or flannel), flannel-udp, calico, canal, kube-router, amazon-vpc-routed-eni, cilium, cni, lyftvpc.") + cmd.Flags().StringVar(&options.Networking, "networking", options.Networking, "Networking mode to use. kubenet, external, weave, flannel-vxlan (or flannel), flannel-udp, calico, canal, kube-router, amazonvpc, cilium, cni, lyftvpc.") cmd.Flags().StringVar(&options.DNSZone, "dns-zone", options.DNSZone, "DNS hosted zone to use (defaults to longest matching zone)") cmd.Flags().StringVar(&options.OutDir, "out", options.OutDir, "Path to write any local output") diff --git a/docs/cli/kops_create_cluster.md b/docs/cli/kops_create_cluster.md index 9ded8a59f4..9b8a881d15 100644 --- a/docs/cli/kops_create_cluster.md +++ b/docs/cli/kops_create_cluster.md @@ -94,7 +94,7 @@ kops create cluster [flags] --master-volume-size int32 Set instance volume size (in GB) for masters --master-zones strings Zones in which to run masters (must be an odd number) --network-cidr string Set to override the default network CIDR - --networking string Networking mode to use. kubenet, external, weave, flannel-vxlan (or flannel), flannel-udp, calico, canal, kube-router, amazon-vpc-routed-eni, cilium, cni, lyftvpc. (default "kubenet") + --networking string Networking mode to use. kubenet, external, weave, flannel-vxlan (or flannel), flannel-udp, calico, canal, kube-router, amazonvpc, cilium, cni, lyftvpc. (default "kubenet") --node-count int32 Set number of nodes --node-image string Set image for nodes. Takes precedence over --image --node-security-groups strings Add precreated additional security groups to nodes. diff --git a/docs/networking/aws-vpc.md b/docs/networking/aws-vpc.md index 14f23e3ac4..ab400faa92 100644 --- a/docs/networking/aws-vpc.md +++ b/docs/networking/aws-vpc.md @@ -11,13 +11,13 @@ To use Amazon VPC, specify the following in the cluster spec: amazonvpc: {} ``` -in the cluster spec file or pass the `--networking amazon-vpc-routed-eni` option on the command line to kops: +in the cluster spec file or pass the `--networking amazonvpc` option on the command line to kops: ```sh export ZONES= kops create cluster \ --zones $ZONES \ - --networking amazon-vpc-routed-eni \ + --networking amazonvpc \ --yes \ --name myclustername.mydns.io ```