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

Fixed more mistakes

This commit is contained in:
Ole Markus With 2020-03-02 19:27:05 +01:00
parent d71c77a87e
commit 8ca9bb195c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,6 +243,7 @@ type CiliumNetworkingSpec struct {
// "default": Follows Kubernetes policy enforcement. // "default": Follows Kubernetes policy enforcement.
// "always": Cilium restricts all traffic if no policy is in place. // "always": Cilium restricts all traffic if no policy is in place.
// "never": Cilium allows all traffic regardless of policies in place. // "never": Cilium allows all traffic regardless of policies in place.
// If unspecified, "default" policy mode will be used.
EnablePolicy string `json:"enablePolicy,omitempty"` EnablePolicy string `json:"enablePolicy,omitempty"`
// EnableTracing has not been implemented in the new templates and may be removed in the future. // EnableTracing has not been implemented in the new templates and may be removed in the future.
// Setting this has currently no effect. // Setting this has currently no effect.
@ -373,21 +374,22 @@ type CiliumNetworkingSpec struct {
SidecarIstioProxyImage string `json:"sidecarIstioProxyImage"` SidecarIstioProxyImage string `json:"sidecarIstioProxyImage"`
// ClusterName is the name of the cluster. It is only relevant when building a mesh of clusters. // ClusterName is the name of the cluster. It is only relevant when building a mesh of clusters.
ClusterName string `json:"clusterName"` ClusterName string `json:"clusterName"`
// ToFqdnsEnablePoller is disabled by default starting from version 1.4.x in favor // ToFqdnsEnablePoller determines the implementation of FQDN policies.
// of a more powerful DNS proxy-based implementation. // if this is set to false, the more powerful DNS proxy-based implementation is used.
// Enable this option if you want to use FQDN policies but do not want to use // Enable this option if you want to use FQDN policies but do not want to use
// the DNS proxy. // the DNS proxy. To ease upgrade, users may opt to set this option to "true".
// To ease upgrade, users may opt to set this option to "true". // Default: false
// Default: true
ToFqdnsEnablePoller bool `json:"toFqdnsEnablePoller"` ToFqdnsEnablePoller bool `json:"toFqdnsEnablePoller"`
// ContainerRuntimeLabels determines the container runtime(s) used by Cilium // ContainerRuntimeLabels determines the container runtime(s) used by Cilium
// Supported values are: "none", "containerd", "crio", "docker", "auto" // Supported values are: "none", "containerd", "crio", "docker", "auto"
// As of Cilium 1.7.0, Cilium no longer fetches information from the
// container runtime and this field is ignored.
// Default: none // Default: none
ContainerRuntimeLabels string `json:"containerRuntimeLabels,omitempty"` ContainerRuntimeLabels string `json:"containerRuntimeLabels,omitempty"`
// Ipam determines the IP address allocation mode to use. // Ipam determines the IP address allocation mode to use.
// "eni" will use AWS native networking for pods // "eni" will use AWS native networking for pods
Ipam string `json:"ipam,omitempty"` Ipam string `json:"ipam,omitempty"`
// IPTablesRulesNoinstall determins if the base iptables rules for cilium to mainly interact with kube-proxy (and masquerading) // IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy.
// Default: false // Default: false
IPTablesRulesNoinstall bool `json:"IPTablesRulesNoinstall"` IPTablesRulesNoinstall bool `json:"IPTablesRulesNoinstall"`
// AutoDirectNodeRoutes adds automatic L2 routing between nodes. // AutoDirectNodeRoutes adds automatic L2 routing between nodes.