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

Remove unused Cilium fields from v1alpha3 API

This commit is contained in:
John Gardiner Myers 2021-10-25 21:20:07 -07:00
parent 21b9e6b8ee
commit 36f2686624
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

@ -4432,12 +4432,10 @@ spec:
Default: false'
type: boolean
accessLog:
description: AccessLog is not implemented and may be removed
in the future. Setting this has no effect.
description: AccessLog is unused.
type: string
agentLabels:
description: AgentLabels is not implemented and may be removed
in the future. Setting this has no effect.
description: AgentLabels is unused.
items:
type: string
type: array
@ -4452,16 +4450,14 @@ spec:
for Prometheus metrics. Defaults to 9090.
type: integer
allowLocalhost:
description: AllowLocalhost is not implemented and may be
removed in the future. Setting this has no effect.
description: AllowLocalhost is unused.
type: string
autoDirectNodeRoutes:
description: 'AutoDirectNodeRoutes adds automatic L2 routing
between nodes. Default: false'
type: boolean
autoIpv6NodeRoutes:
description: AutoIpv6NodeRoutes is not implemented and may
be removed in the future. Setting this has no effect.
description: AutoIpv6NodeRoutes is unused.
type: boolean
bpfCTGlobalAnyMax:
description: 'BPFCTGlobalAnyMax is the maximum number of entries
@ -4504,11 +4500,10 @@ spec:
in endpoint policy map. Default: 16384'
type: integer
bpfRoot:
description: BPFRoot is not implemented and may be removed
in the future. Setting this has no effect.
description: BPFRoot is unused.
type: string
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
network connectivity and IP address management is managed
by the non-Cilium CNI plugin, but Cilium attaches eBPF programs
@ -4521,20 +4516,17 @@ spec:
only relevant when building a mesh of clusters.
type: string
cniBinPath:
description: CniBinPath is not implemented and may be removed
in the future. Setting this has no effect.
description: CniBinPath is unused.
type: string
containerRuntime:
description: ContainerRuntime is not implemented and may be
removed in the future. Setting this has no effect.
description: ContainerRuntime is unused.
items:
type: string
type: array
containerRuntimeEndpoint:
additionalProperties:
type: string
description: ContainerRuntimeEndpoint is not implemented and
may be removed in the future. Setting this has no effect.
description: ContainerRuntimeEndpoint is unused.
type: object
containerRuntimeLabels:
description: 'ContainerRuntimeLabels enables fetching of container-runtime
@ -4556,34 +4548,29 @@ spec:
description: Debug runs Cilium in debug mode.
type: boolean
debugVerbose:
description: DebugVerbose is not implemented and may be removed
in the future. Setting this has no effect.
description: DebugVerbose is unused.
items:
type: string
type: array
device:
description: Device is not implemented and may be removed
in the future. Setting this has no effect.
description: Device is unused.
type: string
disableCNPStatusUpdates:
description: Determines if CNP NodeStatus updates will be
sent to the Kubernetes api-server.
description: DisableCNPStatusUpdates determines if CNP NodeStatus
updates will be sent to the Kubernetes api-server.
type: boolean
disableConntrack:
description: DisableConntrack is not implemented and may be
removed in the future. Setting this has no effect.
description: DisableConntrack is unused.
type: boolean
disableEndpointCRD:
description: 'DisableEndpointCRD disables usage of CiliumEndpoint
CRD. Default: false'
type: boolean
disableIpv4:
description: 'DisableIpv4 is deprecated: Use EnableIpv4 instead.
Setting this flag has no effect.'
description: DisableIpv4 is unused.
type: boolean
disableK8sServices:
description: DisableK8sServices is not implemented and may
be removed in the future. Setting this has no effect.
description: DisableK8sServices is unused.
type: boolean
disableMasquerade:
description: DisableMasquerade disables masquerading traffic
@ -4630,28 +4617,24 @@ spec:
endpoint for both the agent and the operator.
type: boolean
enableRemoteNodeIdentity:
description: 'EnableRemoteNodeIdentity enables the remote-node-identity
added in Cilium 1.7.0. Default: true'
description: 'EnableRemoteNodeIdentity enables the remote-node-identity.
Default: true'
type: boolean
enableTracing:
description: EnableTracing is not implemented and may be removed
in the future. Setting this has no effect.
description: EnableTracing is unused.
type: boolean
enableipv4:
description: EnableIpv4 is not implemented and may be removed
in the future. Setting this has no effect.
description: EnableIpv4 is unused.
type: boolean
enableipv6:
description: EnableIpv6 is not implemented and may be removed
in the future. Setting this has no effect.
description: EnableIpv6 is unused.
type: boolean
encryptionType:
description: 'EncryptionType specifies Cilium Encryption method
("ipsec", "wireguard"). Default: ipsec'
type: string
envoyLog:
description: EnvoyLog is not implemented and may be removed
in the future. Setting this has no effect.
description: EnvoyLog is unused.
type: string
etcdManaged:
description: 'EtcdManagd installs an additional etcd cluster
@ -4682,104 +4665,82 @@ spec:
to wait before using a changed identity. Default: 5s'
type: string
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
use AWS native networking for pods. Eni requires masquerade
to be set to false. "crd" will use CRDs for controlling
IP address management. "hostscope" will use hostscope IPAM
mode. "kubernetes" will use addersing based on node pod
CIDR. Empty value will use hostscope for cilum <= 1.7 and
"kubernetes" otherwise.
CIDR. Default: "kubernetes".'
type: string
ipv4ClusterCidrMaskSize:
description: Ipv4ClusterCIDRMaskSize is not implemented and
may be removed in the future. Setting this has no effect.
description: Ipv4ClusterCIDRMaskSize is unused.
type: integer
ipv4Node:
description: Ipv4Node is not implemented and may be removed
in the future. Setting this has no effect.
description: Ipv4Node is unused.
type: string
ipv4Range:
description: Ipv4Range is not implemented and may be removed
in the future. Setting this has no effect.
description: Ipv4Range is unused.
type: string
ipv4ServiceRange:
description: Ipv4ServiceRange is not implemented and may be
removed in the future. Setting this has no effect.
description: Ipv4ServiceRange is unused.
type: string
ipv6ClusterAllocCidr:
description: Ipv6ClusterAllocCidr is not implemented and may
be removed in the future. Setting this has no effect.
description: Ipv6ClusterAllocCidr is unused.
type: string
ipv6Node:
description: Ipv6Node is not implemented and may be removed
in the future. Setting this has no effect.
description: Ipv6Node is unused.
type: string
ipv6Range:
description: Ipv6Range is not implemented and may be removed
in the future. Setting this has no effect.
description: Ipv6Range is unused.
type: string
ipv6ServiceRange:
description: Ipv6ServiceRange is not implemented and may be
removed in the future. Setting this has no effect.
description: Ipv6ServiceRange is unused.
type: string
k8sApiServer:
description: K8sAPIServer is not implemented and may be removed
in the future. Setting this has no effect.
description: K8sAPIServer is unused.
type: string
k8sKubeconfigPath:
description: K8sKubeconfigPath is not implemented and may
be removed in the future. Setting this has no effect.
description: K8sKubeconfigPath is unused.
type: string
keepBpfTemplates:
description: KeepBPFTemplates is not implemented and may be
removed in the future. Setting this has no effect.
description: KeepBPFTemplates is unused.
type: boolean
keepConfig:
description: KeepConfig is not implemented and may be removed
in the future. Setting this has no effect.
description: KeepConfig is unused.
type: boolean
labelPrefixFile:
description: LabelPrefixFile is not implemented and may be
removed in the future. Setting this has currently no effect
description: LabelPrefixFile is unused.
type: string
labels:
description: Labels is not implemented and may be removed
in the future. Setting this has no effect.
description: Labels is unused.
items:
type: string
type: array
lb:
description: LB is not implemented and may be removed in the
future. Setting this has no effect.
description: LB is unused.
type: string
libDir:
description: LibDir is not implemented and may be removed
in the future. Setting this has no effect.
description: LibDir is unused.
type: string
logDriver:
description: LogDrivers is not implemented and may be removed
in the future. Setting this has no effect.
description: LogDrivers is unused.
items:
type: string
type: array
logOpt:
additionalProperties:
type: string
description: LogOpt is not implemented and may be removed
in the future. Setting this has no effect.
description: LogOpt is unused.
type: object
logstash:
description: Logstash is not implemented and may be removed
in the future. Setting this has no effect.
description: Logstash is unused.
type: boolean
logstashAgent:
description: LogstashAgent is not implemented and may be removed
in the future. Setting this has no effect.
description: LogstashAgent is unused.
type: string
logstashProbeTimer:
description: LogstashProbeTimer is not implemented and may
be removed in the future. Setting this has no effect.
description: LogstashProbeTimer is unused.
format: int32
type: integer
memoryRequest:
@ -4796,44 +4757,35 @@ spec:
Default: medium'
type: string
nat46Range:
description: Nat6Range is not implemented and may be removed
in the future. Setting this has no effect.
description: Nat46Range is unused.
type: string
nodeInitBootstrapFile:
description: NodeInitBootstrapFile is not implemented and
may be removed in the future. Setting this has no effect.
description: NodeInitBootstrapFile is unused.
type: string
pprof:
description: Pprof is not implemented and may be removed in
the future. Setting this has no effect.
description: Pprof is unused.
type: boolean
preallocateBPFMaps:
description: 'PreallocateBPFMaps reduces the per-packet latency
at the expense of up-front memory allocation. Default: true'
type: boolean
prefilterDevice:
description: PrefilterDevice is not implemented and may be
removed in the future. Setting this has no effect.
description: PrefilterDevice is unused.
type: string
prometheusServeAddr:
description: PrometheusServeAddr is deprecated. Use EnablePrometheusMetrics
and AgentPrometheusPort instead. Setting this has no effect.
description: PrometheusServeAddr is unused.
type: string
reconfigureKubelet:
description: ReconfigureKubelet is not implemented and may
be removed in the future. Setting this has no effect.
description: ReconfigureKubelet is unused.
type: boolean
removeCbrBridge:
description: RemoveCbrBridge is not implemented and may be
removed in the future. Setting this has no effect.
description: RemoveCbrBridge is unused.
type: boolean
restartPods:
description: RestartPods is not implemented and may be removed
in the future. Setting this has no effect.
description: RestartPods is unused.
type: boolean
restore:
description: Restore is not implemented and may be removed
in the future. Setting this has no effect.
description: Restore is unused.
type: boolean
sidecarIstioProxyImage:
description: 'SidecarIstioProxyImage is the regular expression
@ -4841,16 +4793,13 @@ spec:
image names. Default: cilium/istio_proxy'
type: string
singleClusterRoute:
description: SingleClusterRoute is not implemented and may
be removed in the future. Setting this has no effect.
description: SingleClusterRoute is unused.
type: boolean
socketPath:
description: SocketPath is not implemented and may be removed
in the future. Setting this has no effect.
description: SocketPath is unused.
type: string
stateDir:
description: StateDir is not implemented and may be removed
in the future. Setting this has no effect.
description: StateDir is unused.
type: string
toFqdnsDnsRejectResponseCode:
description: 'ToFqdnsDNSRejectResponseCode sets the DNS response
@ -4863,8 +4812,7 @@ spec:
implementation. Default: false'
type: boolean
tracePayloadlen:
description: TracePayloadLen is not implemented and may be
removed in the future. Setting this has no effect.
description: TracePayloadLen is unused.
type: integer
tunnel:
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 *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.
// Defaults to 9090.
AgentPrometheusPort int `json:"agentPrometheusPort,omitempty"`
// AllowLocalhost is not implemented and may be removed in the future.
// 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.
// ChainingMode allows using Cilium in combination with other CNI plugins.
// 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 plugin to provide L3/L4 network visibility, policy enforcement and other advanced features.
// Default: none
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 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.
// Default: false
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.
// "default": Follows Kubernetes policy enforcement.
// "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.
// Default: true
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 bool `json:"enablePrometheusMetrics,omitempty"`
// EnableEncryption enables Cilium Encryption.
@ -351,119 +312,20 @@ type CiliumNetworkingSpec struct {
// EncryptionType specifies Cilium Encryption method ("ipsec", "wireguard").
// Default: ipsec
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").
// Default: crd
IdentityAllocationMode string `json:"identityAllocationMode,omitempty"`
// IdentityChangeGracePeriod specifies the duration to wait before using a changed identity.
// Default: 5s
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 *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.
// Default: none
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".
// Default: vxlan
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".
// Default: medium
MonitorAggregation string `json:"monitorAggregation,omitempty"`
@ -525,7 +387,7 @@ type CiliumNetworkingSpec struct {
// "crd" will use CRDs for controlling IP address management.
// "hostscope" will use hostscope IPAM mode.
// "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"`
// IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy.
// Default: false
@ -546,28 +408,13 @@ type CiliumNetworkingSpec struct {
// The cluster is operated by cilium-etcd-operator.
// Default: false
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
EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"`
// Hubble configures the Hubble service on the Cilium agent.
Hubble *HubbleSpec `json:"hubble,omitempty"`
// RemoveCbrBridge is not implemented and may be removed in the future.
// 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 determines if CNP NodeStatus updates will be sent to the Kubernetes api-server.
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 *resource.Quantity `json:"cpuRequest,omitempty"`
// AccessLog is not implemented and may be removed in the future.
// Setting this has no effect.
// AccessLog is unused.
// +k8s:conversion-gen=false
AccessLog string `json:"accessLog,omitempty"`
// AgentLabels is not implemented and may be removed in the future.
// Setting this has no effect.
// AgentLabels is unused.
// +k8s:conversion-gen=false
AgentLabels []string `json:"agentLabels,omitempty"`
// AgentPrometheusPort is the port to listen to for Prometheus metrics.
// Defaults to 9090.
AgentPrometheusPort int `json:"agentPrometheusPort,omitempty"`
// AllowLocalhost is not implemented and may be removed in the future.
// Setting this has no effect.
// AllowLocalhost is unused.
// +k8s:conversion-gen=false
AllowLocalhost string `json:"allowLocalhost,omitempty"`
// AutoIpv6NodeRoutes is not implemented and may be removed in the future.
// Setting this has no effect.
// AutoIpv6NodeRoutes is unused.
// +k8s:conversion-gen=false
AutoIpv6NodeRoutes bool `json:"autoIpv6NodeRoutes,omitempty"`
// BPFRoot is not implemented and may be removed in the future.
// Setting this has no effect.
// BPFRoot is unused.
// +k8s:conversion-gen=false
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
// 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.
// Default: none
ChainingMode string `json:"chainingMode,omitempty"`
// ContainerRuntime is not implemented and may be removed in the future.
// Setting this has no effect.
// ContainerRuntime is unused.
// +k8s:conversion-gen=false
ContainerRuntime []string `json:"containerRuntime,omitempty"`
// ContainerRuntimeEndpoint is not implemented and may be removed in the future.
// Setting this has no effect.
// ContainerRuntimeEndpoint is unused.
// +k8s:conversion-gen=false
ContainerRuntimeEndpoint map[string]string `json:"containerRuntimeEndpoint,omitempty"`
// Debug runs Cilium in debug mode.
Debug bool `json:"debug,omitempty"`
// DebugVerbose is not implemented and may be removed in the future.
// Setting this has no effect.
// DebugVerbose is unused.
// +k8s:conversion-gen=false
DebugVerbose []string `json:"debugVerbose,omitempty"`
// Device is not implemented and may be removed in the future.
// Setting this has no effect.
// Device is unused.
// +k8s:conversion-gen=false
Device string `json:"device,omitempty"`
// DisableConntrack is not implemented and may be removed in the future.
// Setting this has no effect.
// DisableConntrack is unused.
// +k8s:conversion-gen=false
DisableConntrack bool `json:"disableConntrack,omitempty"`
// DisableEndpointCRD disables usage of CiliumEndpoint CRD.
// Default: false
DisableEndpointCRD bool `json:"disableEndpointCRD,omitempty"`
// DisableIpv4 is deprecated: Use EnableIpv4 instead.
// Setting this flag has no effect.
// DisableIpv4 is unused.
// +k8s:conversion-gen=false
DisableIpv4 bool `json:"disableIpv4,omitempty"`
// DisableK8sServices is not implemented and may be removed in the future.
// Setting this has no effect.
// DisableK8sServices is unused.
// +k8s:conversion-gen=false
DisableK8sServices bool `json:"disableK8sServices,omitempty"`
// EnablePolicy specifies the policy enforcement mode.
// "default": Follows Kubernetes policy enforcement.
@ -349,8 +349,8 @@ type CiliumNetworkingSpec struct {
// EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints.
// Default: true
EnableEndpointHealthChecking *bool `json:"enableEndpointHealthChecking,omitempty"`
// EnableTracing is not implemented and may be removed in the future.
// Setting this has no effect.
// EnableTracing is unused.
// +k8s:conversion-gen=false
EnableTracing bool `json:"enableTracing,omitempty"`
// EnablePrometheusMetrics enables the Cilium "/metrics" endpoint for both the agent and the operator.
EnablePrometheusMetrics bool `json:"enablePrometheusMetrics,omitempty"`
@ -360,8 +360,8 @@ type CiliumNetworkingSpec struct {
// EncryptionType specifies Cilium Encryption method ("ipsec", "wireguard").
// Default: ipsec
EncryptionType CiliumEncryptionType `json:"encryptionType,omitempty"`
// EnvoyLog is not implemented and may be removed in the future.
// Setting this has no effect.
// EnvoyLog is unused.
// +k8s:conversion-gen=false
EnvoyLog string `json:"envoyLog,omitempty"`
// IdentityAllocationMode specifies in which backend identities are stored ("crd", "kvstore").
// Default: crd
@ -369,109 +369,109 @@ type CiliumNetworkingSpec struct {
// IdentityChangeGracePeriod specifies the duration to wait before using a changed identity.
// Default: 5s
IdentityChangeGracePeriod string `json:"identityChangeGracePeriod,omitempty"`
// Ipv4ClusterCIDRMaskSize is not implemented and may be removed in the future.
// Setting this has no effect.
// Ipv4ClusterCIDRMaskSize is unused.
// +k8s:conversion-gen=false
Ipv4ClusterCIDRMaskSize int `json:"ipv4ClusterCidrMaskSize,omitempty"`
// Ipv4Node is not implemented and may be removed in the future.
// Setting this has no effect.
// Ipv4Node is unused.
// +k8s:conversion-gen=false
Ipv4Node string `json:"ipv4Node,omitempty"`
// Ipv4Range is not implemented and may be removed in the future.
// Setting this has no effect.
// Ipv4Range is unused.
// +k8s:conversion-gen=false
Ipv4Range string `json:"ipv4Range,omitempty"`
// Ipv4ServiceRange is not implemented and may be removed in the future.
// Setting this has no effect.
// Ipv4ServiceRange is unused.
// +k8s:conversion-gen=false
Ipv4ServiceRange string `json:"ipv4ServiceRange,omitempty"`
// Ipv6ClusterAllocCidr is not implemented and may be removed in the future.
// Setting this has no effect.
// Ipv6ClusterAllocCidr is unused.
// +k8s:conversion-gen=false
Ipv6ClusterAllocCidr string `json:"ipv6ClusterAllocCidr,omitempty"`
// Ipv6Node is not implemented and may be removed in the future.
// Setting this has no effect.
// Ipv6Node is unused.
// +k8s:conversion-gen=false
Ipv6Node string `json:"ipv6Node,omitempty"`
// Ipv6Range is not implemented and may be removed in the future.
// Setting this has no effect.
// Ipv6Range is unused.
// +k8s:conversion-gen=false
Ipv6Range string `json:"ipv6Range,omitempty"`
// Ipv6ServiceRange is not implemented and may be removed in the future.
// Setting this has no effect.
// Ipv6ServiceRange is unused.
// +k8s:conversion-gen=false
Ipv6ServiceRange string `json:"ipv6ServiceRange,omitempty"`
// K8sAPIServer is not implemented and may be removed in the future.
// Setting this has no effect.
// K8sAPIServer is unused.
// +k8s:conversion-gen=false
K8sAPIServer string `json:"k8sApiServer,omitempty"`
// K8sKubeconfigPath is not implemented and may be removed in the future.
// Setting this has no effect.
// K8sKubeconfigPath is unused.
// +k8s:conversion-gen=false
K8sKubeconfigPath string `json:"k8sKubeconfigPath,omitempty"`
// KeepBPFTemplates is not implemented and may be removed in the future.
// Setting this has no effect.
// KeepBPFTemplates is unused.
// +k8s:conversion-gen=false
KeepBPFTemplates bool `json:"keepBpfTemplates,omitempty"`
// KeepConfig is not implemented and may be removed in the future.
// Setting this has no effect.
// KeepConfig is unused.
// +k8s:conversion-gen=false
KeepConfig bool `json:"keepConfig,omitempty"`
// LabelPrefixFile is not implemented and may be removed in the future.
// Setting this has currently no effect
// LabelPrefixFile is unused.
// +k8s:conversion-gen=false
LabelPrefixFile string `json:"labelPrefixFile,omitempty"`
// Labels is not implemented and may be removed in the future.
// Setting this has no effect.
// Labels is unused.
// +k8s:conversion-gen=false
Labels []string `json:"labels,omitempty"`
// LB is not implemented and may be removed in the future.
// Setting this has no effect.
// LB is unused.
// +k8s:conversion-gen=false
LB string `json:"lb,omitempty"`
// LibDir is not implemented and may be removed in the future.
// Setting this has no effect.
// LibDir is unused.
// +k8s:conversion-gen=false
LibDir string `json:"libDir,omitempty"`
// LogDrivers is not implemented and may be removed in the future.
// Setting this has no effect.
// LogDrivers is unused.
// +k8s:conversion-gen=false
LogDrivers []string `json:"logDriver,omitempty"`
// LogOpt is not implemented and may be removed in the future.
// Setting this has no effect.
// LogOpt is unused.
// +k8s:conversion-gen=false
LogOpt map[string]string `json:"logOpt,omitempty"`
// Logstash is not implemented and may be removed in the future.
// Setting this has no effect.
// Logstash is unused.
// +k8s:conversion-gen=false
Logstash bool `json:"logstash,omitempty"`
// LogstashAgent is not implemented and may be removed in the future.
// Setting this has no effect.
// LogstashAgent is unused.
// +k8s:conversion-gen=false
LogstashAgent string `json:"logstashAgent,omitempty"`
// LogstashProbeTimer is not implemented and may be removed in the future.
// Setting this has no effect.
// LogstashProbeTimer is unused.
// +k8s:conversion-gen=false
LogstashProbeTimer uint32 `json:"logstashProbeTimer,omitempty"`
// DisableMasquerade disables masquerading traffic to external destinations behind the node IP.
DisableMasquerade *bool `json:"disableMasquerade,omitempty"`
// Nat6Range is not implemented and may be removed in the future.
// Setting this has no effect.
// Nat46Range is unused.
// +k8s:conversion-gen=false
Nat46Range string `json:"nat46Range,omitempty"`
// AgentPodAnnotations makes possible to add additional annotations to the cilium agent.
// Default: none
AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"`
// Pprof is not implemented and may be removed in the future.
// Setting this has no effect.
// Pprof is unused.
// +k8s:conversion-gen=false
Pprof bool `json:"pprof,omitempty"`
// PrefilterDevice is not implemented and may be removed in the future.
// Setting this has no effect.
// PrefilterDevice is unused.
// +k8s:conversion-gen=false
PrefilterDevice string `json:"prefilterDevice,omitempty"`
// PrometheusServeAddr is deprecated. Use EnablePrometheusMetrics and AgentPrometheusPort instead.
// Setting this has no effect.
// PrometheusServeAddr is unused.
// +k8s:conversion-gen=false
PrometheusServeAddr string `json:"prometheusServeAddr,omitempty"`
// Restore is not implemented and may be removed in the future.
// Setting this has no effect.
// Restore is unused.
// +k8s:conversion-gen=false
Restore bool `json:"restore,omitempty"`
// SingleClusterRoute is not implemented and may be removed in the future.
// Setting this has no effect.
// SingleClusterRoute is unused.
// +k8s:conversion-gen=false
SingleClusterRoute bool `json:"singleClusterRoute,omitempty"`
// SocketPath is not implemented and may be removed in the future.
// Setting this has no effect.
// SocketPath is unused.
// +k8s:conversion-gen=false
SocketPath string `json:"socketPath,omitempty"`
// StateDir is not implemented and may be removed in the future.
// Setting this has no effect.
// StateDir is unused.
// +k8s:conversion-gen=false
StateDir string `json:"stateDir,omitempty"`
// TracePayloadLen is not implemented and may be removed in the future.
// Setting this has no effect.
// TracePayloadLen is unused.
// +k8s:conversion-gen=false
TracePayloadLen int `json:"tracePayloadlen,omitempty"`
// Tunnel specifies the Cilium tunnelling mode. Possible values are "vxlan", "geneve", or "disabled".
// Default: vxlan
Tunnel string `json:"tunnel,omitempty"`
// EnableIpv6 is not implemented and may be removed in the future.
// Setting this has no effect.
// EnableIpv6 is unused.
// +k8s:conversion-gen=false
EnableIpv6 bool `json:"enableipv6,omitempty"`
// EnableIpv4 is not implemented and may be removed in the future.
// Setting this has no effect.
// EnableIpv4 is unused.
// +k8s:conversion-gen=false
EnableIpv4 bool `json:"enableipv4,omitempty"`
// MonitorAggregation sets the level of packet monitoring. Possible values are "low", "medium", or "maximum".
// Default: medium
@ -534,7 +534,7 @@ type CiliumNetworkingSpec struct {
// "crd" will use CRDs for controlling IP address management.
// "hostscope" will use hostscope IPAM mode.
// "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"`
// IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy.
// Default: false
@ -555,28 +555,28 @@ type CiliumNetworkingSpec struct {
// The cluster is operated by cilium-etcd-operator.
// Default: false
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
EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"`
// Hubble configures the Hubble service on the Cilium agent.
Hubble *HubbleSpec `json:"hubble,omitempty"`
// RemoveCbrBridge is not implemented and may be removed in the future.
// Setting this has no effect.
// RemoveCbrBridge is unused.
// +k8s:conversion-gen=false
RemoveCbrBridge bool `json:"removeCbrBridge,omitempty"`
// RestartPods is not implemented and may be removed in the future.
// Setting this has no effect.
// RestartPods is unused.
// +k8s:conversion-gen=false
RestartPods bool `json:"restartPods,omitempty"`
// ReconfigureKubelet is not implemented and may be removed in the future.
// Setting this has no effect.
// ReconfigureKubelet is unused.
// +k8s:conversion-gen=false
ReconfigureKubelet bool `json:"reconfigureKubelet,omitempty"`
// NodeInitBootstrapFile is not implemented and may be removed in the future.
// Setting this has no effect.
// NodeInitBootstrapFile is unused.
// +k8s:conversion-gen=false
NodeInitBootstrapFile string `json:"nodeInitBootstrapFile,omitempty"`
// CniBinPath is not implemented and may be removed in the future.
// Setting this has no effect.
// CniBinPath is unused.
// +k8s:conversion-gen=false
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"`
}

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

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

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

@ -247,13 +247,8 @@ type AmazonVPCNetworkingSpec struct {
Env []EnvVar `json:"env,omitempty"`
}
const CiliumIpamEni = "eni"
type CiliumEncryptionType string
const CiliumEncryptionTypeIPSec CiliumEncryptionType = "ipsec"
const CiliumEncryptionTypeWireguard CiliumEncryptionType = "wireguard"
// CiliumNetworkingSpec declares that we want Cilium networking
type CiliumNetworkingSpec struct {
// 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 *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.
// Defaults to 9090.
AgentPrometheusPort int `json:"agentPrometheusPort,omitempty"`
// AllowLocalhost is not implemented and may be removed in the future.
// 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.
// ChainingMode allows using Cilium in combination with other CNI plugins.
// 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 plugin to provide L3/L4 network visibility, policy enforcement and other advanced features.
// Default: none
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 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.
// Default: false
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.
// "default": Follows Kubernetes policy enforcement.
// "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.
// Default: true
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 bool `json:"enablePrometheusMetrics,omitempty"`
// EnableEncryption enables Cilium Encryption.
@ -340,119 +296,20 @@ type CiliumNetworkingSpec struct {
// EncryptionType specifies Cilium Encryption method ("ipsec", "wireguard").
// Default: ipsec
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").
// Default: crd
IdentityAllocationMode string `json:"identityAllocationMode,omitempty"`
// IdentityChangeGracePeriod specifies the duration to wait before using a changed identity.
// Default: 5s
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 *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.
// Default: none
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".
// Default: vxlan
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".
// Default: medium
MonitorAggregation string `json:"monitorAggregation,omitempty"`
@ -514,7 +371,7 @@ type CiliumNetworkingSpec struct {
// "crd" will use CRDs for controlling IP address management.
// "hostscope" will use hostscope IPAM mode.
// "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"`
// IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy.
// Default: false
@ -535,28 +392,13 @@ type CiliumNetworkingSpec struct {
// The cluster is operated by cilium-etcd-operator.
// Default: false
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
EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"`
// Hubble configures the Hubble service on the Cilium agent.
Hubble *HubbleSpec `json:"hubble,omitempty"`
// RemoveCbrBridge is not implemented and may be removed in the future.
// 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 determines if CNP NodeStatus updates will be sent to the Kubernetes api-server.
DisableCNPStatusUpdates *bool `json:"disableCNPStatusUpdates,omitempty"`
}

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

@ -1745,68 +1745,22 @@ func autoConvert_v1alpha3_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
out.Version = in.Version
out.MemoryRequest = in.MemoryRequest
out.CPURequest = in.CPURequest
out.AccessLog = in.AccessLog
out.AgentLabels = in.AgentLabels
out.AgentPrometheusPort = in.AgentPrometheusPort
out.AllowLocalhost = in.AllowLocalhost
out.AutoIpv6NodeRoutes = in.AutoIpv6NodeRoutes
out.BPFRoot = in.BPFRoot
out.ChainingMode = in.ChainingMode
out.ContainerRuntime = in.ContainerRuntime
out.ContainerRuntimeEndpoint = in.ContainerRuntimeEndpoint
out.Debug = in.Debug
out.DebugVerbose = in.DebugVerbose
out.Device = in.Device
out.DisableConntrack = in.DisableConntrack
out.DisableEndpointCRD = in.DisableEndpointCRD
out.DisableIpv4 = in.DisableIpv4
out.DisableK8sServices = in.DisableK8sServices
out.EnablePolicy = in.EnablePolicy
out.EnableL7Proxy = in.EnableL7Proxy
out.EnableBPFMasquerade = in.EnableBPFMasquerade
out.EnableEndpointHealthChecking = in.EnableEndpointHealthChecking
out.EnableTracing = in.EnableTracing
out.EnablePrometheusMetrics = in.EnablePrometheusMetrics
out.EnableEncryption = in.EnableEncryption
out.EncryptionType = kops.CiliumEncryptionType(in.EncryptionType)
out.EnvoyLog = in.EnvoyLog
out.IdentityAllocationMode = in.IdentityAllocationMode
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.Nat46Range = in.Nat46Range
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.EnableIpv6 = in.EnableIpv6
out.EnableIpv4 = in.EnableIpv4
out.MonitorAggregation = in.MonitorAggregation
out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax
@ -1839,11 +1793,6 @@ func autoConvert_v1alpha3_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
} else {
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
return nil
}
@ -1857,68 +1806,22 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha3_CiliumNetworkingSpec(in *
out.Version = in.Version
out.MemoryRequest = in.MemoryRequest
out.CPURequest = in.CPURequest
out.AccessLog = in.AccessLog
out.AgentLabels = in.AgentLabels
out.AgentPrometheusPort = in.AgentPrometheusPort
out.AllowLocalhost = in.AllowLocalhost
out.AutoIpv6NodeRoutes = in.AutoIpv6NodeRoutes
out.BPFRoot = in.BPFRoot
out.ChainingMode = in.ChainingMode
out.ContainerRuntime = in.ContainerRuntime
out.ContainerRuntimeEndpoint = in.ContainerRuntimeEndpoint
out.Debug = in.Debug
out.DebugVerbose = in.DebugVerbose
out.Device = in.Device
out.DisableConntrack = in.DisableConntrack
out.DisableEndpointCRD = in.DisableEndpointCRD
out.DisableIpv4 = in.DisableIpv4
out.DisableK8sServices = in.DisableK8sServices
out.EnablePolicy = in.EnablePolicy
out.EnableL7Proxy = in.EnableL7Proxy
out.EnableBPFMasquerade = in.EnableBPFMasquerade
out.EnableEndpointHealthChecking = in.EnableEndpointHealthChecking
out.EnableTracing = in.EnableTracing
out.EnablePrometheusMetrics = in.EnablePrometheusMetrics
out.EnableEncryption = in.EnableEncryption
out.EncryptionType = CiliumEncryptionType(in.EncryptionType)
out.EnvoyLog = in.EnvoyLog
out.IdentityAllocationMode = in.IdentityAllocationMode
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.Nat46Range = in.Nat46Range
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.EnableIpv6 = in.EnableIpv6
out.EnableIpv4 = in.EnableIpv4
out.MonitorAggregation = in.MonitorAggregation
out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax
@ -1951,11 +1854,6 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha3_CiliumNetworkingSpec(in *
} else {
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
return nil
}

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

@ -506,28 +506,6 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
x := (*in).DeepCopy()
*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 {
in, out := &in.EnableL7Proxy, &out.EnableL7Proxy
*out = new(bool)
@ -543,23 +521,6 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
*out = new(bool)
**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 {
in, out := &in.DisableMasquerade, &out.DisableMasquerade
*out = new(bool)

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

@ -582,28 +582,6 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
x := (*in).DeepCopy()
*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 {
in, out := &in.EnableL7Proxy, &out.EnableL7Proxy
*out = new(bool)
@ -619,23 +597,6 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
*out = new(bool)
**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 {
in, out := &in.DisableMasquerade, &out.DisableMasquerade
*out = new(bool)