Automated Containerd version update 1.6.33 (#5312)

Create new Containerd version Co-authored-by: laverya <2318911+laverya@users.noreply.github.com>
replicatedhq · Aug 7, 2024 · c8764b2 · c8764b2
1 parent ff651f4
commit c8764b2
Show file tree

Hide file tree

Showing 26 changed files with 26 additions and 26 deletions.
diff --git a/addons/containerd/1.5.10/install.sh b/addons/containerd/1.5.10/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.5.11/install.sh b/addons/containerd/1.5.11/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.10/install.sh b/addons/containerd/1.6.10/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.11/install.sh b/addons/containerd/1.6.11/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.12/install.sh b/addons/containerd/1.6.12/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.13/install.sh b/addons/containerd/1.6.13/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.14/install.sh b/addons/containerd/1.6.14/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.15/install.sh b/addons/containerd/1.6.15/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.16/install.sh b/addons/containerd/1.6.16/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.18/install.sh b/addons/containerd/1.6.18/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.19/install.sh b/addons/containerd/1.6.19/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.20/install.sh b/addons/containerd/1.6.20/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.21/install.sh b/addons/containerd/1.6.21/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.22/install.sh b/addons/containerd/1.6.22/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.24/install.sh b/addons/containerd/1.6.24/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.25/install.sh b/addons/containerd/1.6.25/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.26/install.sh b/addons/containerd/1.6.26/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.27/install.sh b/addons/containerd/1.6.27/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.28/install.sh b/addons/containerd/1.6.28/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.31/install.sh b/addons/containerd/1.6.31/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.32/install.sh b/addons/containerd/1.6.32/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.4/install.sh b/addons/containerd/1.6.4/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.6/install.sh b/addons/containerd/1.6.6/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.7/install.sh b/addons/containerd/1.6.7/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {

diff --git a/addons/containerd/1.6.8/install.sh b/addons/containerd/1.6.8/install.sh
@@ -34,6 +34,7 @@ function containerd_install() {
 
     containerd_migrate_from_docker
 
+    containerd_install_container_selinux_if_missing
     install_host_packages "$src" containerd.io
 
     chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
@@ -109,7 +110,6 @@ function containerd_install() {
 function containerd_host_init() {
     require_centos8_containerd
     containerd_install_libzstd_if_missing
-    containerd_install_container_selinux_if_missing
 }
 
 function containerd_install_libzstd_if_missing() {