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

Merge pull request #12610 from johngmyers/apiv3-cilium 

Remove unused Cilium fields from v1alpha3 API
This commit is contained in:
Kubernetes Prow Robot 2021-10-30 21:19:17 -07:00 committed by GitHub
parent 7f0845e7c4 36f2686624
commit ad45d2a89e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 223 additions and 817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4452,12 +4452,10 @@ spec:
Default: false' Default: false'
type: boolean type: boolean
accessLog: accessLog:
description: AccessLog is not implemented and may be removed description: AccessLog is unused.
in the future. Setting this has no effect.
type: string type: string
agentLabels: agentLabels:
description: AgentLabels is not implemented and may be removed description: AgentLabels is unused.
in the future. Setting this has no effect.
items: items:
type: string type: string
type: array type: array
@ -4472,16 +4470,14 @@ spec:
for Prometheus metrics. Defaults to 9090. for Prometheus metrics. Defaults to 9090.
type: integer type: integer
allowLocalhost: allowLocalhost:
description: AllowLocalhost is not implemented and may be description: AllowLocalhost is unused.
removed in the future. Setting this has no effect.
type: string type: string
autoDirectNodeRoutes: autoDirectNodeRoutes:
description: 'AutoDirectNodeRoutes adds automatic L2 routing description: 'AutoDirectNodeRoutes adds automatic L2 routing
between nodes. Default: false' between nodes. Default: false'
type: boolean type: boolean
autoIpv6NodeRoutes: autoIpv6NodeRoutes:
description: AutoIpv6NodeRoutes is not implemented and may description: AutoIpv6NodeRoutes is unused.
be removed in the future. Setting this has no effect.
type: boolean type: boolean
bpfCTGlobalAnyMax: bpfCTGlobalAnyMax:
description: 'BPFCTGlobalAnyMax is the maximum number of entries description: 'BPFCTGlobalAnyMax is the maximum number of entries
@ -4524,11 +4520,10 @@ spec:
in endpoint policy map. Default: 16384' in endpoint policy map. Default: 16384'
type: integer type: integer
bpfRoot: bpfRoot:
description: BPFRoot is not implemented and may be removed description: BPFRoot is unused.
in the future. Setting this has no effect.
type: string type: string
chainingMode: chainingMode:
description: 'ChainingMode allows to use Cilium in combination description: 'ChainingMode allows using Cilium in combination
with other CNI plugins. With Cilium CNI chaining, the base with other CNI plugins. With Cilium CNI chaining, the base
network connectivity and IP address management is managed network connectivity and IP address management is managed
by the non-Cilium CNI plugin, but Cilium attaches eBPF programs by the non-Cilium CNI plugin, but Cilium attaches eBPF programs
@ -4541,20 +4536,17 @@ spec:
only relevant when building a mesh of clusters. only relevant when building a mesh of clusters.
type: string type: string
cniBinPath: cniBinPath:
description: CniBinPath is not implemented and may be removed description: CniBinPath is unused.
in the future. Setting this has no effect.
type: string type: string
containerRuntime: containerRuntime:
description: ContainerRuntime is not implemented and may be description: ContainerRuntime is unused.
removed in the future. Setting this has no effect.
items: items:
type: string type: string
type: array type: array
containerRuntimeEndpoint: containerRuntimeEndpoint:
additionalProperties: additionalProperties:
type: string type: string
description: ContainerRuntimeEndpoint is not implemented and description: ContainerRuntimeEndpoint is unused.
may be removed in the future. Setting this has no effect.
type: object type: object
containerRuntimeLabels: containerRuntimeLabels:
description: ContainerRuntimeLabels is unused. description: ContainerRuntimeLabels is unused.
@ -4571,34 +4563,29 @@ spec:
description: Debug runs Cilium in debug mode. description: Debug runs Cilium in debug mode.
type: boolean type: boolean
debugVerbose: debugVerbose:
description: DebugVerbose is not implemented and may be removed description: DebugVerbose is unused.
in the future. Setting this has no effect.
items: items:
type: string type: string
type: array type: array
device: device:
description: Device is not implemented and may be removed description: Device is unused.
in the future. Setting this has no effect.
type: string type: string
disableCNPStatusUpdates: disableCNPStatusUpdates:
description: Determines if CNP NodeStatus updates will be description: DisableCNPStatusUpdates determines if CNP NodeStatus
sent to the Kubernetes api-server. updates will be sent to the Kubernetes api-server.
type: boolean type: boolean
disableConntrack: disableConntrack:
description: DisableConntrack is not implemented and may be description: DisableConntrack is unused.
removed in the future. Setting this has no effect.
type: boolean type: boolean
disableEndpointCRD: disableEndpointCRD:
description: 'DisableEndpointCRD disables usage of CiliumEndpoint description: 'DisableEndpointCRD disables usage of CiliumEndpoint
CRD. Default: false' CRD. Default: false'
type: boolean type: boolean
disableIpv4: disableIpv4:
description: 'DisableIpv4 is deprecated: Use EnableIpv4 instead. description: DisableIpv4 is unused.
Setting this flag has no effect.'
type: boolean type: boolean
disableK8sServices: disableK8sServices:
description: DisableK8sServices is not implemented and may description: DisableK8sServices is unused.
be removed in the future. Setting this has no effect.
type: boolean type: boolean
disableMasquerade: disableMasquerade:
description: DisableMasquerade disables masquerading traffic description: DisableMasquerade disables masquerading traffic
@ -4645,28 +4632,24 @@ spec:
endpoint for both the agent and the operator. endpoint for both the agent and the operator.
type: boolean type: boolean
enableRemoteNodeIdentity: enableRemoteNodeIdentity:
description: 'EnableRemoteNodeIdentity enables the remote-node-identity description: 'EnableRemoteNodeIdentity enables the remote-node-identity.
added in Cilium 1.7.0. Default: true' Default: true'
type: boolean type: boolean
enableTracing: enableTracing:
description: EnableTracing is not implemented and may be removed description: EnableTracing is unused.
in the future. Setting this has no effect.
type: boolean type: boolean
enableipv4: enableipv4:
description: EnableIpv4 is not implemented and may be removed description: EnableIpv4 is unused.
in the future. Setting this has no effect.
type: boolean type: boolean
enableipv6: enableipv6:
description: EnableIpv6 is not implemented and may be removed description: EnableIpv6 is unused.
in the future. Setting this has no effect.
type: boolean type: boolean
encryptionType: encryptionType:
description: 'EncryptionType specifies Cilium Encryption method description: 'EncryptionType specifies Cilium Encryption method
("ipsec", "wireguard"). Default: ipsec' ("ipsec", "wireguard"). Default: ipsec'
type: string type: string
envoyLog: envoyLog:
description: EnvoyLog is not implemented and may be removed description: EnvoyLog is unused.
in the future. Setting this has no effect.
type: string type: string
etcdManaged: etcdManaged:
description: 'EtcdManagd installs an additional etcd cluster description: 'EtcdManagd installs an additional etcd cluster
@ -4697,104 +4680,82 @@ spec:
to wait before using a changed identity. Default: 5s' to wait before using a changed identity. Default: 5s'
type: string type: string
ipam: ipam:
description: Ipam specifies the IP address allocation mode description: 'Ipam specifies the IP address allocation mode
to use. Possible values are "crd" and "eni". "eni" will to use. Possible values are "crd" and "eni". "eni" will
use AWS native networking for pods. Eni requires masquerade use AWS native networking for pods. Eni requires masquerade
to be set to false. "crd" will use CRDs for controlling to be set to false. "crd" will use CRDs for controlling
IP address management. "hostscope" will use hostscope IPAM IP address management. "hostscope" will use hostscope IPAM
mode. "kubernetes" will use addersing based on node pod mode. "kubernetes" will use addersing based on node pod
CIDR. Empty value will use hostscope for cilum <= 1.7 and CIDR. Default: "kubernetes".'
"kubernetes" otherwise.
type: string type: string
ipv4ClusterCidrMaskSize: ipv4ClusterCidrMaskSize:
description: Ipv4ClusterCIDRMaskSize is not implemented and description: Ipv4ClusterCIDRMaskSize is unused.
may be removed in the future. Setting this has no effect.
type: integer type: integer
ipv4Node: ipv4Node:
description: Ipv4Node is not implemented and may be removed description: Ipv4Node is unused.
in the future. Setting this has no effect.
type: string type: string
ipv4Range: ipv4Range:
description: Ipv4Range is not implemented and may be removed description: Ipv4Range is unused.
in the future. Setting this has no effect.
type: string type: string
ipv4ServiceRange: ipv4ServiceRange:
description: Ipv4ServiceRange is not implemented and may be description: Ipv4ServiceRange is unused.
removed in the future. Setting this has no effect.
type: string type: string
ipv6ClusterAllocCidr: ipv6ClusterAllocCidr:
description: Ipv6ClusterAllocCidr is not implemented and may description: Ipv6ClusterAllocCidr is unused.
be removed in the future. Setting this has no effect.
type: string type: string
ipv6Node: ipv6Node:
description: Ipv6Node is not implemented and may be removed description: Ipv6Node is unused.
in the future. Setting this has no effect.
type: string type: string
ipv6Range: ipv6Range:
description: Ipv6Range is not implemented and may be removed description: Ipv6Range is unused.
in the future. Setting this has no effect.
type: string type: string
ipv6ServiceRange: ipv6ServiceRange:
description: Ipv6ServiceRange is not implemented and may be description: Ipv6ServiceRange is unused.
removed in the future. Setting this has no effect.
type: string type: string
k8sApiServer: k8sApiServer:
description: K8sAPIServer is not implemented and may be removed description: K8sAPIServer is unused.
in the future. Setting this has no effect.
type: string type: string
k8sKubeconfigPath: k8sKubeconfigPath:
description: K8sKubeconfigPath is not implemented and may description: K8sKubeconfigPath is unused.
be removed in the future. Setting this has no effect.
type: string type: string
keepBpfTemplates: keepBpfTemplates:
description: KeepBPFTemplates is not implemented and may be description: KeepBPFTemplates is unused.
removed in the future. Setting this has no effect.
type: boolean type: boolean
keepConfig: keepConfig:
description: KeepConfig is not implemented and may be removed description: KeepConfig is unused.
in the future. Setting this has no effect.
type: boolean type: boolean
labelPrefixFile: labelPrefixFile:
description: LabelPrefixFile is not implemented and may be description: LabelPrefixFile is unused.
removed in the future. Setting this has currently no effect
type: string type: string
labels: labels:
description: Labels is not implemented and may be removed description: Labels is unused.
in the future. Setting this has no effect.
items: items:
type: string type: string
type: array type: array
lb: lb:
description: LB is not implemented and may be removed in the description: LB is unused.
future. Setting this has no effect.
type: string type: string
libDir: libDir:
description: LibDir is not implemented and may be removed description: LibDir is unused.
in the future. Setting this has no effect.
type: string type: string
logDriver: logDriver:
description: LogDrivers is not implemented and may be removed description: LogDrivers is unused.
in the future. Setting this has no effect.
items: items:
type: string type: string
type: array type: array
logOpt: logOpt:
additionalProperties: additionalProperties:
type: string type: string
description: LogOpt is not implemented and may be removed description: LogOpt is unused.
in the future. Setting this has no effect.
type: object type: object
logstash: logstash:
description: Logstash is not implemented and may be removed description: Logstash is unused.
in the future. Setting this has no effect.
type: boolean type: boolean
logstashAgent: logstashAgent:
description: LogstashAgent is not implemented and may be removed description: LogstashAgent is unused.
in the future. Setting this has no effect.
type: string type: string
logstashProbeTimer: logstashProbeTimer:
description: LogstashProbeTimer is not implemented and may description: LogstashProbeTimer is unused.
be removed in the future. Setting this has no effect.
format: int32 format: int32
type: integer type: integer
memoryRequest: memoryRequest:
@ -4811,44 +4772,35 @@ spec:
Default: medium' Default: medium'
type: string type: string
nat46Range: nat46Range:
description: Nat6Range is not implemented and may be removed description: Nat46Range is unused.
in the future. Setting this has no effect.
type: string type: string
nodeInitBootstrapFile: nodeInitBootstrapFile:
description: NodeInitBootstrapFile is not implemented and description: NodeInitBootstrapFile is unused.
may be removed in the future. Setting this has no effect.
type: string type: string
pprof: pprof:
description: Pprof is not implemented and may be removed in description: Pprof is unused.
the future. Setting this has no effect.
type: boolean type: boolean
preallocateBPFMaps: preallocateBPFMaps:
description: 'PreallocateBPFMaps reduces the per-packet latency description: 'PreallocateBPFMaps reduces the per-packet latency
at the expense of up-front memory allocation. Default: true' at the expense of up-front memory allocation. Default: true'
type: boolean type: boolean
prefilterDevice: prefilterDevice:
description: PrefilterDevice is not implemented and may be description: PrefilterDevice is unused.
removed in the future. Setting this has no effect.
type: string type: string
prometheusServeAddr: prometheusServeAddr:
description: PrometheusServeAddr is deprecated. Use EnablePrometheusMetrics description: PrometheusServeAddr is unused.
and AgentPrometheusPort instead. Setting this has no effect.
type: string type: string
reconfigureKubelet: reconfigureKubelet:
description: ReconfigureKubelet is not implemented and may description: ReconfigureKubelet is unused.
be removed in the future. Setting this has no effect.
type: boolean type: boolean
removeCbrBridge: removeCbrBridge:
description: RemoveCbrBridge is not implemented and may be description: RemoveCbrBridge is unused.
removed in the future. Setting this has no effect.
type: boolean type: boolean
restartPods: restartPods:
description: RestartPods is not implemented and may be removed description: RestartPods is unused.
in the future. Setting this has no effect.
type: boolean type: boolean
restore: restore:
description: Restore is not implemented and may be removed description: Restore is unused.
in the future. Setting this has no effect.
type: boolean type: boolean
sidecarIstioProxyImage: sidecarIstioProxyImage:
description: 'SidecarIstioProxyImage is the regular expression description: 'SidecarIstioProxyImage is the regular expression
@ -4856,16 +4808,13 @@ spec:
image names. Default: cilium/istio_proxy' image names. Default: cilium/istio_proxy'
type: string type: string
singleClusterRoute: singleClusterRoute:
description: SingleClusterRoute is not implemented and may description: SingleClusterRoute is unused.
be removed in the future. Setting this has no effect.
type: boolean type: boolean
socketPath: socketPath:
description: SocketPath is not implemented and may be removed description: SocketPath is unused.
in the future. Setting this has no effect.
type: string type: string
stateDir: stateDir:
description: StateDir is not implemented and may be removed description: StateDir is unused.
in the future. Setting this has no effect.
type: string type: string
toFqdnsDnsRejectResponseCode: toFqdnsDnsRejectResponseCode:
description: 'ToFqdnsDNSRejectResponseCode sets the DNS response description: 'ToFqdnsDNSRejectResponseCode sets the DNS response
@ -4878,8 +4827,7 @@ spec:
implementation. Default: false' implementation. Default: false'
type: boolean type: boolean
tracePayloadlen: tracePayloadlen:
description: TracePayloadLen is not implemented and may be description: TracePayloadLen is unused.
removed in the future. Setting this has no effect.
type: integer type: integer
tunnel: tunnel:
description: 'Tunnel specifies the Cilium tunnelling mode. description: 'Tunnel specifies the Cilium tunnelling mode.

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

@ -275,56 +275,20 @@ type CiliumNetworkingSpec struct {
// CPURequest CPU request of Cilium agent + operator container. (default: 25m) // CPURequest CPU request of Cilium agent + operator container. (default: 25m)
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"` CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
// AccessLog is not implemented and may be removed in the future.
// Setting this has no effect.
AccessLog string `json:"accessLog,omitempty"`
// AgentLabels is not implemented and may be removed in the future.
// Setting this has no effect.
AgentLabels []string `json:"agentLabels,omitempty"`
// AgentPrometheusPort is the port to listen to for Prometheus metrics. // AgentPrometheusPort is the port to listen to for Prometheus metrics.
// Defaults to 9090. // Defaults to 9090.
AgentPrometheusPort int `json:"agentPrometheusPort,omitempty"` AgentPrometheusPort int `json:"agentPrometheusPort,omitempty"`
// AllowLocalhost is not implemented and may be removed in the future. // ChainingMode allows using Cilium in combination with other CNI plugins.
// Setting this has no effect.
AllowLocalhost string `json:"allowLocalhost,omitempty"`
// AutoIpv6NodeRoutes is not implemented and may be removed in the future.
// Setting this has no effect.
AutoIpv6NodeRoutes bool `json:"autoIpv6NodeRoutes,omitempty"`
// BPFRoot is not implemented and may be removed in the future.
// Setting this has no effect.
BPFRoot string `json:"bpfRoot,omitempty"`
// ChainingMode allows to use Cilium in combination with other CNI plugins.
// With Cilium CNI chaining, the base network connectivity and IP address management is managed // With Cilium CNI chaining, the base network connectivity and IP address management is managed
// by the non-Cilium CNI plugin, but Cilium attaches eBPF programs to the network devices created // by the non-Cilium CNI plugin, but Cilium attaches eBPF programs to the network devices created
// by the non-Cilium plugin to provide L3/L4 network visibility, policy enforcement and other advanced features. // by the non-Cilium plugin to provide L3/L4 network visibility, policy enforcement and other advanced features.
// Default: none // Default: none
ChainingMode string `json:"chainingMode,omitempty"` ChainingMode string `json:"chainingMode,omitempty"`
// ContainerRuntime is not implemented and may be removed in the future.
// Setting this has no effect.
ContainerRuntime []string `json:"containerRuntime,omitempty"`
// ContainerRuntimeEndpoint is not implemented and may be removed in the future.
// Setting this has no effect.
ContainerRuntimeEndpoint map[string]string `json:"containerRuntimeEndpoint,omitempty"`
// Debug runs Cilium in debug mode. // Debug runs Cilium in debug mode.
Debug bool `json:"debug,omitempty"` Debug bool `json:"debug,omitempty"`
// DebugVerbose is not implemented and may be removed in the future.
// Setting this has no effect.
DebugVerbose []string `json:"debugVerbose,omitempty"`
// Device is not implemented and may be removed in the future.
// Setting this has no effect.
Device string `json:"device,omitempty"`
// DisableConntrack is not implemented and may be removed in the future.
// Setting this has no effect.
DisableConntrack bool `json:"disableConntrack,omitempty"`
// DisableEndpointCRD disables usage of CiliumEndpoint CRD. // DisableEndpointCRD disables usage of CiliumEndpoint CRD.
// Default: false // Default: false
DisableEndpointCRD bool `json:"disableEndpointCRD,omitempty"` DisableEndpointCRD bool `json:"disableEndpointCRD,omitempty"`
// DisableIpv4 is deprecated: Use EnableIpv4 instead.
// Setting this flag has no effect.
DisableIpv4 bool `json:"disableIpv4,omitempty"`
// DisableK8sServices is not implemented and may be removed in the future.
// Setting this has no effect.
DisableK8sServices bool `json:"disableK8sServices,omitempty"`
// EnablePolicy specifies the policy enforcement mode. // EnablePolicy specifies the policy enforcement mode.
// "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.
@ -340,9 +304,6 @@ type CiliumNetworkingSpec struct {
// EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints. // EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints.
// Default: true // Default: true
EnableEndpointHealthChecking *bool `json:"enableEndpointHealthChecking,omitempty"` EnableEndpointHealthChecking *bool `json:"enableEndpointHealthChecking,omitempty"`
// EnableTracing is not implemented and may be removed in the future.
// Setting this has no effect.
EnableTracing bool `json:"enableTracing,omitempty"`
// EnablePrometheusMetrics enables the Cilium "/metrics" endpoint for both the agent and the operator. // EnablePrometheusMetrics enables the Cilium "/metrics" endpoint for both the agent and the operator.
EnablePrometheusMetrics bool `json:"enablePrometheusMetrics,omitempty"` EnablePrometheusMetrics bool `json:"enablePrometheusMetrics,omitempty"`
// EnableEncryption enables Cilium Encryption. // EnableEncryption enables Cilium Encryption.
@ -351,119 +312,20 @@ type CiliumNetworkingSpec struct {
// EncryptionType specifies Cilium Encryption method ("ipsec", "wireguard"). // EncryptionType specifies Cilium Encryption method ("ipsec", "wireguard").
// Default: ipsec // Default: ipsec
EncryptionType CiliumEncryptionType `json:"encryptionType,omitempty"` EncryptionType CiliumEncryptionType `json:"encryptionType,omitempty"`
// EnvoyLog is not implemented and may be removed in the future.
// Setting this has no effect.
EnvoyLog string `json:"envoyLog,omitempty"`
// IdentityAllocationMode specifies in which backend identities are stored ("crd", "kvstore"). // IdentityAllocationMode specifies in which backend identities are stored ("crd", "kvstore").
// Default: crd // Default: crd
IdentityAllocationMode string `json:"identityAllocationMode,omitempty"` IdentityAllocationMode string `json:"identityAllocationMode,omitempty"`
// IdentityChangeGracePeriod specifies the duration to wait before using a changed identity. // IdentityChangeGracePeriod specifies the duration to wait before using a changed identity.
// Default: 5s // Default: 5s
IdentityChangeGracePeriod string `json:"identityChangeGracePeriod,omitempty"` IdentityChangeGracePeriod string `json:"identityChangeGracePeriod,omitempty"`
// Ipv4ClusterCIDRMaskSize is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv4ClusterCIDRMaskSize int `json:"ipv4ClusterCidrMaskSize,omitempty"`
// Ipv4Node is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv4Node string `json:"ipv4Node,omitempty"`
// Ipv4Range is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv4Range string `json:"ipv4Range,omitempty"`
// Ipv4ServiceRange is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv4ServiceRange string `json:"ipv4ServiceRange,omitempty"`
// Ipv6ClusterAllocCidr is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv6ClusterAllocCidr string `json:"ipv6ClusterAllocCidr,omitempty"`
// Ipv6Node is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv6Node string `json:"ipv6Node,omitempty"`
// Ipv6Range is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv6Range string `json:"ipv6Range,omitempty"`
// Ipv6ServiceRange is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv6ServiceRange string `json:"ipv6ServiceRange,omitempty"`
// K8sAPIServer is not implemented and may be removed in the future.
// Setting this has no effect.
K8sAPIServer string `json:"k8sApiServer,omitempty"`
// K8sKubeconfigPath is not implemented and may be removed in the future.
// Setting this has no effect.
K8sKubeconfigPath string `json:"k8sKubeconfigPath,omitempty"`
// KeepBPFTemplates is not implemented and may be removed in the future.
// Setting this has no effect.
KeepBPFTemplates bool `json:"keepBpfTemplates,omitempty"`
// KeepConfig is not implemented and may be removed in the future.
// Setting this has no effect.
KeepConfig bool `json:"keepConfig,omitempty"`
// LabelPrefixFile is not implemented and may be removed in the future.
// Setting this has currently no effect
LabelPrefixFile string `json:"labelPrefixFile,omitempty"`
// Labels is not implemented and may be removed in the future.
// Setting this has no effect.
Labels []string `json:"labels,omitempty"`
// LB is not implemented and may be removed in the future.
// Setting this has no effect.
LB string `json:"lb,omitempty"`
// LibDir is not implemented and may be removed in the future.
// Setting this has no effect.
LibDir string `json:"libDir,omitempty"`
// LogDrivers is not implemented and may be removed in the future.
// Setting this has no effect.
LogDrivers []string `json:"logDriver,omitempty"`
// LogOpt is not implemented and may be removed in the future.
// Setting this has no effect.
LogOpt map[string]string `json:"logOpt,omitempty"`
// Logstash is not implemented and may be removed in the future.
// Setting this has no effect.
Logstash bool `json:"logstash,omitempty"`
// LogstashAgent is not implemented and may be removed in the future.
// Setting this has no effect.
LogstashAgent string `json:"logstashAgent,omitempty"`
// LogstashProbeTimer is not implemented and may be removed in the future.
// Setting this has no effect.
LogstashProbeTimer uint32 `json:"logstashProbeTimer,omitempty"`
// DisableMasquerade disables masquerading traffic to external destinations behind the node IP. // DisableMasquerade disables masquerading traffic to external destinations behind the node IP.
DisableMasquerade *bool `json:"disableMasquerade,omitempty"` DisableMasquerade *bool `json:"disableMasquerade,omitempty"`
// Nat6Range is not implemented and may be removed in the future.
// Setting this has no effect.
Nat46Range string `json:"nat46Range,omitempty"`
// AgentPodAnnotations makes possible to add additional annotations to cilium agent. // AgentPodAnnotations makes possible to add additional annotations to cilium agent.
// Default: none // Default: none
AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"` AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"`
// Pprof is not implemented and may be removed in the future.
// Setting this has no effect.
Pprof bool `json:"pprof,omitempty"`
// PrefilterDevice is not implemented and may be removed in the future.
// Setting this has no effect.
PrefilterDevice string `json:"prefilterDevice,omitempty"`
// PrometheusServeAddr is deprecated. Use EnablePrometheusMetrics and AgentPrometheusPort instead.
// Setting this has no effect.
PrometheusServeAddr string `json:"prometheusServeAddr,omitempty"`
// Restore is not implemented and may be removed in the future.
// Setting this has no effect.
Restore bool `json:"restore,omitempty"`
// SingleClusterRoute is not implemented and may be removed in the future.
// Setting this has no effect.
SingleClusterRoute bool `json:"singleClusterRoute,omitempty"`
// SocketPath is not implemented and may be removed in the future.
// Setting this has no effect.
SocketPath string `json:"socketPath,omitempty"`
// StateDir is not implemented and may be removed in the future.
// Setting this has no effect.
StateDir string `json:"stateDir,omitempty"`
// TracePayloadLen is not implemented and may be removed in the future.
// Setting this has no effect.
TracePayloadLen int `json:"tracePayloadlen,omitempty"`
// Tunnel specifies the Cilium tunnelling mode. Possible values are "vxlan", "geneve", or "disabled". // Tunnel specifies the Cilium tunnelling mode. Possible values are "vxlan", "geneve", or "disabled".
// Default: vxlan // Default: vxlan
Tunnel string `json:"tunnel,omitempty"` Tunnel string `json:"tunnel,omitempty"`
// EnableIpv6 is not implemented and may be removed in the future.
// Setting this has no effect.
EnableIpv6 bool `json:"enableipv6,omitempty"`
// EnableIpv4 is not implemented and may be removed in the future.
// Setting this has no effect.
EnableIpv4 bool `json:"enableipv4,omitempty"`
// MonitorAggregation sets the level of packet monitoring. Possible values are "low", "medium", or "maximum". // MonitorAggregation sets the level of packet monitoring. Possible values are "low", "medium", or "maximum".
// Default: medium // Default: medium
MonitorAggregation string `json:"monitorAggregation,omitempty"` MonitorAggregation string `json:"monitorAggregation,omitempty"`
@ -519,7 +381,7 @@ type CiliumNetworkingSpec struct {
// "crd" will use CRDs for controlling IP address management. // "crd" will use CRDs for controlling IP address management.
// "hostscope" will use hostscope IPAM mode. // "hostscope" will use hostscope IPAM mode.
// "kubernetes" will use addersing based on node pod CIDR. // "kubernetes" will use addersing based on node pod CIDR.
// Empty value will use hostscope for cilum <= 1.7 and "kubernetes" otherwise. // Default: "kubernetes".
Ipam string `json:"ipam,omitempty"` Ipam string `json:"ipam,omitempty"`
// IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy. // IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy.
// Default: false // Default: false
@ -540,28 +402,13 @@ type CiliumNetworkingSpec struct {
// The cluster is operated by cilium-etcd-operator. // The cluster is operated by cilium-etcd-operator.
// Default: false // Default: false
EtcdManaged bool `json:"etcdManaged,omitempty"` EtcdManaged bool `json:"etcdManaged,omitempty"`
// EnableRemoteNodeIdentity enables the remote-node-identity added in Cilium 1.7.0. // EnableRemoteNodeIdentity enables the remote-node-identity.
// Default: true // Default: true
EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"` EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"`
// Hubble configures the Hubble service on the Cilium agent. // Hubble configures the Hubble service on the Cilium agent.
Hubble *HubbleSpec `json:"hubble,omitempty"` Hubble *HubbleSpec `json:"hubble,omitempty"`
// RemoveCbrBridge is not implemented and may be removed in the future. // DisableCNPStatusUpdates determines if CNP NodeStatus updates will be sent to the Kubernetes api-server.
// Setting this has no effect.
RemoveCbrBridge bool `json:"removeCbrBridge,omitempty"`
// RestartPods is not implemented and may be removed in the future.
// Setting this has no effect.
RestartPods bool `json:"restartPods,omitempty"`
// ReconfigureKubelet is not implemented and may be removed in the future.
// Setting this has no effect.
ReconfigureKubelet bool `json:"reconfigureKubelet,omitempty"`
// NodeInitBootstrapFile is not implemented and may be removed in the future.
// Setting this has no effect.
NodeInitBootstrapFile string `json:"nodeInitBootstrapFile,omitempty"`
// CniBinPath is not implemented and may be removed in the future.
// Setting this has no effect.
CniBinPath string `json:"cniBinPath,omitempty"`
// Determines if CNP NodeStatus updates will be sent to the Kubernetes api-server.
DisableCNPStatusUpdates *bool `json:"disableCNPStatusUpdates,omitempty"` DisableCNPStatusUpdates *bool `json:"disableCNPStatusUpdates,omitempty"`
} }

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

@ -284,55 +284,55 @@ type CiliumNetworkingSpec struct {
// CPURequest CPU request of Cilium agent + operator container. (default: 25m) // CPURequest CPU request of Cilium agent + operator container. (default: 25m)
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"` CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
// AccessLog is not implemented and may be removed in the future. // AccessLog is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
AccessLog string `json:"accessLog,omitempty"` AccessLog string `json:"accessLog,omitempty"`
// AgentLabels is not implemented and may be removed in the future. // AgentLabels is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
AgentLabels []string `json:"agentLabels,omitempty"` AgentLabels []string `json:"agentLabels,omitempty"`
// AgentPrometheusPort is the port to listen to for Prometheus metrics. // AgentPrometheusPort is the port to listen to for Prometheus metrics.
// Defaults to 9090. // Defaults to 9090.
AgentPrometheusPort int `json:"agentPrometheusPort,omitempty"` AgentPrometheusPort int `json:"agentPrometheusPort,omitempty"`
// AllowLocalhost is not implemented and may be removed in the future. // AllowLocalhost is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
AllowLocalhost string `json:"allowLocalhost,omitempty"` AllowLocalhost string `json:"allowLocalhost,omitempty"`
// AutoIpv6NodeRoutes is not implemented and may be removed in the future. // AutoIpv6NodeRoutes is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
AutoIpv6NodeRoutes bool `json:"autoIpv6NodeRoutes,omitempty"` AutoIpv6NodeRoutes bool `json:"autoIpv6NodeRoutes,omitempty"`
// BPFRoot is not implemented and may be removed in the future. // BPFRoot is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
BPFRoot string `json:"bpfRoot,omitempty"` BPFRoot string `json:"bpfRoot,omitempty"`
// ChainingMode allows to use Cilium in combination with other CNI plugins. // ChainingMode allows using Cilium in combination with other CNI plugins.
// With Cilium CNI chaining, the base network connectivity and IP address management is managed // With Cilium CNI chaining, the base network connectivity and IP address management is managed
// by the non-Cilium CNI plugin, but Cilium attaches eBPF programs to the network devices created // by the non-Cilium CNI plugin, but Cilium attaches eBPF programs to the network devices created
// by the non-Cilium plugin to provide L3/L4 network visibility, policy enforcement and other advanced features. // by the non-Cilium plugin to provide L3/L4 network visibility, policy enforcement and other advanced features.
// Default: none // Default: none
ChainingMode string `json:"chainingMode,omitempty"` ChainingMode string `json:"chainingMode,omitempty"`
// ContainerRuntime is not implemented and may be removed in the future. // ContainerRuntime is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
ContainerRuntime []string `json:"containerRuntime,omitempty"` ContainerRuntime []string `json:"containerRuntime,omitempty"`
// ContainerRuntimeEndpoint is not implemented and may be removed in the future. // ContainerRuntimeEndpoint is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
ContainerRuntimeEndpoint map[string]string `json:"containerRuntimeEndpoint,omitempty"` ContainerRuntimeEndpoint map[string]string `json:"containerRuntimeEndpoint,omitempty"`
// Debug runs Cilium in debug mode. // Debug runs Cilium in debug mode.
Debug bool `json:"debug,omitempty"` Debug bool `json:"debug,omitempty"`
// DebugVerbose is not implemented and may be removed in the future. // DebugVerbose is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
DebugVerbose []string `json:"debugVerbose,omitempty"` DebugVerbose []string `json:"debugVerbose,omitempty"`
// Device is not implemented and may be removed in the future. // Device is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Device string `json:"device,omitempty"` Device string `json:"device,omitempty"`
// DisableConntrack is not implemented and may be removed in the future. // DisableConntrack is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
DisableConntrack bool `json:"disableConntrack,omitempty"` DisableConntrack bool `json:"disableConntrack,omitempty"`
// DisableEndpointCRD disables usage of CiliumEndpoint CRD. // DisableEndpointCRD disables usage of CiliumEndpoint CRD.
// Default: false // Default: false
DisableEndpointCRD bool `json:"disableEndpointCRD,omitempty"` DisableEndpointCRD bool `json:"disableEndpointCRD,omitempty"`
// DisableIpv4 is deprecated: Use EnableIpv4 instead. // DisableIpv4 is unused.
// Setting this flag has no effect. // +k8s:conversion-gen=false
DisableIpv4 bool `json:"disableIpv4,omitempty"` DisableIpv4 bool `json:"disableIpv4,omitempty"`
// DisableK8sServices is not implemented and may be removed in the future. // DisableK8sServices is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
DisableK8sServices bool `json:"disableK8sServices,omitempty"` DisableK8sServices bool `json:"disableK8sServices,omitempty"`
// EnablePolicy specifies the policy enforcement mode. // EnablePolicy specifies the policy enforcement mode.
// "default": Follows Kubernetes policy enforcement. // "default": Follows Kubernetes policy enforcement.
@ -349,8 +349,8 @@ type CiliumNetworkingSpec struct {
// EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints. // EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints.
// Default: true // Default: true
EnableEndpointHealthChecking *bool `json:"enableEndpointHealthChecking,omitempty"` EnableEndpointHealthChecking *bool `json:"enableEndpointHealthChecking,omitempty"`
// EnableTracing is not implemented and may be removed in the future. // EnableTracing is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
EnableTracing bool `json:"enableTracing,omitempty"` EnableTracing bool `json:"enableTracing,omitempty"`
// EnablePrometheusMetrics enables the Cilium "/metrics" endpoint for both the agent and the operator. // EnablePrometheusMetrics enables the Cilium "/metrics" endpoint for both the agent and the operator.
EnablePrometheusMetrics bool `json:"enablePrometheusMetrics,omitempty"` EnablePrometheusMetrics bool `json:"enablePrometheusMetrics,omitempty"`
@ -360,8 +360,8 @@ type CiliumNetworkingSpec struct {
// EncryptionType specifies Cilium Encryption method ("ipsec", "wireguard"). // EncryptionType specifies Cilium Encryption method ("ipsec", "wireguard").
// Default: ipsec // Default: ipsec
EncryptionType CiliumEncryptionType `json:"encryptionType,omitempty"` EncryptionType CiliumEncryptionType `json:"encryptionType,omitempty"`
// EnvoyLog is not implemented and may be removed in the future. // EnvoyLog is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
EnvoyLog string `json:"envoyLog,omitempty"` EnvoyLog string `json:"envoyLog,omitempty"`
// IdentityAllocationMode specifies in which backend identities are stored ("crd", "kvstore"). // IdentityAllocationMode specifies in which backend identities are stored ("crd", "kvstore").
// Default: crd // Default: crd
@ -369,109 +369,109 @@ type CiliumNetworkingSpec struct {
// IdentityChangeGracePeriod specifies the duration to wait before using a changed identity. // IdentityChangeGracePeriod specifies the duration to wait before using a changed identity.
// Default: 5s // Default: 5s
IdentityChangeGracePeriod string `json:"identityChangeGracePeriod,omitempty"` IdentityChangeGracePeriod string `json:"identityChangeGracePeriod,omitempty"`
// Ipv4ClusterCIDRMaskSize is not implemented and may be removed in the future. // Ipv4ClusterCIDRMaskSize is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Ipv4ClusterCIDRMaskSize int `json:"ipv4ClusterCidrMaskSize,omitempty"` Ipv4ClusterCIDRMaskSize int `json:"ipv4ClusterCidrMaskSize,omitempty"`
// Ipv4Node is not implemented and may be removed in the future. // Ipv4Node is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Ipv4Node string `json:"ipv4Node,omitempty"` Ipv4Node string `json:"ipv4Node,omitempty"`
// Ipv4Range is not implemented and may be removed in the future. // Ipv4Range is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Ipv4Range string `json:"ipv4Range,omitempty"` Ipv4Range string `json:"ipv4Range,omitempty"`
// Ipv4ServiceRange is not implemented and may be removed in the future. // Ipv4ServiceRange is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Ipv4ServiceRange string `json:"ipv4ServiceRange,omitempty"` Ipv4ServiceRange string `json:"ipv4ServiceRange,omitempty"`
// Ipv6ClusterAllocCidr is not implemented and may be removed in the future. // Ipv6ClusterAllocCidr is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Ipv6ClusterAllocCidr string `json:"ipv6ClusterAllocCidr,omitempty"` Ipv6ClusterAllocCidr string `json:"ipv6ClusterAllocCidr,omitempty"`
// Ipv6Node is not implemented and may be removed in the future. // Ipv6Node is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Ipv6Node string `json:"ipv6Node,omitempty"` Ipv6Node string `json:"ipv6Node,omitempty"`
// Ipv6Range is not implemented and may be removed in the future. // Ipv6Range is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Ipv6Range string `json:"ipv6Range,omitempty"` Ipv6Range string `json:"ipv6Range,omitempty"`
// Ipv6ServiceRange is not implemented and may be removed in the future. // Ipv6ServiceRange is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Ipv6ServiceRange string `json:"ipv6ServiceRange,omitempty"` Ipv6ServiceRange string `json:"ipv6ServiceRange,omitempty"`
// K8sAPIServer is not implemented and may be removed in the future. // K8sAPIServer is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
K8sAPIServer string `json:"k8sApiServer,omitempty"` K8sAPIServer string `json:"k8sApiServer,omitempty"`
// K8sKubeconfigPath is not implemented and may be removed in the future. // K8sKubeconfigPath is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
K8sKubeconfigPath string `json:"k8sKubeconfigPath,omitempty"` K8sKubeconfigPath string `json:"k8sKubeconfigPath,omitempty"`
// KeepBPFTemplates is not implemented and may be removed in the future. // KeepBPFTemplates is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
KeepBPFTemplates bool `json:"keepBpfTemplates,omitempty"` KeepBPFTemplates bool `json:"keepBpfTemplates,omitempty"`
// KeepConfig is not implemented and may be removed in the future. // KeepConfig is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
KeepConfig bool `json:"keepConfig,omitempty"` KeepConfig bool `json:"keepConfig,omitempty"`
// LabelPrefixFile is not implemented and may be removed in the future. // LabelPrefixFile is unused.
// Setting this has currently no effect // +k8s:conversion-gen=false
LabelPrefixFile string `json:"labelPrefixFile,omitempty"` LabelPrefixFile string `json:"labelPrefixFile,omitempty"`
// Labels is not implemented and may be removed in the future. // Labels is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Labels []string `json:"labels,omitempty"` Labels []string `json:"labels,omitempty"`
// LB is not implemented and may be removed in the future. // LB is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
LB string `json:"lb,omitempty"` LB string `json:"lb,omitempty"`
// LibDir is not implemented and may be removed in the future. // LibDir is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
LibDir string `json:"libDir,omitempty"` LibDir string `json:"libDir,omitempty"`
// LogDrivers is not implemented and may be removed in the future. // LogDrivers is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
LogDrivers []string `json:"logDriver,omitempty"` LogDrivers []string `json:"logDriver,omitempty"`
// LogOpt is not implemented and may be removed in the future. // LogOpt is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
LogOpt map[string]string `json:"logOpt,omitempty"` LogOpt map[string]string `json:"logOpt,omitempty"`
// Logstash is not implemented and may be removed in the future. // Logstash is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Logstash bool `json:"logstash,omitempty"` Logstash bool `json:"logstash,omitempty"`
// LogstashAgent is not implemented and may be removed in the future. // LogstashAgent is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
LogstashAgent string `json:"logstashAgent,omitempty"` LogstashAgent string `json:"logstashAgent,omitempty"`
// LogstashProbeTimer is not implemented and may be removed in the future. // LogstashProbeTimer is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
LogstashProbeTimer uint32 `json:"logstashProbeTimer,omitempty"` LogstashProbeTimer uint32 `json:"logstashProbeTimer,omitempty"`
// DisableMasquerade disables masquerading traffic to external destinations behind the node IP. // DisableMasquerade disables masquerading traffic to external destinations behind the node IP.
DisableMasquerade *bool `json:"disableMasquerade,omitempty"` DisableMasquerade *bool `json:"disableMasquerade,omitempty"`
// Nat6Range is not implemented and may be removed in the future. // Nat46Range is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Nat46Range string `json:"nat46Range,omitempty"` Nat46Range string `json:"nat46Range,omitempty"`
// AgentPodAnnotations makes possible to add additional annotations to the cilium agent. // AgentPodAnnotations makes possible to add additional annotations to the cilium agent.
// Default: none // Default: none
AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"` AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"`
// Pprof is not implemented and may be removed in the future. // Pprof is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Pprof bool `json:"pprof,omitempty"` Pprof bool `json:"pprof,omitempty"`
// PrefilterDevice is not implemented and may be removed in the future. // PrefilterDevice is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
PrefilterDevice string `json:"prefilterDevice,omitempty"` PrefilterDevice string `json:"prefilterDevice,omitempty"`
// PrometheusServeAddr is deprecated. Use EnablePrometheusMetrics and AgentPrometheusPort instead. // PrometheusServeAddr is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
PrometheusServeAddr string `json:"prometheusServeAddr,omitempty"` PrometheusServeAddr string `json:"prometheusServeAddr,omitempty"`
// Restore is not implemented and may be removed in the future. // Restore is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
Restore bool `json:"restore,omitempty"` Restore bool `json:"restore,omitempty"`
// SingleClusterRoute is not implemented and may be removed in the future. // SingleClusterRoute is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
SingleClusterRoute bool `json:"singleClusterRoute,omitempty"` SingleClusterRoute bool `json:"singleClusterRoute,omitempty"`
// SocketPath is not implemented and may be removed in the future. // SocketPath is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
SocketPath string `json:"socketPath,omitempty"` SocketPath string `json:"socketPath,omitempty"`
// StateDir is not implemented and may be removed in the future. // StateDir is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
StateDir string `json:"stateDir,omitempty"` StateDir string `json:"stateDir,omitempty"`
// TracePayloadLen is not implemented and may be removed in the future. // TracePayloadLen is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
TracePayloadLen int `json:"tracePayloadlen,omitempty"` TracePayloadLen int `json:"tracePayloadlen,omitempty"`
// Tunnel specifies the Cilium tunnelling mode. Possible values are "vxlan", "geneve", or "disabled". // Tunnel specifies the Cilium tunnelling mode. Possible values are "vxlan", "geneve", or "disabled".
// Default: vxlan // Default: vxlan
Tunnel string `json:"tunnel,omitempty"` Tunnel string `json:"tunnel,omitempty"`
// EnableIpv6 is not implemented and may be removed in the future. // EnableIpv6 is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
EnableIpv6 bool `json:"enableipv6,omitempty"` EnableIpv6 bool `json:"enableipv6,omitempty"`
// EnableIpv4 is not implemented and may be removed in the future. // EnableIpv4 is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
EnableIpv4 bool `json:"enableipv4,omitempty"` EnableIpv4 bool `json:"enableipv4,omitempty"`
// MonitorAggregation sets the level of packet monitoring. Possible values are "low", "medium", or "maximum". // MonitorAggregation sets the level of packet monitoring. Possible values are "low", "medium", or "maximum".
// Default: medium // Default: medium
@ -531,7 +531,7 @@ type CiliumNetworkingSpec struct {
// "crd" will use CRDs for controlling IP address management. // "crd" will use CRDs for controlling IP address management.
// "hostscope" will use hostscope IPAM mode. // "hostscope" will use hostscope IPAM mode.
// "kubernetes" will use addersing based on node pod CIDR. // "kubernetes" will use addersing based on node pod CIDR.
// Empty value will use hostscope for cilum <= 1.7 and "kubernetes" otherwise. // Default: "kubernetes".
Ipam string `json:"ipam,omitempty"` Ipam string `json:"ipam,omitempty"`
// IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy. // IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy.
// Default: false // Default: false
@ -552,28 +552,28 @@ type CiliumNetworkingSpec struct {
// The cluster is operated by cilium-etcd-operator. // The cluster is operated by cilium-etcd-operator.
// Default: false // Default: false
EtcdManaged bool `json:"etcdManaged,omitempty"` EtcdManaged bool `json:"etcdManaged,omitempty"`
// EnableRemoteNodeIdentity enables the remote-node-identity added in Cilium 1.7.0. // EnableRemoteNodeIdentity enables the remote-node-identity.
// Default: true // Default: true
EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"` EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"`
// Hubble configures the Hubble service on the Cilium agent. // Hubble configures the Hubble service on the Cilium agent.
Hubble *HubbleSpec `json:"hubble,omitempty"` Hubble *HubbleSpec `json:"hubble,omitempty"`
// RemoveCbrBridge is not implemented and may be removed in the future. // RemoveCbrBridge is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
RemoveCbrBridge bool `json:"removeCbrBridge,omitempty"` RemoveCbrBridge bool `json:"removeCbrBridge,omitempty"`
// RestartPods is not implemented and may be removed in the future. // RestartPods is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
RestartPods bool `json:"restartPods,omitempty"` RestartPods bool `json:"restartPods,omitempty"`
// ReconfigureKubelet is not implemented and may be removed in the future. // ReconfigureKubelet is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
ReconfigureKubelet bool `json:"reconfigureKubelet,omitempty"` ReconfigureKubelet bool `json:"reconfigureKubelet,omitempty"`
// NodeInitBootstrapFile is not implemented and may be removed in the future. // NodeInitBootstrapFile is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
NodeInitBootstrapFile string `json:"nodeInitBootstrapFile,omitempty"` NodeInitBootstrapFile string `json:"nodeInitBootstrapFile,omitempty"`
// CniBinPath is not implemented and may be removed in the future. // CniBinPath is unused.
// Setting this has no effect. // +k8s:conversion-gen=false
CniBinPath string `json:"cniBinPath,omitempty"` CniBinPath string `json:"cniBinPath,omitempty"`
// Determines if CNP NodeStatus updates will be sent to the Kubernetes api-server. // DisableCNPStatusUpdates determines if CNP NodeStatus updates will be sent to the Kubernetes api-server.
DisableCNPStatusUpdates *bool `json:"disableCNPStatusUpdates,omitempty"` DisableCNPStatusUpdates *bool `json:"disableCNPStatusUpdates,omitempty"`
} }

153
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -1853,68 +1853,68 @@ func autoConvert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
out.Version = in.Version out.Version = in.Version
out.MemoryRequest = in.MemoryRequest out.MemoryRequest = in.MemoryRequest
out.CPURequest = in.CPURequest out.CPURequest = in.CPURequest
out.AccessLog = in.AccessLog // INFO: in.AccessLog opted out of conversion generation
out.AgentLabels = in.AgentLabels // INFO: in.AgentLabels opted out of conversion generation
out.AgentPrometheusPort = in.AgentPrometheusPort out.AgentPrometheusPort = in.AgentPrometheusPort
out.AllowLocalhost = in.AllowLocalhost // INFO: in.AllowLocalhost opted out of conversion generation
out.AutoIpv6NodeRoutes = in.AutoIpv6NodeRoutes // INFO: in.AutoIpv6NodeRoutes opted out of conversion generation
out.BPFRoot = in.BPFRoot // INFO: in.BPFRoot opted out of conversion generation
out.ChainingMode = in.ChainingMode out.ChainingMode = in.ChainingMode
out.ContainerRuntime = in.ContainerRuntime // INFO: in.ContainerRuntime opted out of conversion generation
out.ContainerRuntimeEndpoint = in.ContainerRuntimeEndpoint // INFO: in.ContainerRuntimeEndpoint opted out of conversion generation
out.Debug = in.Debug out.Debug = in.Debug
out.DebugVerbose = in.DebugVerbose // INFO: in.DebugVerbose opted out of conversion generation
out.Device = in.Device // INFO: in.Device opted out of conversion generation
out.DisableConntrack = in.DisableConntrack // INFO: in.DisableConntrack opted out of conversion generation
out.DisableEndpointCRD = in.DisableEndpointCRD out.DisableEndpointCRD = in.DisableEndpointCRD
out.DisableIpv4 = in.DisableIpv4 // INFO: in.DisableIpv4 opted out of conversion generation
out.DisableK8sServices = in.DisableK8sServices // INFO: in.DisableK8sServices opted out of conversion generation
out.EnablePolicy = in.EnablePolicy out.EnablePolicy = in.EnablePolicy
out.EnableL7Proxy = in.EnableL7Proxy out.EnableL7Proxy = in.EnableL7Proxy
out.EnableBPFMasquerade = in.EnableBPFMasquerade out.EnableBPFMasquerade = in.EnableBPFMasquerade
out.EnableEndpointHealthChecking = in.EnableEndpointHealthChecking out.EnableEndpointHealthChecking = in.EnableEndpointHealthChecking
out.EnableTracing = in.EnableTracing // INFO: in.EnableTracing opted out of conversion generation
out.EnablePrometheusMetrics = in.EnablePrometheusMetrics out.EnablePrometheusMetrics = in.EnablePrometheusMetrics
out.EnableEncryption = in.EnableEncryption out.EnableEncryption = in.EnableEncryption
out.EncryptionType = kops.CiliumEncryptionType(in.EncryptionType) out.EncryptionType = kops.CiliumEncryptionType(in.EncryptionType)
out.EnvoyLog = in.EnvoyLog // INFO: in.EnvoyLog opted out of conversion generation
out.IdentityAllocationMode = in.IdentityAllocationMode out.IdentityAllocationMode = in.IdentityAllocationMode
out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod
out.Ipv4ClusterCIDRMaskSize = in.Ipv4ClusterCIDRMaskSize // INFO: in.Ipv4ClusterCIDRMaskSize opted out of conversion generation
out.Ipv4Node = in.Ipv4Node // INFO: in.Ipv4Node opted out of conversion generation
out.Ipv4Range = in.Ipv4Range // INFO: in.Ipv4Range opted out of conversion generation
out.Ipv4ServiceRange = in.Ipv4ServiceRange // INFO: in.Ipv4ServiceRange opted out of conversion generation
out.Ipv6ClusterAllocCidr = in.Ipv6ClusterAllocCidr // INFO: in.Ipv6ClusterAllocCidr opted out of conversion generation
out.Ipv6Node = in.Ipv6Node // INFO: in.Ipv6Node opted out of conversion generation
out.Ipv6Range = in.Ipv6Range // INFO: in.Ipv6Range opted out of conversion generation
out.Ipv6ServiceRange = in.Ipv6ServiceRange // INFO: in.Ipv6ServiceRange opted out of conversion generation
out.K8sAPIServer = in.K8sAPIServer // INFO: in.K8sAPIServer opted out of conversion generation
out.K8sKubeconfigPath = in.K8sKubeconfigPath // INFO: in.K8sKubeconfigPath opted out of conversion generation
out.KeepBPFTemplates = in.KeepBPFTemplates // INFO: in.KeepBPFTemplates opted out of conversion generation
out.KeepConfig = in.KeepConfig // INFO: in.KeepConfig opted out of conversion generation
out.LabelPrefixFile = in.LabelPrefixFile // INFO: in.LabelPrefixFile opted out of conversion generation
out.Labels = in.Labels // INFO: in.Labels opted out of conversion generation
out.LB = in.LB // INFO: in.LB opted out of conversion generation
out.LibDir = in.LibDir // INFO: in.LibDir opted out of conversion generation
out.LogDrivers = in.LogDrivers // INFO: in.LogDrivers opted out of conversion generation
out.LogOpt = in.LogOpt // INFO: in.LogOpt opted out of conversion generation
out.Logstash = in.Logstash // INFO: in.Logstash opted out of conversion generation
out.LogstashAgent = in.LogstashAgent // INFO: in.LogstashAgent opted out of conversion generation
out.LogstashProbeTimer = in.LogstashProbeTimer // INFO: in.LogstashProbeTimer opted out of conversion generation
out.DisableMasquerade = in.DisableMasquerade out.DisableMasquerade = in.DisableMasquerade
out.Nat46Range = in.Nat46Range // INFO: in.Nat46Range opted out of conversion generation
out.AgentPodAnnotations = in.AgentPodAnnotations out.AgentPodAnnotations = in.AgentPodAnnotations
out.Pprof = in.Pprof // INFO: in.Pprof opted out of conversion generation
out.PrefilterDevice = in.PrefilterDevice // INFO: in.PrefilterDevice opted out of conversion generation
out.PrometheusServeAddr = in.PrometheusServeAddr // INFO: in.PrometheusServeAddr opted out of conversion generation
out.Restore = in.Restore // INFO: in.Restore opted out of conversion generation
out.SingleClusterRoute = in.SingleClusterRoute // INFO: in.SingleClusterRoute opted out of conversion generation
out.SocketPath = in.SocketPath // INFO: in.SocketPath opted out of conversion generation
out.StateDir = in.StateDir // INFO: in.StateDir opted out of conversion generation
out.TracePayloadLen = in.TracePayloadLen // INFO: in.TracePayloadLen opted out of conversion generation
out.Tunnel = in.Tunnel out.Tunnel = in.Tunnel
out.EnableIpv6 = in.EnableIpv6 // INFO: in.EnableIpv6 opted out of conversion generation
out.EnableIpv4 = in.EnableIpv4 // INFO: in.EnableIpv4 opted out of conversion generation
out.MonitorAggregation = in.MonitorAggregation out.MonitorAggregation = in.MonitorAggregation
out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax
@ -1947,11 +1947,11 @@ func autoConvert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
} else { } else {
out.Hubble = nil out.Hubble = nil
} }
out.RemoveCbrBridge = in.RemoveCbrBridge // INFO: in.RemoveCbrBridge opted out of conversion generation
out.RestartPods = in.RestartPods // INFO: in.RestartPods opted out of conversion generation
out.ReconfigureKubelet = in.ReconfigureKubelet // INFO: in.ReconfigureKubelet opted out of conversion generation
out.NodeInitBootstrapFile = in.NodeInitBootstrapFile // INFO: in.NodeInitBootstrapFile opted out of conversion generation
out.CniBinPath = in.CniBinPath // INFO: in.CniBinPath opted out of conversion generation
out.DisableCNPStatusUpdates = in.DisableCNPStatusUpdates out.DisableCNPStatusUpdates = in.DisableCNPStatusUpdates
return nil return nil
} }
@ -1965,68 +1965,22 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in *
out.Version = in.Version out.Version = in.Version
out.MemoryRequest = in.MemoryRequest out.MemoryRequest = in.MemoryRequest
out.CPURequest = in.CPURequest out.CPURequest = in.CPURequest
out.AccessLog = in.AccessLog
out.AgentLabels = in.AgentLabels
out.AgentPrometheusPort = in.AgentPrometheusPort out.AgentPrometheusPort = in.AgentPrometheusPort
out.AllowLocalhost = in.AllowLocalhost
out.AutoIpv6NodeRoutes = in.AutoIpv6NodeRoutes
out.BPFRoot = in.BPFRoot
out.ChainingMode = in.ChainingMode out.ChainingMode = in.ChainingMode
out.ContainerRuntime = in.ContainerRuntime
out.ContainerRuntimeEndpoint = in.ContainerRuntimeEndpoint
out.Debug = in.Debug out.Debug = in.Debug
out.DebugVerbose = in.DebugVerbose
out.Device = in.Device
out.DisableConntrack = in.DisableConntrack
out.DisableEndpointCRD = in.DisableEndpointCRD out.DisableEndpointCRD = in.DisableEndpointCRD
out.DisableIpv4 = in.DisableIpv4
out.DisableK8sServices = in.DisableK8sServices
out.EnablePolicy = in.EnablePolicy out.EnablePolicy = in.EnablePolicy
out.EnableL7Proxy = in.EnableL7Proxy out.EnableL7Proxy = in.EnableL7Proxy
out.EnableBPFMasquerade = in.EnableBPFMasquerade out.EnableBPFMasquerade = in.EnableBPFMasquerade
out.EnableEndpointHealthChecking = in.EnableEndpointHealthChecking out.EnableEndpointHealthChecking = in.EnableEndpointHealthChecking
out.EnableTracing = in.EnableTracing
out.EnablePrometheusMetrics = in.EnablePrometheusMetrics out.EnablePrometheusMetrics = in.EnablePrometheusMetrics
out.EnableEncryption = in.EnableEncryption out.EnableEncryption = in.EnableEncryption
out.EncryptionType = CiliumEncryptionType(in.EncryptionType) out.EncryptionType = CiliumEncryptionType(in.EncryptionType)
out.EnvoyLog = in.EnvoyLog
out.IdentityAllocationMode = in.IdentityAllocationMode out.IdentityAllocationMode = in.IdentityAllocationMode
out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod
out.Ipv4ClusterCIDRMaskSize = in.Ipv4ClusterCIDRMaskSize
out.Ipv4Node = in.Ipv4Node
out.Ipv4Range = in.Ipv4Range
out.Ipv4ServiceRange = in.Ipv4ServiceRange
out.Ipv6ClusterAllocCidr = in.Ipv6ClusterAllocCidr
out.Ipv6Node = in.Ipv6Node
out.Ipv6Range = in.Ipv6Range
out.Ipv6ServiceRange = in.Ipv6ServiceRange
out.K8sAPIServer = in.K8sAPIServer
out.K8sKubeconfigPath = in.K8sKubeconfigPath
out.KeepBPFTemplates = in.KeepBPFTemplates
out.KeepConfig = in.KeepConfig
out.LabelPrefixFile = in.LabelPrefixFile
out.Labels = in.Labels
out.LB = in.LB
out.LibDir = in.LibDir
out.LogDrivers = in.LogDrivers
out.LogOpt = in.LogOpt
out.Logstash = in.Logstash
out.LogstashAgent = in.LogstashAgent
out.LogstashProbeTimer = in.LogstashProbeTimer
out.DisableMasquerade = in.DisableMasquerade out.DisableMasquerade = in.DisableMasquerade
out.Nat46Range = in.Nat46Range
out.AgentPodAnnotations = in.AgentPodAnnotations out.AgentPodAnnotations = in.AgentPodAnnotations
out.Pprof = in.Pprof
out.PrefilterDevice = in.PrefilterDevice
out.PrometheusServeAddr = in.PrometheusServeAddr
out.Restore = in.Restore
out.SingleClusterRoute = in.SingleClusterRoute
out.SocketPath = in.SocketPath
out.StateDir = in.StateDir
out.TracePayloadLen = in.TracePayloadLen
out.Tunnel = in.Tunnel out.Tunnel = in.Tunnel
out.EnableIpv6 = in.EnableIpv6
out.EnableIpv4 = in.EnableIpv4
out.MonitorAggregation = in.MonitorAggregation out.MonitorAggregation = in.MonitorAggregation
out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax
@ -2058,11 +2012,6 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in *
} else { } else {
out.Hubble = nil out.Hubble = nil
} }
out.RemoveCbrBridge = in.RemoveCbrBridge
out.RestartPods = in.RestartPods
out.ReconfigureKubelet = in.ReconfigureKubelet
out.NodeInitBootstrapFile = in.NodeInitBootstrapFile
out.CniBinPath = in.CniBinPath
out.DisableCNPStatusUpdates = in.DisableCNPStatusUpdates out.DisableCNPStatusUpdates = in.DisableCNPStatusUpdates
return nil return nil
} }

166
pkg/apis/kops/v1alpha3/networking.go
View File

@ -247,13 +247,8 @@ type AmazonVPCNetworkingSpec struct {
Env []EnvVar `json:"env,omitempty"` Env []EnvVar `json:"env,omitempty"`
} }
const CiliumIpamEni = "eni"
type CiliumEncryptionType string type CiliumEncryptionType string
const CiliumEncryptionTypeIPSec CiliumEncryptionType = "ipsec"
const CiliumEncryptionTypeWireguard CiliumEncryptionType = "wireguard"
// CiliumNetworkingSpec declares that we want Cilium networking // CiliumNetworkingSpec declares that we want Cilium networking
type CiliumNetworkingSpec struct { type CiliumNetworkingSpec struct {
// Version is the version of the Cilium agent and the Cilium Operator. // Version is the version of the Cilium agent and the Cilium Operator.
@ -264,56 +259,20 @@ type CiliumNetworkingSpec struct {
// CPURequest CPU request of Cilium agent + operator container. (default: 25m) // CPURequest CPU request of Cilium agent + operator container. (default: 25m)
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"` CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
// AccessLog is not implemented and may be removed in the future.
// Setting this has no effect.
AccessLog string `json:"accessLog,omitempty"`
// AgentLabels is not implemented and may be removed in the future.
// Setting this has no effect.
AgentLabels []string `json:"agentLabels,omitempty"`
// AgentPrometheusPort is the port to listen to for Prometheus metrics. // AgentPrometheusPort is the port to listen to for Prometheus metrics.
// Defaults to 9090. // Defaults to 9090.
AgentPrometheusPort int `json:"agentPrometheusPort,omitempty"` AgentPrometheusPort int `json:"agentPrometheusPort,omitempty"`
// AllowLocalhost is not implemented and may be removed in the future. // ChainingMode allows using Cilium in combination with other CNI plugins.
// Setting this has no effect.
AllowLocalhost string `json:"allowLocalhost,omitempty"`
// AutoIpv6NodeRoutes is not implemented and may be removed in the future.
// Setting this has no effect.
AutoIpv6NodeRoutes bool `json:"autoIpv6NodeRoutes,omitempty"`
// BPFRoot is not implemented and may be removed in the future.
// Setting this has no effect.
BPFRoot string `json:"bpfRoot,omitempty"`
// ChainingMode allows to use Cilium in combination with other CNI plugins.
// With Cilium CNI chaining, the base network connectivity and IP address management is managed // With Cilium CNI chaining, the base network connectivity and IP address management is managed
// by the non-Cilium CNI plugin, but Cilium attaches eBPF programs to the network devices created // by the non-Cilium CNI plugin, but Cilium attaches eBPF programs to the network devices created
// by the non-Cilium plugin to provide L3/L4 network visibility, policy enforcement and other advanced features. // by the non-Cilium plugin to provide L3/L4 network visibility, policy enforcement and other advanced features.
// Default: none // Default: none
ChainingMode string `json:"chainingMode,omitempty"` ChainingMode string `json:"chainingMode,omitempty"`
// ContainerRuntime is not implemented and may be removed in the future.
// Setting this has no effect.
ContainerRuntime []string `json:"containerRuntime,omitempty"`
// ContainerRuntimeEndpoint is not implemented and may be removed in the future.
// Setting this has no effect.
ContainerRuntimeEndpoint map[string]string `json:"containerRuntimeEndpoint,omitempty"`
// Debug runs Cilium in debug mode. // Debug runs Cilium in debug mode.
Debug bool `json:"debug,omitempty"` Debug bool `json:"debug,omitempty"`
// DebugVerbose is not implemented and may be removed in the future.
// Setting this has no effect.
DebugVerbose []string `json:"debugVerbose,omitempty"`
// Device is not implemented and may be removed in the future.
// Setting this has no effect.
Device string `json:"device,omitempty"`
// DisableConntrack is not implemented and may be removed in the future.
// Setting this has no effect.
DisableConntrack bool `json:"disableConntrack,omitempty"`
// DisableEndpointCRD disables usage of CiliumEndpoint CRD. // DisableEndpointCRD disables usage of CiliumEndpoint CRD.
// Default: false // Default: false
DisableEndpointCRD bool `json:"disableEndpointCRD,omitempty"` DisableEndpointCRD bool `json:"disableEndpointCRD,omitempty"`
// DisableIpv4 is deprecated: Use EnableIpv4 instead.
// Setting this flag has no effect.
DisableIpv4 bool `json:"disableIpv4,omitempty"`
// DisableK8sServices is not implemented and may be removed in the future.
// Setting this has no effect.
DisableK8sServices bool `json:"disableK8sServices,omitempty"`
// EnablePolicy specifies the policy enforcement mode. // EnablePolicy specifies the policy enforcement mode.
// "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.
@ -329,9 +288,6 @@ type CiliumNetworkingSpec struct {
// EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints. // EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints.
// Default: true // Default: true
EnableEndpointHealthChecking *bool `json:"enableEndpointHealthChecking,omitempty"` EnableEndpointHealthChecking *bool `json:"enableEndpointHealthChecking,omitempty"`
// EnableTracing is not implemented and may be removed in the future.
// Setting this has no effect.
EnableTracing bool `json:"enableTracing,omitempty"`
// EnablePrometheusMetrics enables the Cilium "/metrics" endpoint for both the agent and the operator. // EnablePrometheusMetrics enables the Cilium "/metrics" endpoint for both the agent and the operator.
EnablePrometheusMetrics bool `json:"enablePrometheusMetrics,omitempty"` EnablePrometheusMetrics bool `json:"enablePrometheusMetrics,omitempty"`
// EnableEncryption enables Cilium Encryption. // EnableEncryption enables Cilium Encryption.
@ -340,119 +296,20 @@ type CiliumNetworkingSpec struct {
// EncryptionType specifies Cilium Encryption method ("ipsec", "wireguard"). // EncryptionType specifies Cilium Encryption method ("ipsec", "wireguard").
// Default: ipsec // Default: ipsec
EncryptionType CiliumEncryptionType `json:"encryptionType,omitempty"` EncryptionType CiliumEncryptionType `json:"encryptionType,omitempty"`
// EnvoyLog is not implemented and may be removed in the future.
// Setting this has no effect.
EnvoyLog string `json:"envoyLog,omitempty"`
// IdentityAllocationMode specifies in which backend identities are stored ("crd", "kvstore"). // IdentityAllocationMode specifies in which backend identities are stored ("crd", "kvstore").
// Default: crd // Default: crd
IdentityAllocationMode string `json:"identityAllocationMode,omitempty"` IdentityAllocationMode string `json:"identityAllocationMode,omitempty"`
// IdentityChangeGracePeriod specifies the duration to wait before using a changed identity. // IdentityChangeGracePeriod specifies the duration to wait before using a changed identity.
// Default: 5s // Default: 5s
IdentityChangeGracePeriod string `json:"identityChangeGracePeriod,omitempty"` IdentityChangeGracePeriod string `json:"identityChangeGracePeriod,omitempty"`
// Ipv4ClusterCIDRMaskSize is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv4ClusterCIDRMaskSize int `json:"ipv4ClusterCidrMaskSize,omitempty"`
// Ipv4Node is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv4Node string `json:"ipv4Node,omitempty"`
// Ipv4Range is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv4Range string `json:"ipv4Range,omitempty"`
// Ipv4ServiceRange is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv4ServiceRange string `json:"ipv4ServiceRange,omitempty"`
// Ipv6ClusterAllocCidr is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv6ClusterAllocCidr string `json:"ipv6ClusterAllocCidr,omitempty"`
// Ipv6Node is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv6Node string `json:"ipv6Node,omitempty"`
// Ipv6Range is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv6Range string `json:"ipv6Range,omitempty"`
// Ipv6ServiceRange is not implemented and may be removed in the future.
// Setting this has no effect.
Ipv6ServiceRange string `json:"ipv6ServiceRange,omitempty"`
// K8sAPIServer is not implemented and may be removed in the future.
// Setting this has no effect.
K8sAPIServer string `json:"k8sApiServer,omitempty"`
// K8sKubeconfigPath is not implemented and may be removed in the future.
// Setting this has no effect.
K8sKubeconfigPath string `json:"k8sKubeconfigPath,omitempty"`
// KeepBPFTemplates is not implemented and may be removed in the future.
// Setting this has no effect.
KeepBPFTemplates bool `json:"keepBpfTemplates,omitempty"`
// KeepConfig is not implemented and may be removed in the future.
// Setting this has no effect.
KeepConfig bool `json:"keepConfig,omitempty"`
// LabelPrefixFile is not implemented and may be removed in the future.
// Setting this has currently no effect
LabelPrefixFile string `json:"labelPrefixFile,omitempty"`
// Labels is not implemented and may be removed in the future.
// Setting this has no effect.
Labels []string `json:"labels,omitempty"`
// LB is not implemented and may be removed in the future.
// Setting this has no effect.
LB string `json:"lb,omitempty"`
// LibDir is not implemented and may be removed in the future.
// Setting this has no effect.
LibDir string `json:"libDir,omitempty"`
// LogDrivers is not implemented and may be removed in the future.
// Setting this has no effect.
LogDrivers []string `json:"logDriver,omitempty"`
// LogOpt is not implemented and may be removed in the future.
// Setting this has no effect.
LogOpt map[string]string `json:"logOpt,omitempty"`
// Logstash is not implemented and may be removed in the future.
// Setting this has no effect.
Logstash bool `json:"logstash,omitempty"`
// LogstashAgent is not implemented and may be removed in the future.
// Setting this has no effect.
LogstashAgent string `json:"logstashAgent,omitempty"`
// LogstashProbeTimer is not implemented and may be removed in the future.
// Setting this has no effect.
LogstashProbeTimer uint32 `json:"logstashProbeTimer,omitempty"`
// DisableMasquerade disables masquerading traffic to external destinations behind the node IP. // DisableMasquerade disables masquerading traffic to external destinations behind the node IP.
DisableMasquerade *bool `json:"disableMasquerade,omitempty"` DisableMasquerade *bool `json:"disableMasquerade,omitempty"`
// Nat6Range is not implemented and may be removed in the future.
// Setting this has no effect.
Nat46Range string `json:"nat46Range,omitempty"`
// AgentPodAnnotations makes possible to add additional annotations to the cilium agent. // AgentPodAnnotations makes possible to add additional annotations to the cilium agent.
// Default: none // Default: none
AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"` AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"`
// Pprof is not implemented and may be removed in the future.
// Setting this has no effect.
Pprof bool `json:"pprof,omitempty"`
// PrefilterDevice is not implemented and may be removed in the future.
// Setting this has no effect.
PrefilterDevice string `json:"prefilterDevice,omitempty"`
// PrometheusServeAddr is deprecated. Use EnablePrometheusMetrics and AgentPrometheusPort instead.
// Setting this has no effect.
PrometheusServeAddr string `json:"prometheusServeAddr,omitempty"`
// Restore is not implemented and may be removed in the future.
// Setting this has no effect.
Restore bool `json:"restore,omitempty"`
// SingleClusterRoute is not implemented and may be removed in the future.
// Setting this has no effect.
SingleClusterRoute bool `json:"singleClusterRoute,omitempty"`
// SocketPath is not implemented and may be removed in the future.
// Setting this has no effect.
SocketPath string `json:"socketPath,omitempty"`
// StateDir is not implemented and may be removed in the future.
// Setting this has no effect.
StateDir string `json:"stateDir,omitempty"`
// TracePayloadLen is not implemented and may be removed in the future.
// Setting this has no effect.
TracePayloadLen int `json:"tracePayloadlen,omitempty"`
// Tunnel specifies the Cilium tunnelling mode. Possible values are "vxlan", "geneve", or "disabled". // Tunnel specifies the Cilium tunnelling mode. Possible values are "vxlan", "geneve", or "disabled".
// Default: vxlan // Default: vxlan
Tunnel string `json:"tunnel,omitempty"` Tunnel string `json:"tunnel,omitempty"`
// EnableIpv6 is not implemented and may be removed in the future.
// Setting this has no effect.
EnableIpv6 bool `json:"enableipv6,omitempty"`
// EnableIpv4 is not implemented and may be removed in the future.
// Setting this has no effect.
EnableIpv4 bool `json:"enableipv4,omitempty"`
// MonitorAggregation sets the level of packet monitoring. Possible values are "low", "medium", or "maximum". // MonitorAggregation sets the level of packet monitoring. Possible values are "low", "medium", or "maximum".
// Default: medium // Default: medium
MonitorAggregation string `json:"monitorAggregation,omitempty"` MonitorAggregation string `json:"monitorAggregation,omitempty"`
@ -508,7 +365,7 @@ type CiliumNetworkingSpec struct {
// "crd" will use CRDs for controlling IP address management. // "crd" will use CRDs for controlling IP address management.
// "hostscope" will use hostscope IPAM mode. // "hostscope" will use hostscope IPAM mode.
// "kubernetes" will use addersing based on node pod CIDR. // "kubernetes" will use addersing based on node pod CIDR.
// Empty value will use hostscope for cilum <= 1.7 and "kubernetes" otherwise. // Default: "kubernetes".
Ipam string `json:"ipam,omitempty"` Ipam string `json:"ipam,omitempty"`
// IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy. // IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy.
// Default: false // Default: false
@ -529,28 +386,13 @@ type CiliumNetworkingSpec struct {
// The cluster is operated by cilium-etcd-operator. // The cluster is operated by cilium-etcd-operator.
// Default: false // Default: false
EtcdManaged bool `json:"etcdManaged,omitempty"` EtcdManaged bool `json:"etcdManaged,omitempty"`
// EnableRemoteNodeIdentity enables the remote-node-identity added in Cilium 1.7.0. // EnableRemoteNodeIdentity enables the remote-node-identity.
// Default: true // Default: true
EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"` EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"`
// Hubble configures the Hubble service on the Cilium agent. // Hubble configures the Hubble service on the Cilium agent.
Hubble *HubbleSpec `json:"hubble,omitempty"` Hubble *HubbleSpec `json:"hubble,omitempty"`
// RemoveCbrBridge is not implemented and may be removed in the future. // DisableCNPStatusUpdates determines if CNP NodeStatus updates will be sent to the Kubernetes api-server.
// Setting this has no effect.
RemoveCbrBridge bool `json:"removeCbrBridge,omitempty"`
// RestartPods is not implemented and may be removed in the future.
// Setting this has no effect.
RestartPods bool `json:"restartPods,omitempty"`
// ReconfigureKubelet is not implemented and may be removed in the future.
// Setting this has no effect.
ReconfigureKubelet bool `json:"reconfigureKubelet,omitempty"`
// NodeInitBootstrapFile is not implemented and may be removed in the future.
// Setting this has no effect.
NodeInitBootstrapFile string `json:"nodeInitBootstrapFile,omitempty"`
// CniBinPath is not implemented and may be removed in the future.
// Setting this has no effect.
CniBinPath string `json:"cniBinPath,omitempty"`
// Determines if CNP NodeStatus updates will be sent to the Kubernetes api-server.
DisableCNPStatusUpdates *bool `json:"disableCNPStatusUpdates,omitempty"` DisableCNPStatusUpdates *bool `json:"disableCNPStatusUpdates,omitempty"`
} }

102
pkg/apis/kops/v1alpha3/zz_generated.conversion.go generated
View File

@ -1801,68 +1801,22 @@ func autoConvert_v1alpha3_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
out.Version = in.Version out.Version = in.Version
out.MemoryRequest = in.MemoryRequest out.MemoryRequest = in.MemoryRequest
out.CPURequest = in.CPURequest out.CPURequest = in.CPURequest
out.AccessLog = in.AccessLog
out.AgentLabels = in.AgentLabels
out.AgentPrometheusPort = in.AgentPrometheusPort out.AgentPrometheusPort = in.AgentPrometheusPort
out.AllowLocalhost = in.AllowLocalhost
out.AutoIpv6NodeRoutes = in.AutoIpv6NodeRoutes
out.BPFRoot = in.BPFRoot
out.ChainingMode = in.ChainingMode out.ChainingMode = in.ChainingMode
out.ContainerRuntime = in.ContainerRuntime
out.ContainerRuntimeEndpoint = in.ContainerRuntimeEndpoint
out.Debug = in.Debug out.Debug = in.Debug
out.DebugVerbose = in.DebugVerbose
out.Device = in.Device
out.DisableConntrack = in.DisableConntrack
out.DisableEndpointCRD = in.DisableEndpointCRD out.DisableEndpointCRD = in.DisableEndpointCRD
out.DisableIpv4 = in.DisableIpv4
out.DisableK8sServices = in.DisableK8sServices
out.EnablePolicy = in.EnablePolicy out.EnablePolicy = in.EnablePolicy
out.EnableL7Proxy = in.EnableL7Proxy out.EnableL7Proxy = in.EnableL7Proxy
out.EnableBPFMasquerade = in.EnableBPFMasquerade out.EnableBPFMasquerade = in.EnableBPFMasquerade
out.EnableEndpointHealthChecking = in.EnableEndpointHealthChecking out.EnableEndpointHealthChecking = in.EnableEndpointHealthChecking
out.EnableTracing = in.EnableTracing
out.EnablePrometheusMetrics = in.EnablePrometheusMetrics out.EnablePrometheusMetrics = in.EnablePrometheusMetrics
out.EnableEncryption = in.EnableEncryption out.EnableEncryption = in.EnableEncryption
out.EncryptionType = kops.CiliumEncryptionType(in.EncryptionType) out.EncryptionType = kops.CiliumEncryptionType(in.EncryptionType)
out.EnvoyLog = in.EnvoyLog
out.IdentityAllocationMode = in.IdentityAllocationMode out.IdentityAllocationMode = in.IdentityAllocationMode
out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod
out.Ipv4ClusterCIDRMaskSize = in.Ipv4ClusterCIDRMaskSize
out.Ipv4Node = in.Ipv4Node
out.Ipv4Range = in.Ipv4Range
out.Ipv4ServiceRange = in.Ipv4ServiceRange
out.Ipv6ClusterAllocCidr = in.Ipv6ClusterAllocCidr
out.Ipv6Node = in.Ipv6Node
out.Ipv6Range = in.Ipv6Range
out.Ipv6ServiceRange = in.Ipv6ServiceRange
out.K8sAPIServer = in.K8sAPIServer
out.K8sKubeconfigPath = in.K8sKubeconfigPath
out.KeepBPFTemplates = in.KeepBPFTemplates
out.KeepConfig = in.KeepConfig
out.LabelPrefixFile = in.LabelPrefixFile
out.Labels = in.Labels
out.LB = in.LB
out.LibDir = in.LibDir
out.LogDrivers = in.LogDrivers
out.LogOpt = in.LogOpt
out.Logstash = in.Logstash
out.LogstashAgent = in.LogstashAgent
out.LogstashProbeTimer = in.LogstashProbeTimer
out.DisableMasquerade = in.DisableMasquerade out.DisableMasquerade = in.DisableMasquerade
out.Nat46Range = in.Nat46Range
out.AgentPodAnnotations = in.AgentPodAnnotations out.AgentPodAnnotations = in.AgentPodAnnotations
out.Pprof = in.Pprof
out.PrefilterDevice = in.PrefilterDevice
out.PrometheusServeAddr = in.PrometheusServeAddr
out.Restore = in.Restore
out.SingleClusterRoute = in.SingleClusterRoute
out.SocketPath = in.SocketPath
out.StateDir = in.StateDir
out.TracePayloadLen = in.TracePayloadLen
out.Tunnel = in.Tunnel out.Tunnel = in.Tunnel
out.EnableIpv6 = in.EnableIpv6
out.EnableIpv4 = in.EnableIpv4
out.MonitorAggregation = in.MonitorAggregation out.MonitorAggregation = in.MonitorAggregation
out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax
@ -1894,11 +1848,6 @@ func autoConvert_v1alpha3_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
} else { } else {
out.Hubble = nil out.Hubble = nil
} }
out.RemoveCbrBridge = in.RemoveCbrBridge
out.RestartPods = in.RestartPods
out.ReconfigureKubelet = in.ReconfigureKubelet
out.NodeInitBootstrapFile = in.NodeInitBootstrapFile
out.CniBinPath = in.CniBinPath
out.DisableCNPStatusUpdates = in.DisableCNPStatusUpdates out.DisableCNPStatusUpdates = in.DisableCNPStatusUpdates
return nil return nil
} }
@ -1912,68 +1861,22 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha3_CiliumNetworkingSpec(in *
out.Version = in.Version out.Version = in.Version
out.MemoryRequest = in.MemoryRequest out.MemoryRequest = in.MemoryRequest
out.CPURequest = in.CPURequest out.CPURequest = in.CPURequest
out.AccessLog = in.AccessLog
out.AgentLabels = in.AgentLabels
out.AgentPrometheusPort = in.AgentPrometheusPort out.AgentPrometheusPort = in.AgentPrometheusPort
out.AllowLocalhost = in.AllowLocalhost
out.AutoIpv6NodeRoutes = in.AutoIpv6NodeRoutes
out.BPFRoot = in.BPFRoot
out.ChainingMode = in.ChainingMode out.ChainingMode = in.ChainingMode
out.ContainerRuntime = in.ContainerRuntime
out.ContainerRuntimeEndpoint = in.ContainerRuntimeEndpoint
out.Debug = in.Debug out.Debug = in.Debug
out.DebugVerbose = in.DebugVerbose
out.Device = in.Device
out.DisableConntrack = in.DisableConntrack
out.DisableEndpointCRD = in.DisableEndpointCRD out.DisableEndpointCRD = in.DisableEndpointCRD
out.DisableIpv4 = in.DisableIpv4
out.DisableK8sServices = in.DisableK8sServices
out.EnablePolicy = in.EnablePolicy out.EnablePolicy = in.EnablePolicy
out.EnableL7Proxy = in.EnableL7Proxy out.EnableL7Proxy = in.EnableL7Proxy
out.EnableBPFMasquerade = in.EnableBPFMasquerade out.EnableBPFMasquerade = in.EnableBPFMasquerade
out.EnableEndpointHealthChecking = in.EnableEndpointHealthChecking out.EnableEndpointHealthChecking = in.EnableEndpointHealthChecking
out.EnableTracing = in.EnableTracing
out.EnablePrometheusMetrics = in.EnablePrometheusMetrics out.EnablePrometheusMetrics = in.EnablePrometheusMetrics
out.EnableEncryption = in.EnableEncryption out.EnableEncryption = in.EnableEncryption
out.EncryptionType = CiliumEncryptionType(in.EncryptionType) out.EncryptionType = CiliumEncryptionType(in.EncryptionType)
out.EnvoyLog = in.EnvoyLog
out.IdentityAllocationMode = in.IdentityAllocationMode out.IdentityAllocationMode = in.IdentityAllocationMode
out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod
out.Ipv4ClusterCIDRMaskSize = in.Ipv4ClusterCIDRMaskSize
out.Ipv4Node = in.Ipv4Node
out.Ipv4Range = in.Ipv4Range
out.Ipv4ServiceRange = in.Ipv4ServiceRange
out.Ipv6ClusterAllocCidr = in.Ipv6ClusterAllocCidr
out.Ipv6Node = in.Ipv6Node
out.Ipv6Range = in.Ipv6Range
out.Ipv6ServiceRange = in.Ipv6ServiceRange
out.K8sAPIServer = in.K8sAPIServer
out.K8sKubeconfigPath = in.K8sKubeconfigPath
out.KeepBPFTemplates = in.KeepBPFTemplates
out.KeepConfig = in.KeepConfig
out.LabelPrefixFile = in.LabelPrefixFile
out.Labels = in.Labels
out.LB = in.LB
out.LibDir = in.LibDir
out.LogDrivers = in.LogDrivers
out.LogOpt = in.LogOpt
out.Logstash = in.Logstash
out.LogstashAgent = in.LogstashAgent
out.LogstashProbeTimer = in.LogstashProbeTimer
out.DisableMasquerade = in.DisableMasquerade out.DisableMasquerade = in.DisableMasquerade
out.Nat46Range = in.Nat46Range
out.AgentPodAnnotations = in.AgentPodAnnotations out.AgentPodAnnotations = in.AgentPodAnnotations
out.Pprof = in.Pprof
out.PrefilterDevice = in.PrefilterDevice
out.PrometheusServeAddr = in.PrometheusServeAddr
out.Restore = in.Restore
out.SingleClusterRoute = in.SingleClusterRoute
out.SocketPath = in.SocketPath
out.StateDir = in.StateDir
out.TracePayloadLen = in.TracePayloadLen
out.Tunnel = in.Tunnel out.Tunnel = in.Tunnel
out.EnableIpv6 = in.EnableIpv6
out.EnableIpv4 = in.EnableIpv4
out.MonitorAggregation = in.MonitorAggregation out.MonitorAggregation = in.MonitorAggregation
out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax
@ -2005,11 +1908,6 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha3_CiliumNetworkingSpec(in *
} else { } else {
out.Hubble = nil out.Hubble = nil
} }
out.RemoveCbrBridge = in.RemoveCbrBridge
out.RestartPods = in.RestartPods
out.ReconfigureKubelet = in.ReconfigureKubelet
out.NodeInitBootstrapFile = in.NodeInitBootstrapFile
out.CniBinPath = in.CniBinPath
out.DisableCNPStatusUpdates = in.DisableCNPStatusUpdates out.DisableCNPStatusUpdates = in.DisableCNPStatusUpdates
return nil return nil
} }

39
pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go generated
View File

@ -534,28 +534,6 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
x := (*in).DeepCopy() x := (*in).DeepCopy()
*out = &x *out = &x
} }
if in.AgentLabels != nil {
in, out := &in.AgentLabels, &out.AgentLabels
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.ContainerRuntime != nil {
in, out := &in.ContainerRuntime, &out.ContainerRuntime
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.ContainerRuntimeEndpoint != nil {
in, out := &in.ContainerRuntimeEndpoint, &out.ContainerRuntimeEndpoint
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
if in.DebugVerbose != nil {
in, out := &in.DebugVerbose, &out.DebugVerbose
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.EnableL7Proxy != nil { if in.EnableL7Proxy != nil {
in, out := &in.EnableL7Proxy, &out.EnableL7Proxy in, out := &in.EnableL7Proxy, &out.EnableL7Proxy
*out = new(bool) *out = new(bool)
@ -571,23 +549,6 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
*out = new(bool) *out = new(bool)
**out = **in **out = **in
} }
if in.Labels != nil {
in, out := &in.Labels, &out.Labels
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.LogDrivers != nil {
in, out := &in.LogDrivers, &out.LogDrivers
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.LogOpt != nil {
in, out := &in.LogOpt, &out.LogOpt
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
if in.DisableMasquerade != nil { if in.DisableMasquerade != nil {
in, out := &in.DisableMasquerade, &out.DisableMasquerade in, out := &in.DisableMasquerade, &out.DisableMasquerade
*out = new(bool) *out = new(bool)

39
pkg/apis/kops/zz_generated.deepcopy.go generated
View File

@ -610,28 +610,6 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
x := (*in).DeepCopy() x := (*in).DeepCopy()
*out = &x *out = &x
} }
if in.AgentLabels != nil {
in, out := &in.AgentLabels, &out.AgentLabels
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.ContainerRuntime != nil {
in, out := &in.ContainerRuntime, &out.ContainerRuntime
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.ContainerRuntimeEndpoint != nil {
in, out := &in.ContainerRuntimeEndpoint, &out.ContainerRuntimeEndpoint
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
if in.DebugVerbose != nil {
in, out := &in.DebugVerbose, &out.DebugVerbose
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.EnableL7Proxy != nil { if in.EnableL7Proxy != nil {
in, out := &in.EnableL7Proxy, &out.EnableL7Proxy in, out := &in.EnableL7Proxy, &out.EnableL7Proxy
*out = new(bool) *out = new(bool)
@ -647,23 +625,6 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
*out = new(bool) *out = new(bool)
**out = **in **out = **in
} }
if in.Labels != nil {
in, out := &in.Labels, &out.Labels
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.LogDrivers != nil {
in, out := &in.LogDrivers, &out.LogDrivers
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.LogOpt != nil {
in, out := &in.LogOpt, &out.LogOpt
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
if in.DisableMasquerade != nil { if in.DisableMasquerade != nil {
in, out := &in.DisableMasquerade, &out.DisableMasquerade in, out := &in.DisableMasquerade, &out.DisableMasquerade
*out = new(bool) *out = new(bool)