Skip to content

Commit a687aaa

Browse files
marvin-tigeramarvin-tigera
authored
Merge pull request #4006 from danudey/auto-build-updates-v1.38.3
[release-v1.38] Auto Release Update for v1.38.3
2 parents 44a9306 + dc5dbca commit a687aaa

File tree

3 files changed

+68
-46
lines changed

3 files changed

+68
-46
lines changed

‎config/calico_versions.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
# Components defined here are required to be kept in sync with hack/gen-versions/calico.go.tpl
2-
title: v3.30.1
2+
title: v3.30.2
33
components:
44
libcalico-go:
5-
version: v3.30.1
5+
version: v3.30.2
66
typha:
7-
version: v3.30.1
7+
version: v3.30.2
88
calico/node:
9-
version: v3.30.1
9+
version: v3.30.2
1010
calico/cni:
11-
version: v3.30.1
11+
version: v3.30.2
1212
calico/node-windows:
13-
version: v3.30.1
13+
version: v3.30.2
1414
calico/cni-windows:
15-
version: v3.30.1
15+
version: v3.30.2
1616
calico/kube-controllers:
17-
version: v3.30.1
17+
version: v3.30.2
1818
calico/goldmane:
19-
version: v3.30.1
19+
version: v3.30.2
2020
flexvol:
21-
version: v3.30.1
21+
version: v3.30.2
2222
calico/apiserver:
23-
version: v3.30.1
23+
version: v3.30.2
2424
calico/csi:
25-
version: v3.30.1
25+
version: v3.30.2
2626
csi-node-driver-registrar:
27-
version: v3.30.1
27+
version: v3.30.2
2828
key-cert-provisioner:
29-
version: v3.30.1
29+
version: v3.30.2
3030
calico/whisker:
31-
version: v3.30.1
31+
version: v3.30.2
3232
calico/whisker-backend:
33-
version: v3.30.1
33+
version: v3.30.2
3434
calico/envoy-gateway:
35-
version: v3.30.1
35+
version: v3.30.2
3636
calico/envoy-proxy:
37-
version: v3.30.1
37+
version: v3.30.2
3838
calico/envoy-ratelimit:
39-
version: v3.30.1
39+
version: v3.30.2
4040
calico/guardian:
41-
version: v3.30.1
41+
version: v3.30.2

‎pkg/components/calico.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,154 +20,154 @@ package components
2020
import "github.com/tigera/operator/version"
2121

2222
var (
23-
CalicoRelease string = "v3.30.1"
23+
CalicoRelease string = "v3.30.2"
2424

2525
ComponentCalicoCNI = Component{
26-
Version: "v3.30.1",
26+
Version: "v3.30.2",
2727
Image: "calico/cni",
2828
Registry: "",
2929
}
3030

3131
ComponentCalicoCNIFIPS = Component{
32-
Version: "v3.30.1-fips",
32+
Version: "v3.30.2-fips",
3333
Image: "calico/cni",
3434
Registry: "",
3535
}
3636

3737
ComponentCalicoCNIWindows = Component{
38-
Version: "v3.30.1",
38+
Version: "v3.30.2",
3939
Image: "calico/cni-windows",
4040
Registry: "",
4141
}
4242

4343
ComponentCalicoCSRInitContainer = Component{
44-
Version: "v3.30.1",
44+
Version: "v3.30.2",
4545
Image: "calico/key-cert-provisioner",
4646
Registry: "",
4747
}
4848

4949
ComponentCalicoKubeControllers = Component{
50-
Version: "v3.30.1",
50+
Version: "v3.30.2",
5151
Image: "calico/kube-controllers",
5252
Registry: "",
5353
}
5454

5555
ComponentCalicoKubeControllersFIPS = Component{
56-
Version: "v3.30.1-fips",
56+
Version: "v3.30.2-fips",
5757
Image: "calico/kube-controllers",
5858
Registry: "",
5959
}
6060

6161
ComponentCalicoNode = Component{
62-
Version: "v3.30.1",
62+
Version: "v3.30.2",
6363
Image: "calico/node",
6464
Registry: "",
6565
}
6666

6767
ComponentCalicoNodeFIPS = Component{
68-
Version: "v3.30.1-fips",
68+
Version: "v3.30.2-fips",
6969
Image: "calico/node",
7070
Registry: "",
7171
}
7272

7373
ComponentCalicoNodeWindows = Component{
74-
Version: "v3.30.1",
74+
Version: "v3.30.2",
7575
Image: "calico/node-windows",
7676
Registry: "",
7777
}
7878

7979
ComponentCalicoTypha = Component{
80-
Version: "v3.30.1",
80+
Version: "v3.30.2",
8181
Image: "calico/typha",
8282
Registry: "",
8383
}
8484

8585
ComponentCalicoTyphaFIPS = Component{
86-
Version: "v3.30.1-fips",
86+
Version: "v3.30.2-fips",
8787
Image: "calico/typha",
8888
Registry: "",
8989
}
9090

9191
ComponentCalicoFlexVolume = Component{
92-
Version: "v3.30.1",
92+
Version: "v3.30.2",
9393
Image: "calico/pod2daemon-flexvol",
9494
Registry: "",
9595
}
9696

9797
ComponentCalicoAPIServer = Component{
98-
Version: "v3.30.1",
98+
Version: "v3.30.2",
9999
Image: "calico/apiserver",
100100
Registry: "",
101101
}
102102

103103
ComponentCalicoAPIServerFIPS = Component{
104-
Version: "v3.30.1-fips",
104+
Version: "v3.30.2-fips",
105105
Image: "calico/apiserver",
106106
Registry: "",
107107
}
108108

109109
ComponentCalicoCSI = Component{
110-
Version: "v3.30.1",
110+
Version: "v3.30.2",
111111
Image: "calico/csi",
112112
Registry: "",
113113
}
114114

115115
ComponentCalicoCSIFIPS = Component{
116-
Version: "v3.30.1-fips",
116+
Version: "v3.30.2-fips",
117117
Image: "calico/csi",
118118
Registry: "",
119119
}
120120

121121
ComponentCalicoCSIRegistrar = Component{
122-
Version: "v3.30.1",
122+
Version: "v3.30.2",
123123
Image: "calico/node-driver-registrar",
124124
Registry: "",
125125
}
126126

127127
ComponentCalicoCSIRegistrarFIPS = Component{
128-
Version: "v3.30.1-fips",
128+
Version: "v3.30.2-fips",
129129
Image: "calico/node-driver-registrar",
130130
Registry: "",
131131
}
132132

133133
ComponentCalicoGoldmane = Component{
134-
Version: "v3.30.1",
134+
Version: "v3.30.2",
135135
Image: "calico/goldmane",
136136
Registry: "",
137137
}
138138

139139
ComponentCalicoWhisker = Component{
140-
Version: "v3.30.1",
140+
Version: "v3.30.2",
141141
Image: "calico/whisker",
142142
Registry: "",
143143
}
144144

145145
ComponentCalicoWhiskerBackend = Component{
146-
Version: "v3.30.1",
146+
Version: "v3.30.2",
147147
Image: "calico/whisker-backend",
148148
Registry: "",
149149
}
150150

151151
ComponentCalicoEnvoyGateway = Component{
152-
Version: "v3.30.1",
152+
Version: "v3.30.2",
153153
Image: "calico/envoy-gateway",
154154
Registry: "",
155155
}
156156

157157
ComponentCalicoEnvoyProxy = Component{
158-
Version: "v3.30.1",
158+
Version: "v3.30.2",
159159
Image: "calico/envoy-proxy",
160160
Registry: "",
161161
}
162162

163163
ComponentCalicoEnvoyRatelimit = Component{
164-
Version: "v3.30.1",
164+
Version: "v3.30.2",
165165
Image: "calico/envoy-ratelimit",
166166
Registry: "",
167167
}
168168

169169
ComponentCalicoGuardian = Component{
170-
Version: "v3.30.1",
170+
Version: "v3.30.2",
171171
Image: "calico/guardian",
172172
Registry: "",
173173
}

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ spec:
5252
Option to keep the original nexthop field when routes are sent to a BGP Peer.
5353
Setting "true" configures the selected BGP Peers node to use the "next hop keep;"
5454
instead of "next hop self;"(default) in the specific branch of the Node on "bird.cfg".
55+
Note: that this field is deprecated. Users should use the NextHopMode field to control
56+
the next hop attribute for a BGP peer.
5557
type: boolean
5658
localWorkloadSelector:
5759
description: |-
@@ -63,6 +65,26 @@ spec:
6365
Time to allow for software restart. When specified, this is configured as the graceful
6466
restart timeout. When not specified, the BIRD default of 120s is used.
6567
type: string
68+
nextHopMode:
69+
allOf:
70+
- enum:
71+
- Auto
72+
- Self
73+
- Keep
74+
- enum:
75+
- Auto
76+
- Self
77+
- Keep
78+
description: |-
79+
NextHopMode defines the method of calculating the next hop attribute for received routes.
80+
This replaces and expands the deprecated KeepOriginalNextHop field.
81+
Users should use this setting to control the next hop attribute for a BGP peer.
82+
When this is set, the value of the KeepOriginalNextHop field is ignored.
83+
if neither keepOriginalNextHop or nextHopMode is specified, BGP's default behaviour is used.
84+
Set it to “Auto” to apply BGP’s default behaviour.
85+
Set it to "Self" to configure "next hop self;" in "bird.cfg".
86+
Set it to "Keep" to configure "next hop keep;" in "bird.cfg".
87+
type: string
6688
node:
6789
description: |-
6890
The node name identifying the Calico node instance that is targeted by this peer.

0 commit comments

Comments
 (0)