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

Docs fixes

This commit is contained in:
Ole Markus With 2020-05-22 07:53:06 +02:00
parent e3055a6906
commit 6e04586361
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops/create_cluster.go
View File

@ -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")

2
docs/cli/kops_create_cluster.md
View File

@ -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

8
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -3137,16 +3137,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

6
pkg/apis/kops/networking.go
View File

@ -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"`
}

6
pkg/apis/kops/v1alpha2/networking.go
View File

@ -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"`
}