diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 6d4b16c35670..f8c42e3ac0d6 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -513,8 +513,8 @@ jobs: sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat - CRI_DOCKERD_VERSION="v0.3.1" - CRI_DOCKERD_COMMIT="9a87d6ae274ecf0f23776920964d6484bd679282" + CRI_DOCKERD_VERSION="v0.3.2" + CRI_DOCKERD_COMMIT="23513f4cfe8f02bc02130b4edba2c9d2c8fd320b" 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 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 58834fa695cf..0575cb8a901c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -632,8 +632,8 @@ jobs: sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat - CRI_DOCKERD_VERSION="v0.3.1" - CRI_DOCKERD_COMMIT="9a87d6ae274ecf0f23776920964d6484bd679282" + CRI_DOCKERD_VERSION="v0.3.2" + CRI_DOCKERD_COMMIT="23513f4cfe8f02bc02130b4edba2c9d2c8fd320b" 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 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 4f36819556ac..76c86fd921bd 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 @@ -4,3 +4,4 @@ sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a sha256 cb90ff5fd4de69cc9cf2a63408d42b605f1d4e70b92012729c0a3bd9a4cfa197 0737013d3c48992724283d151e8a2a767a1839e9.tar.gz sha256 a2e31a5c8ef122a91c4d4107ba2e0cb4950940f9bbf02ee3020715ba051caef9 0de30fc57b659cf23b1212d6516e0cceab9c91d1.tar.gz sha256 fc467606256ef13d89365df00a1c4b4b4226628c1a6fd68d2c3fda32bdf36291 9a87d6ae274ecf0f23776920964d6484bd679282.tar.gz +sha256 b01ec9f9953d0017e8728927ebcc46c7ee63e435027b7e67106eb93fc83c387f 23513f4cfe8f02bc02130b4edba2c9d2c8fd320b.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 d4e77053131f..95753d122519 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,9 +4,9 @@ # ################################################################################ -CRI_DOCKERD_AARCH64_VER = 0.3.1 -CRI_DOCKERD_AARCH64_REV = 9a87d6a -CRI_DOCKERD_AARCH64_VERSION = 9a87d6ae274ecf0f23776920964d6484bd679282 +CRI_DOCKERD_AARCH64_VER = 0.3.2 +CRI_DOCKERD_AARCH64_REV = 23513f4 +CRI_DOCKERD_AARCH64_VERSION = 23513f4cfe8f02bc02130b4edba2c9d2c8fd320b 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 4f36819556ac..76c86fd921bd 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 @@ -4,3 +4,4 @@ sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a sha256 cb90ff5fd4de69cc9cf2a63408d42b605f1d4e70b92012729c0a3bd9a4cfa197 0737013d3c48992724283d151e8a2a767a1839e9.tar.gz sha256 a2e31a5c8ef122a91c4d4107ba2e0cb4950940f9bbf02ee3020715ba051caef9 0de30fc57b659cf23b1212d6516e0cceab9c91d1.tar.gz sha256 fc467606256ef13d89365df00a1c4b4b4226628c1a6fd68d2c3fda32bdf36291 9a87d6ae274ecf0f23776920964d6484bd679282.tar.gz +sha256 b01ec9f9953d0017e8728927ebcc46c7ee63e435027b7e67106eb93fc83c387f 23513f4cfe8f02bc02130b4edba2c9d2c8fd320b.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 eb648a42152a..3e9b2c246cd4 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,9 +4,9 @@ # ################################################################################ -CRI_DOCKERD_VER = 0.3.1 -CRI_DOCKERD_REV = 9a87d6a -CRI_DOCKERD_VERSION = 9a87d6ae274ecf0f23776920964d6484bd679282 +CRI_DOCKERD_VER = 0.3.2 +CRI_DOCKERD_REV = 23513f4 +CRI_DOCKERD_VERSION = 23513f4cfe8f02bc02130b4edba2c9d2c8fd320b 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 b7a78519559f..d7a3c88afc4b 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -45,8 +45,8 @@ ARG BUILDKIT_VERSION="v0.11.6" ARG FUSE_OVERLAYFS_VERSION="v1.7.1" ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="1.0.3" ARG CRIO_VERSION="1.24" -ARG CRI_DOCKERD_VERSION="v0.3.1" -ARG CRI_DOCKERD_COMMIT="9a87d6ae274ecf0f23776920964d6484bd679282" +ARG CRI_DOCKERD_VERSION="v0.3.2" +ARG CRI_DOCKERD_COMMIT="23513f4cfe8f02bc02130b4edba2c9d2c8fd320b" 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 15c46a92dfb8..7e96a7e1d87a 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.3.1" +CRI_DOCKERD_VERSION="0.3.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="9a87d6ae274ecf0f23776920964d6484bd679282" + CRI_DOCKERD_COMMIT="23513f4cfe8f02bc02130b4edba2c9d2c8fd320b" 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