Skip to content

Commit 09a51e8

Browse files
replicated-ci-kurllaveryadependabot[bot]xavpaice
authored
Automated Containerd version update 2.2.5 (#6036)
* Create new Containerd version * chore(deps): bump code.cloudfoundry.org/bytefmt from 0.72.0 to 0.73.0 (#6023) Bumps [code.cloudfoundry.org/bytefmt](https://github.com/cloudfoundry/bytefmt) from 0.72.0 to 0.73.0. - [Release notes](https://github.com/cloudfoundry/bytefmt/releases) - [Commits](cloudfoundry/bytefmt@v0.72.0...v0.73.0) --- updated-dependencies: - dependency-name: code.cloudfoundry.org/bytefmt dependency-version: 0.73.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fixup preflights and tests * update containerd tests --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: laverya <2318911+laverya@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xav Paice <xav@replicated.com>
1 parent b702835 commit 09a51e8

11 files changed

Lines changed: 770 additions & 84 deletions

File tree

addons/containerd/2.2.5/Manifest

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
yum libzstd
2+
yum container-selinux
3+
asset runc https://github.com/opencontainers/runc/releases/download/v1.3.6/runc.amd64
4+
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.33
5+
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.33
6+
dockerout rhel-8 addons/containerd/template/Dockerfile.centos8.rhel 2.2.5
7+
dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 2.2.5
8+
dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
9+
dockerout ubuntu-22.04 addons/containerd/template/Dockerfile.ubuntu22 2.2.5
10+
yum2023 containerd
11+
yum2023 libzstd
12+
apt24 containerd
13+
image pause registry.k8s.io/pause:3.10
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
runtime-endpoint: unix:///var/run/containerd/containerd.sock
2+
image-endpoint: unix:///var/run/containerd/containerd.sock
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
apiVersion: troubleshoot.sh/v1beta2
2+
kind: HostPreflight
3+
metadata:
4+
name: kurl-builtin
5+
spec:
6+
collectors:
7+
- hostOS: {}
8+
analyzers:
9+
- hostOS:
10+
outcomes:
11+
- warn:
12+
when: "centos = 7"
13+
message: "containerd addon supports centos 7, but only up to containerd 1.6.33, which will be installed instead of 2.2.4"
14+
- warn:
15+
when: "rhel = 7"
16+
message: "containerd addon supports rhel 7, but only up to containerd 1.6.33, which will be installed instead of 2.2.4"
17+
- warn:
18+
when: "ol = 7"
19+
message: "containerd addon supports ol 7, but only up to containerd 1.6.33, which will be installed instead of 2.2.4"
20+
- fail:
21+
when: "centos = 8"
22+
message: "containerd addon does not support centos 8 because containerd 2.2.4 requires cgroup v2, which centos 8 does not enable by default"
23+
- fail:
24+
when: "rhel = 8"
25+
message: "containerd addon does not support rhel 8 because containerd 2.2.4 requires cgroup v2, which rhel 8 does not enable by default"
26+
- fail:
27+
when: "ol = 8"
28+
message: "containerd addon does not support ol 8 because containerd 2.2.4 requires cgroup v2, which ol 8 does not enable by default"
29+
- pass:
30+
when: "centos = 9"
31+
message: "containerd addon supports centos 9"
32+
- pass:
33+
when: "rhel = 9"
34+
message: "containerd addon supports rhel 9"
35+
- pass:
36+
when: "rocky = 9"
37+
message: "containerd addon supports rocky 9"
38+
- fail:
39+
when: "ol = 9"
40+
message: "containerd addon does not support ol 9"
41+
- fail:
42+
when: "ubuntu = 16.04"
43+
message: "containerd addon does not support ubuntu 16.04"
44+
- warn:
45+
when: "ubuntu = 18.04"
46+
message: "containerd addon supports ubuntu 18.04, but only up to containerd 1.6.21, which will be installed instead of 2.2.4"
47+
- fail:
48+
when: "ubuntu = 20.04"
49+
message: "containerd addon does not support ubuntu 20.04"
50+
- pass:
51+
when: "ubuntu = 22.04"
52+
message: "containerd addon supports ubuntu 22.04"
53+
- pass:
54+
when: "amazon >= 2023"
55+
message: "containerd addon supports amazon 2023"
56+
- pass:
57+
when: "ubuntu = 24.04"
58+
message: "containerd addon supports ubuntu 24.04"

0 commit comments

Comments
 (0)