Skip to content

Commit fb73211

Browse files
authored
Merge pull request #869 from meobilivang/update-calico-v.3.25.0-e2e-test
Update calico v.3.25.0 for E2E testing
2 parents 7f2a570 + 070165b commit fb73211

File tree

1 file changed

+70
-20
lines changed

1 file changed

+70
-20
lines changed

test/e2e/data/cni/calico/calico.yaml

Lines changed: 70 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# From: https://github.com/projectcalico/calico/releases/download/v3.24.5/release-v3.24.5.tgz
2+
# From: https://raw.githubusercontent.com/projectcalico/calico/v3.25.0/manifests/calico.yaml
33
# Source: calico/templates/calico-kube-controllers.yaml
44
# This manifest creates a Pod Disruption Budget for Controller to allow K8s Cluster Autoscaler to evict
55

@@ -150,6 +150,12 @@ spec:
150150
type: string
151151
type: object
152152
type: array
153+
ignoredInterfaces:
154+
description: IgnoredInterfaces indicates the network interfaces that
155+
needs to be excluded when reading device routes.
156+
items:
157+
type: string
158+
type: array
153159
listenPort:
154160
description: ListenPort is the port where BGP protocol should listen.
155161
Defaults to 179
@@ -368,12 +374,23 @@ spec:
368374
remote AS number comes from the remote node's NodeBGPSpec.ASNumber,
369375
or the global default if that is not set.
370376
type: string
377+
reachableBy:
378+
description: Add an exact, i.e. /32, static route toward peer IP in
379+
order to prevent route flapping. ReachableBy contains the address
380+
of the gateway which peer can be reached by.
381+
type: string
371382
sourceAddress:
372383
description: Specifies whether and how to configure a source address
373384
for the peerings generated by this BGPPeer resource. Default value
374385
"UseNodeIP" means to configure the node IP as the source address. "None"
375386
means not to configure a source address.
376387
type: string
388+
ttlSecurity:
389+
description: TTLSecurity enables the generalized TTL security mechanism
390+
(GTSM) which protects against spoofed packets by ignoring received
391+
packets with a smaller than expected TTL value. The provided value
392+
is the number of hops (edges) between the peers.
393+
type: integer
377394
type: object
378395
type: object
379396
served: true
@@ -858,9 +875,10 @@ spec:
858875
[Default: false]'
859876
type: boolean
860877
bpfEnforceRPF:
861-
description: 'BPFEnforceRPF enforce strict RPF on all interfaces with
862-
BPF programs regardless of what is the per-interfaces or global
863-
setting. Possible values are Disabled or Strict. [Default: Strict]'
878+
description: 'BPFEnforceRPF enforce strict RPF on all host interfaces
879+
with BPF programs regardless of what is the per-interfaces or global
880+
setting. Possible values are Disabled, Strict or Loose. [Default:
881+
Strict]'
864882
type: string
865883
bpfExtToServiceConnmark:
866884
description: 'BPFExtToServiceConnmark in BPF mode, control a 32bit
@@ -900,6 +918,14 @@ spec:
900918
kube-proxy. Lower values give reduced set-up latency. Higher values
901919
reduce Felix CPU usage by batching up more work. [Default: 1s]'
902920
type: string
921+
bpfL3IfacePattern:
922+
description: BPFL3IfacePattern is a regular expression that allows
923+
to list tunnel devices like wireguard or vxlan (i.e., L3 devices)
924+
in addition to BPFDataIfacePattern. That is, tunnel interfaces not
925+
created by Calico, that Calico workload traffic flows over as well
926+
as any interfaces that handle incoming traffic to nodeports and
927+
services from outside the cluster.
928+
type: string
903929
bpfLogLevel:
904930
description: 'BPFLogLevel controls the log level of the BPF programs
905931
when in BPF dataplane mode. One of "Off", "Info", or "Debug". The
@@ -975,11 +1001,12 @@ spec:
9751001
to use. Only used if UseInternalDataplaneDriver is set to false.
9761002
type: string
9771003
dataplaneWatchdogTimeout:
978-
description: 'DataplaneWatchdogTimeout is the readiness/liveness timeout
979-
used for Felix''s (internal) dataplane driver. Increase this value
1004+
description: "DataplaneWatchdogTimeout is the readiness/liveness timeout
1005+
used for Felix's (internal) dataplane driver. Increase this value
9801006
if you experience spurious non-ready or non-live events when Felix
9811007
is under heavy load. Decrease the value to get felix to report non-live
982-
or non-ready more quickly. [Default: 90s]'
1008+
or non-ready more quickly. [Default: 90s] \n Deprecated: replaced
1009+
by the generic HealthTimeoutOverrides."
9831010
type: string
9841011
debugDisableLogDropping:
9851012
type: boolean
@@ -1083,15 +1110,21 @@ spec:
10831110
type: object
10841111
type: array
10851112
featureDetectOverride:
1086-
description: FeatureDetectOverride is used to override the feature
1087-
detection. Values are specified in a comma separated list with no
1088-
spaces, example; "SNATFullyRandom=true,MASQFullyRandom=false,RestoreSupportsLock=".
1089-
"true" or "false" will force the feature, empty or omitted values
1090-
are auto-detected.
1113+
description: FeatureDetectOverride is used to override feature detection
1114+
based on auto-detected platform capabilities. Values are specified
1115+
in a comma separated list with no spaces, example; "SNATFullyRandom=true,MASQFullyRandom=false,RestoreSupportsLock=". "true"
1116+
or "false" will force the feature, empty or omitted values are auto-detected.
1117+
type: string
1118+
featureGates:
1119+
description: FeatureGates is used to enable or disable tech-preview
1120+
Calico features. Values are specified in a comma separated list
1121+
with no spaces, example; "BPFConnectTimeLoadBalancingWorkaround=enabled,XyZ=false".
1122+
This is used to enable features that are not fully production ready.
10911123
type: string
10921124
floatingIPs:
10931125
description: FloatingIPs configures whether or not Felix will program
1094-
floating IP addresses.
1126+
non-OpenStack floating IP addresses. (OpenStack-derived floating
1127+
IPs are always programmed, regardless of this setting.)
10951128
enum:
10961129
- Enabled
10971130
- Disabled
@@ -1108,6 +1141,23 @@ spec:
11081141
type: string
11091142
healthPort:
11101143
type: integer
1144+
healthTimeoutOverrides:
1145+
description: HealthTimeoutOverrides allows the internal watchdog timeouts
1146+
of individual subcomponents to be overridden. This is useful for
1147+
working around "false positive" liveness timeouts that can occur
1148+
in particularly stressful workloads or if CPU is constrained. For
1149+
a list of active subcomponents, see Felix's logs.
1150+
items:
1151+
properties:
1152+
name:
1153+
type: string
1154+
timeout:
1155+
type: string
1156+
required:
1157+
- name
1158+
- timeout
1159+
type: object
1160+
type: array
11111161
interfaceExclude:
11121162
description: 'InterfaceExclude is a comma-separated list of interfaces
11131163
that Felix should exclude when monitoring for host endpoints. The
@@ -1149,7 +1199,7 @@ spec:
11491199
type: string
11501200
iptablesBackend:
11511201
description: IptablesBackend specifies which backend of iptables will
1152-
be used. The default is legacy.
1202+
be used. The default is Auto.
11531203
type: string
11541204
iptablesFilterAllowAction:
11551205
type: string
@@ -4180,7 +4230,7 @@ rules:
41804230
resources:
41814231
- endpointslices
41824232
verbs:
4183-
- watch
4233+
- watch
41844234
- list
41854235
- apiGroups: [""]
41864236
resources:
@@ -4391,7 +4441,7 @@ spec:
43914441
# It can be deleted if this is a fresh installation, or if you have already
43924442
# upgraded to use calico-ipam.
43934443
- name: upgrade-ipam
4394-
image: docker.io/calico/cni:v3.24.5
4444+
image: docker.io/calico/cni:v3.25.0
43954445
imagePullPolicy: IfNotPresent
43964446
command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
43974447
envFrom:
@@ -4419,7 +4469,7 @@ spec:
44194469
# This container installs the CNI binaries
44204470
# and CNI network config file on each node.
44214471
- name: install-cni
4422-
image: docker.io/calico/cni:v3.24.5
4472+
image: docker.io/calico/cni:v3.25.0
44234473
imagePullPolicy: IfNotPresent
44244474
command: ["/opt/cni/bin/install"]
44254475
envFrom:
@@ -4462,7 +4512,7 @@ spec:
44624512
# i.e. bpf at /sys/fs/bpf and cgroup2 at /run/calico/cgroup. Calico-node initialisation is executed
44634513
# in best effort fashion, i.e. no failure for errors, to not disrupt pod creation in iptable mode.
44644514
- name: "mount-bpffs"
4465-
image: docker.io/calico/node:v3.24.5
4515+
image: docker.io/calico/node:v3.25.0
44664516
imagePullPolicy: IfNotPresent
44674517
command: ["calico-node", "-init", "-best-effort"]
44684518
volumeMounts:
@@ -4488,7 +4538,7 @@ spec:
44884538
# container programs network policy and routes on each
44894539
# host.
44904540
- name: calico-node
4491-
image: docker.io/calico/node:v3.24.5
4541+
image: docker.io/calico/node:v3.25.0
44924542
imagePullPolicy: IfNotPresent
44934543
envFrom:
44944544
- configMapRef:
@@ -4705,7 +4755,7 @@ spec:
47054755
priorityClassName: system-cluster-critical
47064756
containers:
47074757
- name: calico-kube-controllers
4708-
image: docker.io/calico/kube-controllers:v3.24.5
4758+
image: docker.io/calico/kube-controllers:v3.25.0
47094759
imagePullPolicy: IfNotPresent
47104760
env:
47114761
# Choose which controllers to run.

0 commit comments

Comments
 (0)