Skip to content

Commit 22b9e30

Browse files
screspodscrespod
authored
Update Calico images to 3.29.6 (#3178)
* Remove pin to Calico 3.29.3 Signed-off-by: Steven Crespo <[email protected]> * f Signed-off-by: Steven Crespo <[email protected]> --------- Signed-off-by: Steven Crespo <[email protected]>
1 parent 2baefa5 commit 22b9e30

File tree

4 files changed

+30
-34
lines changed

4 files changed

+30
-34
lines changed

‎cmd/buildtools/k0s.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@ func getK0sVersion() (*semver.Version, error) {
151151
}
152152

153153
func getCalicoTag(opts addonComponentOptions) (string, error) {
154-
// TODO: Revert this check once securebuild 3.29.4 have been purged or made official
155-
if opts.upstreamVersion.Major() == 3 && opts.upstreamVersion.Minor() == 29 {
156-
return "v3.29.3", nil
157-
}
158154
calicoVersion := getCalicoVersion(opts)
159155
constraints := mustParseSemverConstraints(latestPatchConstraint(calicoVersion))
160156
tag, err := GetGreatestGitHubTag(opts.ctx, "projectcalico", "calico", constraints)

‎pkg/config/static/metadata-1_31.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ images:
99
calico-cni:
1010
repo: proxy.replicated.com/library/calico-cni
1111
tag:
12-
amd64: v3.28.5-amd64@sha256:b65290c2b00456a06530409bdea24fb9058efae63a62a679b450b732cbdac0d0
13-
arm64: v3.28.5-arm64@sha256:26440d1381fa97b0191d1130c6f1e375f31b1142957db213ff1e995499c492a9
12+
amd64: v3.28.5-amd64@sha256:b94924e057545daa78ecc5a3ff24af2fc0bb3e95dcb45f3914124d3a2d0308c0
13+
arm64: v3.28.5-arm64@sha256:89f6e9865ecb1511ae04e850c6445898bbdfe138691411d87124bce68d6ef68f
1414
calico-kube-controllers:
1515
repo: proxy.replicated.com/library/calico-kube-controllers
1616
tag:
17-
amd64: v3.28.5-amd64@sha256:d8d6a12f125990bca3adb951bf4e1232d685612fb5599ddfea23f09a9526db9c
18-
arm64: v3.28.5-arm64@sha256:25b1c3a94028ff69cc63c1d164cb3b2d5c658965f3d9b4ad219c61ffa322e7d4
17+
amd64: v3.28.5-amd64@sha256:d7797cce8adeea1ccd17414ae84bbfbd9f04fbf313cd4f55d140504b91c47f8d
18+
arm64: v3.28.5-arm64@sha256:674aabfaacade2e460f52975c54809083d47f0cf0b69098f334a26f82c7cc2d1
1919
calico-node:
2020
repo: proxy.replicated.com/library/calico-node
2121
tag:
22-
amd64: v3.28.5-amd64@sha256:eca02f5330bb68ca379af3db64b5df0b2425b6523039b465a707acfeb8603c46
23-
arm64: v3.28.5-arm64@sha256:606653991d1193bd820b136e64ba9260c010150729b03e76fd14eec5e6635c0f
22+
amd64: v3.28.5-amd64@sha256:822c2516cda4d1686a8b0a07f8e856b555d5d2ae692c9d26cf336e01be319694
23+
arm64: v3.28.5-arm64@sha256:6ef34c55135b230f9035e3c0cc5e6f3af0613e8b056348e2e7f86ac5618e6eba
2424
coredns:
2525
repo: proxy.replicated.com/library/coredns
2626
tag:
@@ -34,8 +34,8 @@ images:
3434
kube-proxy:
3535
repo: proxy.replicated.com/library/kube-proxy
3636
tag:
37-
amd64: v1.31.13-amd64@sha256:660001f4ce4a2c965490a100046d052126ac0a780ee98091ec6666f915113e2e
38-
arm64: v1.31.13-arm64@sha256:7b3bbcada1c3bcd4f385241578585c5d81829f106e71450f2850a3a0cd65cd0a
37+
amd64: v1.31.13-amd64@sha256:6c8c8f140d926511a3984e86942d3969b6c910b4688300e7064eec41baaf9973
38+
arm64: v1.31.13-arm64@sha256:4f120663fea6d2a7e6603407ac2ca7581fcb50b2180006b9a8593547f0b487d7
3939
metrics-server:
4040
repo: proxy.replicated.com/library/metrics-server
4141
tag:
@@ -44,5 +44,5 @@ images:
4444
pause:
4545
repo: proxy.replicated.com/library/pause
4646
tag:
47-
amd64: 3.9-amd64@sha256:86665160218b2b1368f5f47424f1ee0fae0816cdc2534d49b0c1d962fc3bfe51
48-
arm64: 3.9-arm64@sha256:32762831e8554e74cf8871498164fc460605442ca25bcd7d756a4abf2fc21ef8
47+
amd64: 3.9-amd64@sha256:0e70ddcd79ce98ae5c8c7454e460320324a5884cacdf13c2fb776678b24e20ab
48+
arm64: 3.9-arm64@sha256:17817b12aa3cb3b4a60295dacdf9d1ac7647fa9931f1ba10cf3e4ae1fe2e1faf

‎pkg/config/static/metadata-1_32.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ images:
99
calico-cni:
1010
repo: proxy.replicated.com/library/calico-cni
1111
tag:
12-
amd64: v3.29.3-amd64@sha256:868a61fa5320bddf13fa82323f784813f42c7b077107cc04987919456790a4b3
13-
arm64: v3.29.3-arm64@sha256:20e16818bce1e9a309fa1cc211642c4a0ad7ae36e28f6c421b3e0a50c33ab90d
12+
amd64: v3.29.6-amd64@sha256:b3acb35a4fdf95170699d35f89ef39cfb76abf8af8526f8b5aa032942e7d2d7d
13+
arm64: v3.29.6-arm64@sha256:6245f65a1afd816815206409f08e44ceb14c456dd5f14286f5948dceb6b4d92a
1414
calico-kube-controllers:
1515
repo: proxy.replicated.com/library/calico-kube-controllers
1616
tag:
17-
amd64: v3.29.3-amd64@sha256:7c4d739278941dba2538acad3a656a2b4ba02303b6f2b6fc0c3501524ce4a9ec
18-
arm64: v3.29.3-arm64@sha256:1c743cf154600f234a17df98bbfe0b84406f4dc6f438077cd73c8a88e1543768
17+
amd64: v3.29.6-amd64@sha256:972e903a5e2c7a7f792ccda41a9bfbff38d45161c41e326bde446c3d833683c3
18+
arm64: v3.29.6-arm64@sha256:c99e543e29926a0a64ab92b4c684752222ff04aee633d81f26aa52e3275134ee
1919
calico-node:
2020
repo: proxy.replicated.com/library/calico-node
2121
tag:
22-
amd64: v3.29.3-amd64@sha256:44a95ffa32027be4faafbbebff19a19cab42420725ccd2b3e27ecbd8def940a3
23-
arm64: v3.29.3-arm64@sha256:47249309a6b83d2cbb067a41bc8e12ba100f9e6c6aa29cafe8b6b347cc7e69c9
22+
amd64: v3.29.6-amd64@sha256:3afa413b84d4106724f3a46ee6727469d9b3bcd39210946182c80068dbc232dd
23+
arm64: v3.29.6-arm64@sha256:2a48a692ed1bf0fc68f710772a9ded92762f960957de3e741adfbc7a39bf7cf8
2424
coredns:
2525
repo: proxy.replicated.com/library/coredns
2626
tag:
@@ -34,8 +34,8 @@ images:
3434
kube-proxy:
3535
repo: proxy.replicated.com/library/kube-proxy
3636
tag:
37-
amd64: v1.32.9-amd64@sha256:e962e100fe98863790480425920eb20638727b6f972d124a5f75846a2b717000
38-
arm64: v1.32.9-arm64@sha256:7d22ebdd13aeeacc82473c7f9f5382e49425eba4ec69672e68a2fdb1f2d48498
37+
amd64: v1.32.9-amd64@sha256:1a94e51fc8b4912f24adfc9693fc73823a15c7477d30aa1eba53f2a798f28a25
38+
arm64: v1.32.9-arm64@sha256:7f6d7aa81daf7f31b4c7a3b2514ffafb2cc35b5b4664af072419a4afb192fec8
3939
metrics-server:
4040
repo: proxy.replicated.com/library/metrics-server
4141
tag:
@@ -44,5 +44,5 @@ images:
4444
pause:
4545
repo: proxy.replicated.com/library/pause
4646
tag:
47-
amd64: 3.9-amd64@sha256:86665160218b2b1368f5f47424f1ee0fae0816cdc2534d49b0c1d962fc3bfe51
48-
arm64: 3.9-arm64@sha256:32762831e8554e74cf8871498164fc460605442ca25bcd7d756a4abf2fc21ef8
47+
amd64: 3.9-amd64@sha256:0e70ddcd79ce98ae5c8c7454e460320324a5884cacdf13c2fb776678b24e20ab
48+
arm64: 3.9-arm64@sha256:17817b12aa3cb3b4a60295dacdf9d1ac7647fa9931f1ba10cf3e4ae1fe2e1faf

‎pkg/config/static/metadata-1_33.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ images:
99
calico-cni:
1010
repo: proxy.replicated.com/library/calico-cni
1111
tag:
12-
amd64: v3.29.3-amd64@sha256:868a61fa5320bddf13fa82323f784813f42c7b077107cc04987919456790a4b3
13-
arm64: v3.29.3-arm64@sha256:20e16818bce1e9a309fa1cc211642c4a0ad7ae36e28f6c421b3e0a50c33ab90d
12+
amd64: v3.29.6-amd64@sha256:b3acb35a4fdf95170699d35f89ef39cfb76abf8af8526f8b5aa032942e7d2d7d
13+
arm64: v3.29.6-arm64@sha256:6245f65a1afd816815206409f08e44ceb14c456dd5f14286f5948dceb6b4d92a
1414
calico-kube-controllers:
1515
repo: proxy.replicated.com/library/calico-kube-controllers
1616
tag:
17-
amd64: v3.29.3-amd64@sha256:7c4d739278941dba2538acad3a656a2b4ba02303b6f2b6fc0c3501524ce4a9ec
18-
arm64: v3.29.3-arm64@sha256:1c743cf154600f234a17df98bbfe0b84406f4dc6f438077cd73c8a88e1543768
17+
amd64: v3.29.6-amd64@sha256:972e903a5e2c7a7f792ccda41a9bfbff38d45161c41e326bde446c3d833683c3
18+
arm64: v3.29.6-arm64@sha256:c99e543e29926a0a64ab92b4c684752222ff04aee633d81f26aa52e3275134ee
1919
calico-node:
2020
repo: proxy.replicated.com/library/calico-node
2121
tag:
22-
amd64: v3.29.3-amd64@sha256:44a95ffa32027be4faafbbebff19a19cab42420725ccd2b3e27ecbd8def940a3
23-
arm64: v3.29.3-arm64@sha256:47249309a6b83d2cbb067a41bc8e12ba100f9e6c6aa29cafe8b6b347cc7e69c9
22+
amd64: v3.29.6-amd64@sha256:3afa413b84d4106724f3a46ee6727469d9b3bcd39210946182c80068dbc232dd
23+
arm64: v3.29.6-arm64@sha256:2a48a692ed1bf0fc68f710772a9ded92762f960957de3e741adfbc7a39bf7cf8
2424
coredns:
2525
repo: proxy.replicated.com/library/coredns
2626
tag:
@@ -34,8 +34,8 @@ images:
3434
kube-proxy:
3535
repo: proxy.replicated.com/library/kube-proxy
3636
tag:
37-
amd64: v1.33.5-amd64@sha256:ab64431fa2dc735e6c5e351f5a3eac46781bb84a138554570ce2d1383c24000d
38-
arm64: v1.33.5-arm64@sha256:2e7e4345f0c3b095fbdee1e5b0c4926c5f024f8b9bd6d3f120592bebfdbf289a
37+
amd64: v1.33.5-amd64@sha256:04cca6924eb01616711a9f29a7728069cfbc8fd23599eb00216b11219c583327
38+
arm64: v1.33.5-arm64@sha256:8c5e171c2fdf27692ec46739644ba8ec4d5c6b721627b78328dd476e057ef3a2
3939
metrics-server:
4040
repo: proxy.replicated.com/library/metrics-server
4141
tag:
@@ -44,5 +44,5 @@ images:
4444
pause:
4545
repo: proxy.replicated.com/library/pause
4646
tag:
47-
amd64: 3.10.1-amd64@sha256:06bc277a20f6332c914444e16a6619f6b481627b36911d21a28ac8ef53b53614
48-
arm64: 3.10.1-arm64@sha256:0a149ef51bd9c9d50f6838de19f3dafe2f0ad8ccb29edfc5dce1247f36816760
47+
amd64: 3.10.1-amd64@sha256:27593f35cd7bffd0fb846e29f65af942ad2fbdb2f7b15d342f01456c62e12730
48+
arm64: 3.10.1-arm64@sha256:c8cadc7161e328753e49d1566f56b93b926c87284921847118096ca2f4a60e3f

0 commit comments

Comments
 (0)