Skip to content

Commit c2362e7

Browse files
sridhartigerasridhartigera
authored
[master] Auto pick tigera#3895: Mount BPF FS for iptables mode in EE as we use BPF maps, (tigera#3896)
* Mount BPF FS for iptables mode in EE as we use BPF maps, programs for DNS Inline policy. * Fix UTs
1 parent 6a7b880 commit c2362e7

File tree

44 files changed

+57
-4475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+57
-4475
lines changed

‎pkg/controller/installation/core_controller_test.go‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ var _ = Describe("Testing core-controller installation", func() {
292292
fmt.Sprintf("some.registry.org/%s:%s",
293293
components.ComponentTigeraNode.Image,
294294
components.ComponentTigeraNode.Version)))
295-
Expect(ds.Spec.Template.Spec.InitContainers).To(HaveLen(4))
295+
Expect(ds.Spec.Template.Spec.InitContainers).To(HaveLen(5))
296296
fv := test.GetContainer(ds.Spec.Template.Spec.InitContainers, "flexvol-driver")
297297
Expect(fv).ToNot(BeNil())
298298
Expect(fv.Image).To(Equal(
@@ -317,6 +317,12 @@ var _ = Describe("Testing core-controller installation", func() {
317317
fmt.Sprintf("some.registry.org/%s:%s",
318318
components.ComponentTigeraCSRInitContainer.Image,
319319
components.ComponentTigeraCSRInitContainer.Version)))
320+
bpfInit := test.GetContainer(ds.Spec.Template.Spec.InitContainers, "mount-bpffs")
321+
Expect(bpfInit).ToNot(BeNil())
322+
Expect(bpfInit.Image).To(Equal(
323+
fmt.Sprintf("some.registry.org/%s:%s",
324+
components.ComponentTigeraNode.Image,
325+
components.ComponentTigeraNode.Version)))
320326
})
321327

322328
It("should use images from imageset", func() {
@@ -394,7 +400,7 @@ var _ = Describe("Testing core-controller installation", func() {
394400
fmt.Sprintf("some.registry.org/%s@%s",
395401
components.ComponentTigeraNode.Image,
396402
"sha256:tigeracnxnodehash")))
397-
Expect(ds.Spec.Template.Spec.InitContainers).To(HaveLen(4))
403+
Expect(ds.Spec.Template.Spec.InitContainers).To(HaveLen(5))
398404
fv := test.GetContainer(ds.Spec.Template.Spec.InitContainers, "flexvol-driver")
399405
Expect(fv).ToNot(BeNil())
400406
Expect(fv.Image).To(Equal(
@@ -420,6 +426,12 @@ var _ = Describe("Testing core-controller installation", func() {
420426
components.ComponentTigeraCSRInitContainer.Image,
421427
"sha256:calicocsrinithash")))
422428

429+
bpfInit := test.GetContainer(ds.Spec.Template.Spec.InitContainers, "mount-bpffs")
430+
Expect(bpfInit).ToNot(BeNil())
431+
Expect(bpfInit.Image).To(Equal(
432+
fmt.Sprintf("some.registry.org/%s@%s",
433+
components.ComponentTigeraNode.Image,
434+
"sha256:tigeracnxnodehash")))
423435
inst := operator.Installation{
424436
ObjectMeta: metav1.ObjectMeta{
425437
Name: "default",

‎pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,14 @@ spec:
616616
FlowLogGoldmaneServer is the flow server endpoint to
617617
which flow data should be published.
618618
type: string
619+
flowLogsLocalReporter:
620+
description:
621+
"FlowLogsLocalReporter configures local unix socket for
622+
reporting flow data from each node. [Default: Disabled]"
623+
enum:
624+
- Disabled
625+
- Enabled
626+
type: string
619627
flowLogsPolicyEvaluationMode:
620628
description: |-
621629
Continuous - Felix evaluates active flows on a regular basis to determine the rule
@@ -865,19 +873,19 @@ spec:
865873
description:
866874
"LogSeverityFile is the log severity above which logs
867875
are sent to the log file. [Default: Info]"
868-
pattern: ^(?i)(Debug|Info|Warning|Error|Fatal)?$
876+
pattern: ^(?i)(Trace|Debug|Info|Warning|Error|Fatal)?$
869877
type: string
870878
logSeverityScreen:
871879
description:
872880
"LogSeverityScreen is the log severity above which logs
873881
are sent to the stdout. [Default: Info]"
874-
pattern: ^(?i)(Debug|Info|Warning|Error|Fatal)?$
882+
pattern: ^(?i)(Trace|Debug|Info|Warning|Error|Fatal)?$
875883
type: string
876884
logSeveritySys:
877885
description: |-
878886
LogSeveritySys is the log severity above which logs are sent to the syslog. Set to None for no logging to syslog.
879887
[Default: Info]
880-
pattern: ^(?i)(Debug|Info|Warning|Error|Fatal)?$
888+
pattern: ^(?i)(Trace|Debug|Info|Warning|Error|Fatal)?$
881889
type: string
882890
maxIpsetSize:
883891
description: |-

‎pkg/crds/enterprise/crd.projectcalico.org_alertexceptions.yaml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,21 @@ spec:
1919
openAPIV3Schema:
2020
properties:
2121
apiVersion:
22-
description: |-
23-
APIVersion defines the versioned schema of this representation of an object.
24-
Servers should convert recognized schemas to the latest internal value, and
25-
may reject unrecognized values.
26-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2722
type: string
2823
kind:
29-
description: |-
30-
Kind is a string value representing the REST resource this object represents.
31-
Servers may infer this from the endpoint the client submits requests to.
32-
Cannot be updated.
33-
In CamelCase.
34-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3524
type: string
3625
metadata:
3726
type: object
3827
spec:
39-
description:
40-
AlertExceptionSpec contains the specification for an alert
41-
exception resource.
4228
properties:
4329
description:
44-
description: The description is displayed by the UI.
4530
type: string
4631
endTime:
47-
description: |-
48-
EndTime defines the end time at which this alert exception will expire.
49-
If omitted the alert exception filtering will continue indefinitely.
5032
format: date-time
5133
type: string
5234
selector:
53-
description:
54-
Selector defines a query string for alert events to be
55-
excluded from UI search results.
5635
type: string
5736
startTime:
58-
description: |-
59-
StartTime defines the start time from which this alert exception will take effect.
60-
If the value is in the past, matched alerts will be filtered immediately.
61-
If the value is changed to a future time, alert exceptions will restart at that time.
6237
format: date-time
6338
type: string
6439
required:
@@ -67,7 +42,6 @@ spec:
6742
- startTime
6843
type: object
6944
status:
70-
description: AlertExceptionStatus contains the status of an alert exception.
7145
type: object
7246
type: object
7347
served: true

‎pkg/crds/enterprise/crd.projectcalico.org_bfdconfigurations.yaml‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,69 +17,31 @@ spec:
1717
- name: v1
1818
schema:
1919
openAPIV3Schema:
20-
description: BFDConfiguration contains the configuration for BFD sessions.
2120
properties:
2221
apiVersion:
23-
description: |-
24-
APIVersion defines the versioned schema of this representation of an object.
25-
Servers should convert recognized schemas to the latest internal value, and
26-
may reject unrecognized values.
27-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2822
type: string
2923
kind:
30-
description: |-
31-
Kind is a string value representing the REST resource this object represents.
32-
Servers may infer this from the endpoint the client submits requests to.
33-
Cannot be updated.
34-
In CamelCase.
35-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3624
type: string
3725
metadata:
3826
type: object
3927
spec:
40-
description:
41-
BFDConfigurationSpec contains the specification for a BFDConfiguration
42-
resource.
4328
properties:
4429
interfaces:
4530
items:
46-
description:
47-
BFDInterface contains per-interface parameters for
48-
BFD failure detection.
4931
properties:
5032
idleSendInterval:
5133
default: 1m
52-
description:
53-
IdleSendInterval is the interval between transmitted
54-
BFD packets when the BFD peer is idle. Must be a whole number
55-
of milliseconds greater than 0.
5634
type: string
5735
matchPattern:
58-
description: |-
59-
MatchPattern is a pattern to match one or more interfaces.
60-
Supports exact interface names, match on interface prefixes (e.g., “eth*”),
61-
or “*” to select all interfaces on the selected node(s).
6236
type: string
6337
minimumRecvInterval:
6438
default: 10ms
65-
description:
66-
MinimumRecvInterval is the minimum interval between
67-
received BFD packets. Must be a whole number of milliseconds
68-
greater than 0.
6939
type: string
7040
minimumSendInterval:
7141
default: 100ms
72-
description:
73-
MinimumSendInterval is the minimum interval between
74-
transmitted BFD packets. Must be a whole number of milliseconds
75-
greater than 0.
7642
type: string
7743
multiplier:
7844
default: 5
79-
description:
80-
Multiplier is the number of intervals that must
81-
pass without receiving a BFD packet before the peer is considered
82-
down.
8345
type: integer
8446
required:
8547
- matchPattern

0 commit comments

Comments
 (0)