Docs fixes

kubernetes · May 22, 2020 · a4882ad · a4882ad
1 parent 8c57edc
commit a4882ad
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go
@@ -330,7 +330,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 
 	cmd.Flags().StringVar(&options.Image, "image", options.Image, "Image to use for all instances.")
 
-	cmd.Flags().StringVar(&options.Networking, "networking", options.Networking, "Networking mode to use.  kubenet (default), 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, amazon-vpc-routed-eni, 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
@@ -94,7 +94,7 @@ kops create cluster [flags]
       --master-zones strings             Zones in which to run masters (must be an odd number)
       --model string                     Models to apply (separate multiple models with commas) (default "proto,cloudup")
       --network-cidr string              Set to override the default network CIDR
-      --networking string                Networking mode to use.  kubenet (default), 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, amazon-vpc-routed-eni, cilium, cni, lyftvpc. (default "kubenet")
       --node-count int32                 Set the number of nodes
       --node-security-groups strings     Add precreated additional security groups to nodes.
       --node-size string                 Set instance size for nodes

diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -3132,16 +3132,16 @@ spec:
                     type: object
                   cni:
                     description: CNINetworkingSpec is the specification for networking
-                      that is implemented by a Daemonset. Uses the CNI networking
-                      plugin.
+                      that is implemented by a user-provided Daemonset, which uses
+                      the CNI kubelet networking plugin.
                     properties:
                       usesSecondaryIP:
                         type: boolean
                     type: object
                   external:
                     description: ExternalNetworkingSpec is the specification for networking
-                      that is implemented by a Daemonset. Uses the kubenet kubelet
-                      networking plugin.
+                      that is implemented by a user-provided Daemonset that uses the
+                      kubelet networking plugin.
                     type: object
                   flannel:
                     description: FlannelNetworkingSpec declares that we want Flannel

diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go
@@ -46,13 +46,11 @@ type ClassicNetworkingSpec struct {
 type KubenetNetworkingSpec struct {
 }
 
-// ExternalNetworkingSpec is the specification for networking that is implemented by a Daemonset.
-// Uses the kubenet kubelet networking plugin.
+// ExternalNetworkingSpec is the specification for networking that is implemented by a user-provided Daemonset that uses the kubelet networking plugin.
 type ExternalNetworkingSpec struct {
 }
 
-// CNINetworkingSpec is the specification for networking that is implemented by a Daemonset.
-// Uses the CNI kubelet networking plugin.
+// CNINetworkingSpec is the specification for networking that is implemented by a user-provided Daemonset, which uses the CNI kubelet networking plugin.
 type CNINetworkingSpec struct {
 	UsesSecondaryIP bool `json:"usesSecondaryIP,omitempty"`
 }

diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go
@@ -46,13 +46,11 @@ type ClassicNetworkingSpec struct {
 type KubenetNetworkingSpec struct {
 }
 
-// ExternalNetworkingSpec is the specification for networking that is implemented by a Daemonset.
-// Uses the kubenet kubelet networking plugin.
+// ExternalNetworkingSpec is the specification for networking that is implemented by a user-provided Daemonset that uses the kubelet networking plugin.
 type ExternalNetworkingSpec struct {
 }
 
-// CNINetworkingSpec is the specification for networking that is implemented by a Daemonset.
-// Uses the CNI networking plugin.
+// CNINetworkingSpec is the specification for networking that is implemented by a user-provided Daemonset, which uses the CNI kubelet networking plugin.
 type CNINetworkingSpec struct {
 	UsesSecondaryIP bool `json:"usesSecondaryIP,omitempty"`
 }