Skip to content

Commit a000918

Browse files
marvin-tigeramarvin-tigera
authored
Merge pull request #3927 from danudey/auto-build-updates-v1.38.0
[release-v1.38] Auto Release Update for v1.38.0
2 parents 4ef7f3b + a950c24 commit a000918

File tree

4 files changed

+50
-51
lines changed

4 files changed

+50
-51
lines changed

‎config/calico_versions.yml‎

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

‎hack/gen-versions/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020-2024 Tigera, Inc. All rights reserved.
1+
// Copyright (c) 2020-2025 Tigera, Inc. All rights reserved.
22

33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import (
2323

2424
const (
2525
defaultCalicoRegistry = "docker.io"
26-
defaultEnterpriseRegistry = "gcr.io/unique-caldron-775/cnx"
26+
defaultEnterpriseRegistry = "quay.io"
2727

2828
eeVersionsTpl = "enterprise.go.tpl"
2929
osVersionsTpl = "calico.go.tpl"

‎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 = "release-v3.30"
23+
CalicoRelease string = "v3.30.0"
2424

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

‎pkg/components/images.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020-2024 Tigera, Inc. All rights reserved.
1+
// Copyright (c) 2020-2025 Tigera, Inc. All rights reserved.
22

33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package components
1616
// Default registries for Calico and Tigera.
1717
const (
1818
CalicoRegistry = "docker.io/"
19-
TigeraRegistry = "gcr.io/unique-caldron-775/cnx/"
19+
TigeraRegistry = "quay.io/"
2020
// For production InitRegistry should match TigeraRegistry.
2121
// For the master branch and other testing scenarios we switch TigeraRegistry to
2222
// point to a testing repo but the init image will be pushed to quay, so having

0 commit comments

Comments
 (0)