Skip to content

Commit 3fc9f77

Browse files
replicated-ci-ecricardomaraschini
replicated-ci-ec
and
ricardomaraschini
authored
Update Makefile versions (#3722)
Co-authored-by: ricardomaraschini <1385436+ricardomaraschini@users.noreply.github.com>
1 parent 9582789 commit 3fc9f77

6 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ require (
158158
github.com/containerd/cgroups/v3 v3.1.3 // indirect
159159
github.com/containerd/containerd v1.7.33 // indirect
160160
github.com/containerd/containerd/api v1.11.1 // indirect
161-
github.com/containerd/containerd/v2 v2.3.2 // indirect
161+
github.com/containerd/containerd/v2 v2.3.1 // indirect
162162
github.com/containerd/errdefs v1.0.0 // indirect
163163
github.com/containerd/errdefs/pkg v0.3.0 // indirect
164164
github.com/containerd/log v0.1.0 // indirect

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ github.com/containerd/containerd v1.7.33 h1:iAkYGC/ifR/V+0eR4iXWHNGYUF0DF2PmGV5i
171171
github.com/containerd/containerd v1.7.33/go.mod h1:gSbSCVjPCdkfJCjyrzz7aRC+xFlqVbatNpfHfVCYGUM=
172172
github.com/containerd/containerd/api v1.11.1 h1:h8nfoDW9+fNsC/9TwiAHj8B1GzXKtR4eFtkhi/X5RLU=
173173
github.com/containerd/containerd/api v1.11.1/go.mod h1:CaQFRu+N1MtbgL6JDOJLUB1hCKESU1lD6MuTJhgtdlw=
174-
github.com/containerd/containerd/v2 v2.3.2 h1:eLven1YxRMkeiKu7IcMrPKE+gn8sGR1DqHbbshMEvWM=
175-
github.com/containerd/containerd/v2 v2.3.2/go.mod h1:rHKGm3VW6wNrINb3x8mNT+w7qYXFVElTt/8HTuxVhD4=
174+
github.com/containerd/containerd/v2 v2.3.1 h1:4dVXBdlvotRBlaP2TmNbY/EGc06KJrMDDUqQdxX/HOk=
175+
github.com/containerd/containerd/v2 v2.3.1/go.mod h1:xVoxGPWZBwwph8DF2IbDhriLKdHfjdpO0b3wFP9wQ1I=
176176
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
177177
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
178178
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ images:
2424
coredns:
2525
repo: proxy.replicated.com/library/coredns
2626
tag:
27-
amd64: 1.14.3-amd64@sha256:19a4e25a4bd4718bc549fc0c29921a350685e4e91498ca95fa71d538382695b3
28-
arm64: 1.14.3-arm64@sha256:17813aae14ff10c1a9243a6b8e051f5a8e5bd6418c92e6de9ece645ac926e2ea
27+
amd64: 1.14.4-amd64@sha256:d87904c741c9134298ca7b02d4b57691846a401a381287a6a6b5f17fffaf7ddb
28+
arm64: 1.14.4-arm64@sha256:9e4c761caa7051cb11e4f2787b85073f99901fa3015683839ca9c5b834319cb2
2929
envoy-distroless:
3030
repo: proxy.replicated.com/library/envoy
3131
tag:
@@ -34,8 +34,8 @@ images:
3434
kube-proxy:
3535
repo: proxy.replicated.com/library/kube-proxy
3636
tag:
37-
amd64: v1.34.8-amd64@sha256:8dc594ce673cea940a49672ea5b1d7e3558ad9f4c01dbb3e66aae835e51b8a35
38-
arm64: v1.34.8-arm64@sha256:30ecbfd63d8807560e0183e368f815e65496bbb67e780d3583fec80fe7fabb75
37+
amd64: v1.34.9-amd64@sha256:046e4df085c84f8bc96563114ce57e204e7cc1c0a154a6f5d0b463c81ea569cb
38+
arm64: v1.34.9-arm64@sha256:2cf8acadc4e00c6ee07aca418af7330c50b7a35651ac00e80d90a7497ba4c4c0
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:e5b1bea963a74eb6ebeeb6f77e197ecd62c0604d399678506f6d48518be21cc6
48-
arm64: 3.10.1-arm64@sha256:7bcca0aa15ef9768cf6e7c8970c1e1d5666ac2065d2a1f3b6b5c946fece16f2d
47+
amd64: 3.10.2
48+
arm64: 3.10.2

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@ images:
99
calico-cni:
1010
repo: proxy.replicated.com/library/calico-cni
1111
tag:
12-
amd64: v3.31.4-amd64@sha256:a82d3a5be55e93625afc535c2d08b1bb076bc9e4fd6f5da3a43724f4dd628ae5
13-
arm64: v3.31.4-arm64@sha256:c7998d18f293d03e988e43854d538c8988cbaefd013af8515f47952eaf810edb
12+
amd64: v3.31.5-amd64@sha256:25690a1a9d6f10288187bd3b4ccdaec6b6b8712cdddedd0d77aeba53fb2e7995
13+
arm64: v3.31.5-arm64@sha256:ab8de30133958a3258074a0ef385b6f4de1e222b50c4ceafd4803ef1c25fdee6
1414
calico-kube-controllers:
1515
repo: proxy.replicated.com/library/calico-kube-controllers
1616
tag:
17-
amd64: v3.31.4-amd64@sha256:44d5470e6d199fa8b5ee38c25c1c32f190ee74963f7bb3ec48c50ad7312f234d
18-
arm64: v3.31.4-arm64@sha256:8886f3a9dc5f296acf1b6b05e7ea7f5aa1218b7338e9341ff4e982690f966d7a
17+
amd64: v3.31.5-amd64@sha256:a76e68e7f835658bd2470dcf679acabf7fd61984c7752c14497477c6cb88d30d
18+
arm64: v3.31.5-arm64@sha256:8ff3592bc279de1e3a6259ed205acabf712888eb7c3f1bfd2d11a22ed5eb912b
1919
calico-node:
2020
repo: proxy.replicated.com/library/calico-node
2121
tag:
22-
amd64: v3.31.4-amd64@sha256:0767fa82b9ed25d4968f6157dcd7b8fdc3b3d3e6e9cd40c9bbdc09a31055221b
23-
arm64: v3.31.4-arm64@sha256:0b2e772ef5d6ec24f8747f77accf70ae2e66705782e1064ba94f2b763497c7c6
22+
amd64: v3.31.5-amd64@sha256:5d3e1bc87cd3f6c6eb02bf92a4263a06b132884552cc16393259e005851feac6
23+
arm64: v3.31.5-arm64@sha256:7ca7bbeb10f92a04fc6068ffb7b04f9d1ad12692cad63ffa7b13f3548e1a30da
2424
coredns:
2525
repo: proxy.replicated.com/library/coredns
2626
tag:
27-
amd64: 1.14.3-amd64@sha256:19a4e25a4bd4718bc549fc0c29921a350685e4e91498ca95fa71d538382695b3
28-
arm64: 1.14.3-arm64@sha256:17813aae14ff10c1a9243a6b8e051f5a8e5bd6418c92e6de9ece645ac926e2ea
27+
amd64: 1.14.4-amd64@sha256:d87904c741c9134298ca7b02d4b57691846a401a381287a6a6b5f17fffaf7ddb
28+
arm64: 1.14.4-arm64@sha256:9e4c761caa7051cb11e4f2787b85073f99901fa3015683839ca9c5b834319cb2
2929
envoy-distroless:
3030
repo: proxy.replicated.com/library/envoy
3131
tag:
32-
amd64: v1.37.2-amd64@sha256:2514d2e89eef64bdfee1f35e10344cfd89bcbd4278509c91002343050119bb7d
33-
arm64: v1.37.2-arm64@sha256:dad2a23eb11b8d7e3dfad18b0ec699845219c1b32b8935d0a8cc49c5594bbd91
32+
amd64: v1.37.4-amd64@sha256:cc2d6174fa40d4af94d65a8bb132307d747c4b490cba525537abc9b06538017d
33+
arm64: v1.37.4-arm64@sha256:55cb3541c6f7309d92e3b091fd17fb773eb627bc8cbe34ef7cf3678b2d58dda3
3434
kube-proxy:
3535
repo: proxy.replicated.com/library/kube-proxy
3636
tag:
37-
amd64: v1.35.4-amd64@sha256:af91a8598f230611df6587bdd2f20c32c28d65e644a819d9dcedf60e95a2b0b4
38-
arm64: v1.35.4-arm64@sha256:0683f52c46d0b359cb6a002d7507ea51992094421e5a6b006480f575f34fa26c
37+
amd64: v1.35.6-amd64@sha256:2a72e322982a5ab1d80cd58e61b64df1f1879651764ad5a83128198e043d95a6
38+
arm64: v1.35.6-arm64@sha256:75988c9c123a484ce7301166191f1f8bcc09105b522177de67c831cf6b166058
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:e5b1bea963a74eb6ebeeb6f77e197ecd62c0604d399678506f6d48518be21cc6
48-
arm64: 3.10.1-arm64@sha256:7bcca0aa15ef9768cf6e7c8970c1e1d5666ac2065d2a1f3b6b5c946fece16f2d
47+
amd64: 3.10.2
48+
arm64: 3.10.2

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ images:
2424
coredns:
2525
repo: proxy.replicated.com/library/coredns
2626
tag:
27-
amd64: 1.14.3-amd64@sha256:19a4e25a4bd4718bc549fc0c29921a350685e4e91498ca95fa71d538382695b3
28-
arm64: 1.14.3-arm64@sha256:17813aae14ff10c1a9243a6b8e051f5a8e5bd6418c92e6de9ece645ac926e2ea
27+
amd64: 1.14.4-amd64@sha256:d87904c741c9134298ca7b02d4b57691846a401a381287a6a6b5f17fffaf7ddb
28+
arm64: 1.14.4-arm64@sha256:9e4c761caa7051cb11e4f2787b85073f99901fa3015683839ca9c5b834319cb2
2929
envoy-distroless:
3030
repo: proxy.replicated.com/library/envoy
3131
tag:
32-
amd64: v1.37.2-amd64@sha256:2514d2e89eef64bdfee1f35e10344cfd89bcbd4278509c91002343050119bb7d
33-
arm64: v1.37.2-arm64@sha256:dad2a23eb11b8d7e3dfad18b0ec699845219c1b32b8935d0a8cc49c5594bbd91
32+
amd64: v1.37.4-amd64@sha256:cc2d6174fa40d4af94d65a8bb132307d747c4b490cba525537abc9b06538017d
33+
arm64: v1.37.4-arm64@sha256:55cb3541c6f7309d92e3b091fd17fb773eb627bc8cbe34ef7cf3678b2d58dda3
3434
kube-proxy:
3535
repo: proxy.replicated.com/library/kube-proxy
3636
tag:
37-
amd64: v1.36.1-amd64@sha256:a4a1dd73008fdf9aaae1ee1d7c5afffe05d64755bce53749f7c51459606bf9bb
38-
arm64: v1.36.1-arm64@sha256:a6922ce4283a4aa1de18e7b1e0c808a491c1996592bc8659668f5cb044967237
37+
amd64: v1.36.2-amd64@sha256:13629509e4ae77567a3b92735eb8161e2eb449b93b79a414c340071ae5ccf537
38+
arm64: v1.36.2-arm64@sha256:50fbce8e83ccab8431154e1ceec147f35ea29051f6445f9e0bc506b485bd8943
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.2"
48-
arm64: "3.10.2"
47+
amd64: 3.10.2
48+
arm64: 3.10.2

‎versions.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ K0S_MINOR_VERSION ?= 36
99
K0S_VERSION_1_36 = v1.36.1+k0s.0
1010
K0S_VERSION_1_35 = v1.35.5+k0s.0
1111
K0S_VERSION_1_34 = v1.34.8+k0s.0
12-
K0S_VERSION_1_33 = v1.33.11+k0s.0
12+
K0S_VERSION_1_33 = v1.33.12+k0s.0
1313
K0S_VERSION_1_32 = v1.32.13+k0s.0
1414
K0S_VERSION_1_31 = v1.31.14+k0s.0
1515
K0S_VERSION_1_30 = v1.30.14+k0s.0
@@ -20,10 +20,10 @@ K0S_VERSION = $(K0S_VERSION_1_$(K0S_MINOR_VERSION))
2020
K0S_GO_VERSION = $(K0S_VERSION_1_$(K0S_MINOR_VERSION))
2121

2222
# Troubleshoot Version
23-
TROUBLESHOOT_VERSION = v0.128.1
23+
TROUBLESHOOT_VERSION = v0.130.0
2424

2525
# Helm Version
26-
HELM_VERSION = v4.1.4
26+
HELM_VERSION = v4.2.2
2727

2828
# FIO Version (for performance testing)
2929
FIO_VERSION = 3.42

0 commit comments

Comments
 (0)