Skip to content

Commit 7faa20d

Browse files
committed
Merge branch 'improvement/bump-containerd-1.6.38' into q/130.0
2 parents 767e6db + 2ad2d73 commit 7faa20d

File tree

4 files changed

+329
-432
lines changed

4 files changed

+329
-432
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
[v2.42.0](https://github.com/dexidp/dex/releases/tag/v2.42.0)
2121
(PR[#4558](https://github.com/scality/metalk8s/pull/4558))
2222

23+
- Bump containerd to [1.6.38](https://github.com/containerd/containerd/releases/tag/v1.6.38)
24+
(PR[#4575](https://github.com/scality/metalk8s/pull/4575))
25+
2326
- Bump Fluent Bit image version to [3.2.8](https://github.com/fluent/fluent-bit/releases/tag/v3.2.8)
2427
and Fluent Bit Helm chart version to [0.48.9](https://github.com/fluent/helm-charts/releases/tag/fluent-bit-0.48.9)
2528
(PR[#4559](https://github.com/scality/metalk8s/pull/4559))

buildchain/buildchain/versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
CALICO_VERSION: str = "3.29.3"
2929
SALT_VERSION: str = "3002.9"
30-
CONTAINERD_VERSION: str = "1.6.36"
30+
CONTAINERD_VERSION: str = "1.6.38"
3131

3232
CONTAINERD_RELEASE: str = "1"
3333
SOSREPORT_RELEASE: str = "2"

packages/redhat/8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN useradd -m build
88

99
ARG SALT_VERSION
1010
ARG K8S_SHORT_VERSION
11-
ARG GO_VERSION=1.19.13
11+
ARG GO_VERSION=1.20.14
1212

1313
ADD common/yum_repositories/*.repo /etc/yum.repos.d/
1414
RUN sed -i s/@SALT_VERSION@/$SALT_VERSION/ /etc/yum.repos.d/saltstack.repo

0 commit comments

Comments
 (0)