Skip to content

Commit

Permalink
Merge pull request #8559 from olemarkus/cilium-deprecate-unused-fields
Browse files Browse the repository at this point in the history 
Document all the fields in the Cilium spec
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot committed Mar 13, 2020
2 parents 2b2de0f + 3a32b76 commit d6a2daf
Show file tree
Hide file tree
Showing 6 changed files with 805 additions and 208 deletions.
157 changes: 156 additions & 1 deletion k8s/crds/kops.k8s.io_clusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2582,160 +2582,315 @@ spec:
description: CiliumNetworkingSpec declares that we want Cilium networking
properties:
IPTablesRulesNoinstall:
description: 'IPTablesRulesNoinstall disables installing the
base IPTables rules used for masquerading and kube-proxy.
Default: false'
type: boolean
accessLog:
description: AccessLog is not implemented and may be removed
in the future. Setting this has no effect.
type: string
agentLabels:
description: AgentLabels is not implemented and may be removed
in the future. Setting this has no effect.
items:
type: string
type: array
agentPrometheusPort:
description: AgentPrometheusPort is the port to listen to 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.
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.
type: boolean
bpfCTGlobalAnyMax:
description: 'BPFCTGlobalAnyMax is the maximum number of entries
in the non-TCP CT table. Default: 262144'
type: integer
bpfCTGlobalTCPMax:
description: 'BPFCTGlobalTCPMax is the maximum number of entries
in the TCP CT table. Default: 524288'
type: integer
bpfRoot:
description: BPFRoot is not implemented and may be removed in
the future. Setting this has no effect.
type: string
clusterName:
description: ClusterName is the name of the cluster. It is 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.
type: string
containerRuntime:
description: ContainerRuntime is not implemented and may be
removed in the future. Setting this has no effect.
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.
type: object
containerRuntimeLabels:
description: 'ContainerRuntimeLabels enables fetching of container-runtime
labels from the specified container runtime and associating
them with endpoints. Supported values are: "none", "containerd",
"crio", "docker", "auto" As of Cilium 1.7.0, Cilium no longer
fetches information from the container runtime and this field
is ignored. Default: none'
type: string
debug:
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.
items:
type: string
type: array
device:
description: Device is not implemented and may be removed in
the future. Setting this has no effect.
type: string
disableConntrack:
description: DisableConntrack is not implemented and may be
removed in the future. Setting this has no effect.
type: boolean
disableIpv4:
description: 'DisableIpv4 is deprecated: Use EnableIpv4 instead.
Setting this flag has no effect.'
type: boolean
disableK8sServices:
description: DisableK8sServices is not implemented and may be
removed in the future. Setting this has no effect.
type: boolean
disableMasquerade:
description: DisableMasquerade disables masquerading traffic
to external destinations behind the node IP.
type: boolean
enableNodePort:
description: 'EnableNodePort replaces kube-proxy with Cilium''s
BPF implementation. Requires spec.kubeProxy.enabled be set
to false. Default: false'
type: boolean
enablePolicy:
description: 'EnablePolicy specifies the policy enforcement
mode. "default": Follows Kubernetes policy enforcement. "always":
Cilium restricts all traffic if no policy is in place. "never":
Cilium allows all traffic regardless of policies in place.
If unspecified, "default" policy mode will be used.'
type: string
enablePrometheusMetrics:
description: EnablePrometheusMetrics enables the Cilium "/metrics"
endpoint for both the agent and the operator.
type: boolean
enableTracing:
description: EnableTracing is not implemented and may be removed
in the future. Setting this has no effect.
type: boolean
enableipv4:
description: 'EnableIpv4 enables cluster IPv4 traffic. If both
EnableIpv6 and EnableIpv4 are set to false then IPv4 will
be enabled. Default: false'
type: boolean
enableipv6:
description: 'EnableIpv6 enables cluster IPv6 traffic. If both
EnableIpv6 and EnableIpv4 are set to false then IPv4 will
be enabled. Default: false'
type: boolean
envoyLog:
description: EnvoyLog is not implemented and may be removed
in the future. Setting this has no effect.
type: string
ipam:
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. Empty value will use host-scope address management.
type: string
ipv4ClusterCidrMaskSize:
description: Ipv4ClusterCIDRMaskSize is not implemented and
may be removed in the future. Setting this has no effect.
type: integer
ipv4Node:
description: Ipv4Node is not implemented and may be removed
in the future. Setting this has no effect.
type: string
ipv4Range:
description: Ipv4Range is not implemented and may be removed
in the future. Setting this has no effect.
type: string
ipv4ServiceRange:
description: Ipv4ServiceRange is not implemented and may be
removed in the future. Setting this has no effect.
type: string
ipv6ClusterAllocCidr:
description: Ipv6ClusterAllocCidr is not implemented and may
be removed in the future. Setting this has no effect.
type: string
ipv6Node:
description: Ipv6Node is not implemented and may be removed
in the future. Setting this has no effect.
type: string
ipv6Range:
description: Ipv6Range is not implemented and may be removed
in the future. Setting this has no effect.
type: string
ipv6ServiceRange:
description: Ipv6ServiceRange is not implemented and may be
removed in the future. Setting this has no effect.
type: string
k8sApiServer:
description: K8sAPIServer is not implemented and may be removed
in the future. Setting this has no effect.
type: string
k8sKubeconfigPath:
description: K8sKubeconfigPath is not implemented and may be
removed in the future. Setting this has no effect.
type: string
keepBpfTemplates:
description: KeepBPFTemplates is not implemented and may be
removed in the future. Setting this has no effect.
type: boolean
keepConfig:
description: KeepConfig is not implemented and may be removed
in the future. Setting this has no effect.
type: boolean
labelPrefixFile:
description: LabelPrefixFile is not implemented and may be removed
in the future. Setting this has currently no effect
type: string
labels:
description: Labels is not implemented and may be removed in
the future. Setting this has no effect.
items:
type: string
type: array
lb:
description: LB is not implemented and may be removed in the
future. Setting this has no effect.
type: string
libDir:
description: LibDir is not implemented and may be removed in
the future. Setting this has no effect.
type: string
logDriver:
description: LogDrivers is not implemented and may be removed
in the future. Setting this has no effect.
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.
type: object
logstash:
description: Logstash is not implemented and may be removed
in the future. Setting this has no effect.
type: boolean
logstashAgent:
description: LogstashAgent is not implemented and may be removed
in the future. Setting this has no effect.
type: string
logstashProbeTimer:
description: LogstashProbeTimer is not implemented and may be
removed in the future. Setting this has no effect.
format: int32
type: integer
monitorAggregation:
description: 'MonitorAggregation sets the level of packet monitoring.
Possible values are "low", "medium", or "maximum". Default:
medium'
type: string
nat46Range:
description: Nat6Range is not implemented and may be removed
in the future. Setting this has no effect.
type: string
nodeInitBootstrapFile:
description: NodeInitBootstrapFile is not implemented and may
be removed in the future. Setting this has no effect.
type: string
pprof:
description: Pprof is not implemented and may be removed in
the future. Setting this has no effect.
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.
type: string
prometheusServeAddr:
description: PrometheusServeAddr is deprecated. Use EnablePrometheusMetrics
and AgentPrometheusPort instead. Setting this has no effect.
type: string
reconfigureKubelet:
description: ReconfigureKubelet is not implemented and may be
removed in the future. Setting this has no effect.
type: boolean
removeCbrBridge:
description: node init options
description: RemoveCbrBridge is not implemented and may be removed
in the future. Setting this has no effect.
type: boolean
restartPods:
description: RestartPods is not implemented and may be removed
in the future. Setting this has no effect.
type: boolean
restore:
description: Restore is not implemented and may be removed in
the future. Setting this has no effect.
type: boolean
sidecarIstioProxyImage:
description: 'SidecarIstioProxyImage is the regular expression
matching compatible Istio sidecar istio-proxy container 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.
type: boolean
socketPath:
description: SocketPath is not implemented and may be removed
in the future. Setting this has no effect.
type: string
stateDir:
description: StateDir is not implemented and may be removed
in the future. Setting this has no effect.
type: string
toFqdnsEnablePoller:
description: 'ToFqdnsEnablePoller replaces the DNS proxy-based
implementation of FQDN policies with the less powerful legacy
implementation. Default: false'
type: boolean
tracePayloadlen:
description: TracePayloadLen is not implemented and may be removed
in the future. Setting this has no effect.
type: integer
tunnel:
description: 'Tunnel specifies the Cilium tunelling mode. Possible
values are "vxlan", "geneve", or "disabled". Default: vxlan'
type: string
version:
description: Version is the version of the Cilium agent and
the Cilium Operator.
type: string
required:
- IPTablesRulesNoinstall
Expand Down
Loading

0 comments on commit d6a2daf

Please sign in to comment.