Skip to content

Commit fae98bc

Browse files
danudeydanudey
authored
OSS version updates for v1.41.1 (#4444)
* Update OSS versions to v3.31.3 * More CRD updates
1 parent b1eade8 commit fae98bc

27 files changed

Lines changed: 1617 additions & 1102 deletions

‎config/calico_versions.yml‎

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

‎pkg/components/calico.go‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,202 +18,202 @@
1818
package components
1919

2020
var (
21-
CalicoRelease string = "master"
21+
CalicoRelease string = "v3.31.3"
2222

2323
ComponentCalicoCNI = Component{
24-
Version: "master",
24+
Version: "v3.31.3",
2525
Image: "cni",
2626
Registry: "",
2727
imagePath: "",
2828
variant: calicoVariant,
2929
}
3030

3131
ComponentCalicoCNIFIPS = Component{
32-
Version: "master-fips",
32+
Version: "v3.31.3-fips",
3333
Image: "cni",
3434
Registry: "",
3535
imagePath: "",
3636
variant: calicoVariant,
3737
}
3838

3939
ComponentCalicoCNIWindows = Component{
40-
Version: "master",
40+
Version: "v3.31.3",
4141
Image: "cni-windows",
4242
Registry: "",
4343
imagePath: "",
4444
variant: calicoVariant,
4545
}
4646

4747
ComponentCalicoCSRInitContainer = Component{
48-
Version: "master",
48+
Version: "v3.31.3",
4949
Image: "key-cert-provisioner",
5050
Registry: "",
5151
imagePath: "",
5252
variant: calicoVariant,
5353
}
5454

5555
ComponentCalicoKubeControllers = Component{
56-
Version: "master",
56+
Version: "v3.31.3",
5757
Image: "kube-controllers",
5858
Registry: "",
5959
imagePath: "",
6060
variant: calicoVariant,
6161
}
6262

6363
ComponentCalicoKubeControllersFIPS = Component{
64-
Version: "master-fips",
64+
Version: "v3.31.3-fips",
6565
Image: "kube-controllers",
6666
Registry: "",
6767
imagePath: "",
6868
variant: calicoVariant,
6969
}
7070

7171
ComponentCalicoNode = Component{
72-
Version: "master",
72+
Version: "v3.31.3",
7373
Image: "node",
7474
Registry: "",
7575
imagePath: "",
7676
variant: calicoVariant,
7777
}
7878

7979
ComponentCalicoNodeFIPS = Component{
80-
Version: "master-fips",
80+
Version: "v3.31.3-fips",
8181
Image: "node",
8282
Registry: "",
8383
imagePath: "",
8484
variant: calicoVariant,
8585
}
8686

8787
ComponentCalicoNodeWindows = Component{
88-
Version: "master",
88+
Version: "v3.31.3",
8989
Image: "node-windows",
9090
Registry: "",
9191
imagePath: "",
9292
variant: calicoVariant,
9393
}
9494

9595
ComponentCalicoTypha = Component{
96-
Version: "master",
96+
Version: "v3.31.3",
9797
Image: "typha",
9898
Registry: "",
9999
imagePath: "",
100100
variant: calicoVariant,
101101
}
102102

103103
ComponentCalicoTyphaFIPS = Component{
104-
Version: "master-fips",
104+
Version: "v3.31.3-fips",
105105
Image: "typha",
106106
Registry: "",
107107
imagePath: "",
108108
variant: calicoVariant,
109109
}
110110

111111
ComponentCalicoFlexVolume = Component{
112-
Version: "master",
112+
Version: "v3.31.3",
113113
Image: "pod2daemon-flexvol",
114114
Registry: "",
115115
imagePath: "",
116116
variant: calicoVariant,
117117
}
118118

119119
ComponentCalicoAPIServer = Component{
120-
Version: "master",
120+
Version: "v3.31.3",
121121
Image: "apiserver",
122122
Registry: "",
123123
imagePath: "",
124124
variant: calicoVariant,
125125
}
126126

127127
ComponentCalicoAPIServerFIPS = Component{
128-
Version: "master-fips",
128+
Version: "v3.31.3-fips",
129129
Image: "apiserver",
130130
Registry: "",
131131
imagePath: "",
132132
variant: calicoVariant,
133133
}
134134

135135
ComponentCalicoCSI = Component{
136-
Version: "master",
136+
Version: "v3.31.3",
137137
Image: "csi",
138138
Registry: "",
139139
imagePath: "",
140140
variant: calicoVariant,
141141
}
142142

143143
ComponentCalicoCSIFIPS = Component{
144-
Version: "master-fips",
144+
Version: "v3.31.3-fips",
145145
Image: "csi",
146146
Registry: "",
147147
imagePath: "",
148148
variant: calicoVariant,
149149
}
150150

151151
ComponentCalicoCSIRegistrar = Component{
152-
Version: "master",
152+
Version: "v3.31.3",
153153
Image: "node-driver-registrar",
154154
Registry: "",
155155
imagePath: "",
156156
variant: calicoVariant,
157157
}
158158

159159
ComponentCalicoCSIRegistrarFIPS = Component{
160-
Version: "master-fips",
160+
Version: "v3.31.3-fips",
161161
Image: "node-driver-registrar",
162162
Registry: "",
163163
imagePath: "",
164164
variant: calicoVariant,
165165
}
166166

167167
ComponentCalicoGoldmane = Component{
168-
Version: "master",
168+
Version: "v3.31.3",
169169
Image: "goldmane",
170170
Registry: "",
171171
imagePath: "",
172172
variant: calicoVariant,
173173
}
174174

175175
ComponentCalicoWhisker = Component{
176-
Version: "master",
176+
Version: "v3.31.3",
177177
Image: "whisker",
178178
Registry: "",
179179
imagePath: "",
180180
variant: calicoVariant,
181181
}
182182

183183
ComponentCalicoWhiskerBackend = Component{
184-
Version: "master",
184+
Version: "v3.31.3",
185185
Image: "whisker-backend",
186186
Registry: "",
187187
imagePath: "",
188188
variant: calicoVariant,
189189
}
190190

191191
ComponentCalicoEnvoyGateway = Component{
192-
Version: "master",
192+
Version: "v3.31.3",
193193
Image: "envoy-gateway",
194194
Registry: "",
195195
imagePath: "",
196196
variant: calicoVariant,
197197
}
198198

199199
ComponentCalicoEnvoyProxy = Component{
200-
Version: "master",
200+
Version: "v3.31.3",
201201
Image: "envoy-proxy",
202202
Registry: "",
203203
imagePath: "",
204204
variant: calicoVariant,
205205
}
206206

207207
ComponentCalicoEnvoyRatelimit = Component{
208-
Version: "master",
208+
Version: "v3.31.3",
209209
Image: "envoy-ratelimit",
210210
Registry: "",
211211
imagePath: "",
212212
variant: calicoVariant,
213213
}
214214

215215
ComponentCalicoGuardian = Component{
216-
Version: "master",
216+
Version: "v3.31.3",
217217
Image: "guardian",
218218
Registry: "",
219219
imagePath: "",

‎pkg/controller/istio/istio_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ var _ = Describe("Istio controller tests", func() {
700700
// Create ImageSet with all required Istio images
701701
imageSet := &operatorv1.ImageSet{
702702
ObjectMeta: metav1.ObjectMeta{
703-
Name: "calico-master",
703+
Name: "calico-v3.31.3",
704704
},
705705
Spec: operatorv1.ImageSetSpec{
706706
Images: []operatorv1.Image{

0 commit comments

Comments
 (0)