diff --git a/.github/workflows/functional_test.yml b/.github/workflows/functional_test.yml index 8353b33bd4..db1adf0e86 100644 --- a/.github/workflows/functional_test.yml +++ b/.github/workflows/functional_test.yml @@ -177,8 +177,8 @@ jobs: shell: bash if: matrix.driver == 'none' && matrix.cruntime == 'docker' run: | - CRI_DOCKERD_VERSION="v0.4.1" - CRI_DOCKERD_COMMIT="55d6e1a1d6f2ee58949e13a0c66afe7d779ac942" + CRI_DOCKERD_VERSION="v0.4.2" + CRI_DOCKERD_COMMIT="8c5b71d6401df4fdc5c177fde35e066cec7e64c3" CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}" ARCH="${{ matrix.arch }}" sudo curl -L "${CRI_DOCKERD_BASE_URL}/${ARCH}/cri-dockerd" -o /usr/bin/cri-dockerd 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 70dddb0142..1b29471ed8 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 @@ -11,3 +11,4 @@ sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f6 sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.tar.gz sha256 2311f48aa6cada72dfcbea452472d18f09c6b64d48cd074f1ba6675658a9cd7c b9b889355f3002c01db294427964e454dfbc3feb.tar.gz sha256 28d0e2b0ecbdef16909e5880f5fceee6e2caf2f555e7024b5468ff94181d0efb 55d6e1a1d6f2ee58949e13a0c66afe7d779ac942.tar.gz +sha256 5d0963a7509c90ad0b67ce34c109ade2e54827446f0c0dbaa4bc493faf1100f0 8c5b71d6401df4fdc5c177fde35e066cec7e64c3.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 4360d167a5..3675709d7e 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 @@ -4,8 +4,8 @@ # ################################################################################ -CRI_DOCKERD_AARCH64_VERSION = 0.4.1 -CRI_DOCKERD_AARCH64_COMMIT = 55d6e1a1d6f2ee58949e13a0c66afe7d779ac942 +CRI_DOCKERD_AARCH64_VERSION = 0.4.2 +CRI_DOCKERD_AARCH64_COMMIT = 8c5b71d6401df4fdc5c177fde35e066cec7e64c3 CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_COMMIT).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 70dddb0142..1b29471ed8 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 @@ -11,3 +11,4 @@ sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f6 sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.tar.gz sha256 2311f48aa6cada72dfcbea452472d18f09c6b64d48cd074f1ba6675658a9cd7c b9b889355f3002c01db294427964e454dfbc3feb.tar.gz sha256 28d0e2b0ecbdef16909e5880f5fceee6e2caf2f555e7024b5468ff94181d0efb 55d6e1a1d6f2ee58949e13a0c66afe7d779ac942.tar.gz +sha256 5d0963a7509c90ad0b67ce34c109ade2e54827446f0c0dbaa4bc493faf1100f0 8c5b71d6401df4fdc5c177fde35e066cec7e64c3.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 cb1120ac8c..282bef95bc 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 @@ -4,8 +4,8 @@ # ################################################################################ -CRI_DOCKERD_VERSION = 0.4.1 -CRI_DOCKERD_COMMIT = 55d6e1a1d6f2ee58949e13a0c66afe7d779ac942 +CRI_DOCKERD_VERSION = 0.4.2 +CRI_DOCKERD_COMMIT = 8c5b71d6401df4fdc5c177fde35e066cec7e64c3 CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_COMMIT).tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 9e42dfa2c0..21786df26b 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -27,8 +27,8 @@ FROM ${KICBASE_IMAGE} AS kicbase ARG BUILDKIT_VERSION="v0.26.3" ARG CRIO_VERSION="v1.35" ARG CRICTL_VERSION="v1.35.0" -ARG CRI_DOCKERD_VERSION="v0.4.1" -ARG CRI_DOCKERD_COMMIT="55d6e1a1d6f2ee58949e13a0c66afe7d779ac942" +ARG CRI_DOCKERD_VERSION="v0.4.2" +ARG CRI_DOCKERD_COMMIT="8c5b71d6401df4fdc5c177fde35e066cec7e64c3" ARG CNI_PLUGINS_VERSION="v1.9.0" ARG TARGETARCH ARG NERDCTL_VERSION="2.2.1" diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index a0a4eea319..5c044cfdeb 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -70,12 +70,12 @@ if ! which socat &>/dev/null; then fi # cri-dockerd is required for Kubernetes v1.24+ with none driver -CRI_DOCKERD_VERSION="0.4.1" +CRI_DOCKERD_VERSION="0.4.2" if [[ $(cri-dockerd --version 2>&1) != *"$CRI_DOCKERD_VERSION"* ]]; then echo "WARNING: expected version of cri-dockerd is not installed. will try to install." sudo systemctl stop cri-docker.socket || true sudo systemctl stop cri-docker.service || true - CRI_DOCKERD_COMMIT="55d6e1a1d6f2ee58949e13a0c66afe7d779ac942" + CRI_DOCKERD_COMMIT="8c5b71d6401df4fdc5c177fde35e066cec7e64c3" CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}" sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket