Skip to content

Commit

Permalink
attempt containerd 1.7.25 (#5556)
Browse files Browse the repository at this point in the history
* attempt containerd 2.0.3 and 1.7.25

* no centos 7 changes of course

* update containerd version detection script to include 1.7.25+

* update preflight messages
  • Loading branch information
laverya authored Feb 11, 2025
1 parent 3b14d27 commit 37f7929
Show file tree
Hide file tree
Showing 8 changed files with 551 additions and 2 deletions.
14 changes: 14 additions & 0 deletions addons/containerd/1.7.25/Manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.2.4/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.33
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.33
dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.32
dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.7.25
dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.7.25
dockerout ubuntu-22.04 addons/containerd/template/Dockerfile.ubuntu22 1.7.25
yum2023 containerd
yum2023 libzstd
apt24 containerd
image pause registry.k8s.io/pause:3.6
2 changes: 2 additions & 0 deletions addons/containerd/1.7.25/crictl.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
runtime-endpoint: unix:///var/run/containerd/containerd.sock
image-endpoint: unix:///var/run/containerd/containerd.sock
58 changes: 58 additions & 0 deletions addons/containerd/1.7.25/host-preflight.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
apiVersion: troubleshoot.sh/v1beta2
kind: HostPreflight
metadata:
name: kurl-builtin
spec:
collectors:
- hostOS: {}
analyzers:
- hostOS:
outcomes:
- pass:
when: "centos = 7"
message: "containerd addon supports centos 7, but only up to containerd 1.6.33, which will be installed instead of 1.7.25"
- pass:
when: "rhel = 7"
message: "containerd addon supports rhel 7, but only up to containerd 1.6.33, which will be installed instead of 1.7.25"
- pass:
when: "ol = 7"
message: "containerd addon supports ol 7, but only up to containerd 1.6.33, which will be installed instead of 1.7.25"
- warn:
when: "centos = 8"
message: "containerd addon supports centos 8, but only up to containerd 1.6.32, which will be installed instead of 1.7.25"
- warn:
when: "rhel = 8"
message: "containerd addon supports rhel 8, but only up to containerd 1.6.32, which will be installed instead of 1.7.25"
- warn:
when: "ol = 8"
message: "containerd addon supports ol 8, but only up to containerd 1.6.32, which will be installed instead of 1.7.25"
- pass:
when: "centos = 9"
message: "containerd addon supports centos 9"
- pass:
when: "rhel = 9"
message: "containerd addon supports rhel 9"
- pass:
when: "rocky = 9"
message: "containerd addon supports rocky 9"
- fail:
when: "ol = 9"
message: "containerd addon does not support ol 9"
- fail:
when: "ubuntu = 16.04"
message: "containerd addon does not support ubuntu 16.04"
- warn:
when: "ubuntu = 18.04"
message: "containerd addon supports ubuntu 18.04, but only up to containerd 1.6.21, which will be installed instead of 1.7.25"
- pass:
when: "ubuntu = 20.04"
message: "containerd addon supports ubuntu 20.04"
- pass:
when: "ubuntu = 22.04"
message: "containerd addon supports ubuntu 22.04"
- pass:
when: "amazon >= 2023"
message: "containerd addon supports amazon 2023"
- pass:
when: "ubuntu = 24.04"
message: "containerd addon supports ubuntu 24.04"
Loading

0 comments on commit 37f7929

Please sign in to comment.