diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b3b3bb1569..53e7c2e29e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -521,7 +521,7 @@ jobs: sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat - CRI_DOCKER_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" + CRI_DOCKER_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" git clone -n https://github.com/Mirantis/cri-dockerd cd cri-dockerd git checkout "$CRI_DOCKER_VERSION" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 909239dd50..dcc7b45951 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -522,7 +522,7 @@ jobs: sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat - CRI_DOCKER_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" + CRI_DOCKER_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" git clone -n https://github.com/Mirantis/cri-dockerd cd cri-dockerd git checkout "$CRI_DOCKER_VERSION" diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash index 6432679054..1b98c60d4f 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash @@ -1,4 +1,4 @@ sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz -sha256 e75e79e84760c7a2a9f90c3c45bdb6f1c8a08c9adddc9b816162b287b400988c d627d3e64a0ebf4cd4c9f80c131c34fc615258b5.tar.gz +sha256 2bdef1ae691fc2e179fa808a39c643986bb12867737bfed0fa4b5cb379dd4e6e 0737013d3c48992724283d151e8a2a767a1839e9.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk index cdd85833bf..4f7ee9ef50 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk @@ -6,8 +6,8 @@ # As of 2022-06-09 CRI_DOCKERD_AARCH64_VER = 0.2.2 -CRI_DOCKERD_AARCH64_REV = d627d3e -CRI_DOCKERD_AARCH64_VERSION = d627d3e64a0ebf4cd4c9f80c131c34fc615258b5 +CRI_DOCKERD_AARCH64_REV = 0737013 +CRI_DOCKERD_AARCH64_VERSION = 0737013d3c48992724283d151e8a2a767a1839e9 CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash index 6432679054..1b98c60d4f 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash @@ -1,4 +1,4 @@ sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz -sha256 e75e79e84760c7a2a9f90c3c45bdb6f1c8a08c9adddc9b816162b287b400988c d627d3e64a0ebf4cd4c9f80c131c34fc615258b5.tar.gz +sha256 2bdef1ae691fc2e179fa808a39c643986bb12867737bfed0fa4b5cb379dd4e6e 0737013d3c48992724283d151e8a2a767a1839e9.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk index 5116a13b98..5502a2b9b8 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk @@ -6,8 +6,8 @@ # As of 2022-06-09 CRI_DOCKERD_VER = 0.2.2 -CRI_DOCKERD_REV = d627d3e -CRI_DOCKERD_VERSION = d627d3e64a0ebf4cd4c9f80c131c34fc615258b5 +CRI_DOCKERD_REV = 0737013 +CRI_DOCKERD_VERSION = 0737013d3c48992724283d151e8a2a767a1839e9 CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 6c42a9250f..2297b5ae80 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -42,7 +42,7 @@ ARG BUILDKIT_VERSION="v0.10.3" ARG FUSE_OVERLAYFS_VERSION="v1.7.1" ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="1.0.3" ARG CRIO_VERSION="1.22" -ARG CRI_DOCKERD_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" +ARG CRI_DOCKERD_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" ARG TARGETARCH # copy in static files (configs, scripts) diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index d8c5205910..220441542d 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -68,7 +68,7 @@ fi # cri-dockerd is required for Kubernetes 1.24 and higher for none driver if ! cri-dockerd &>/dev/null; then echo "WARNING: cri-dockerd is not installed. will try to install." - CRI_DOCKER_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" + CRI_DOCKER_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" git clone -n https://github.com/Mirantis/cri-dockerd cd cri-dockerd git checkout "$CRI_DOCKER_VERSION"