From cfc6db95dee7d99a699a43b896be8184bc0198b7 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 20 Nov 2023 10:02:56 +0000 Subject: [PATCH] Kicbase/ISO: Update cri-dockerd from v0.3.3 to v0.3.7 --- .github/workflows/master.yml | 4 ++-- .github/workflows/pr.yml | 4 ++-- .../aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash | 1 + .../arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk | 6 +++--- .../arch/x86_64/package/cri-dockerd/cri-dockerd.hash | 1 + .../arch/x86_64/package/cri-dockerd/cri-dockerd.mk | 6 +++--- deploy/kicbase/Dockerfile | 4 ++-- hack/jenkins/linux_integration_tests_none.sh | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index e47589142e0a..058a55e8d4e9 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -526,8 +526,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.3" - CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278" + CRI_DOCKERD_VERSION="v0.3.7" + CRI_DOCKERD_COMMIT="170103f2ca821c57a0a19da1327dd3cdae0854ad" 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 060913971e6b..4e7d93b5103e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -645,8 +645,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.3" - CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278" + CRI_DOCKERD_VERSION="v0.3.7" + CRI_DOCKERD_COMMIT="170103f2ca821c57a0a19da1327dd3cdae0854ad" 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 96b96dd89186..60247a1e1e1a 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 @@ -6,3 +6,4 @@ sha256 a2e31a5c8ef122a91c4d4107ba2e0cb4950940f9bbf02ee3020715ba051caef9 0de30fc5 sha256 fc467606256ef13d89365df00a1c4b4b4226628c1a6fd68d2c3fda32bdf36291 9a87d6ae274ecf0f23776920964d6484bd679282.tar.gz sha256 b01ec9f9953d0017e8728927ebcc46c7ee63e435027b7e67106eb93fc83c387f 23513f4cfe8f02bc02130b4edba2c9d2c8fd320b.tar.gz sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f78f9d7bce1241d1cddb0932e7101f278.tar.gz +sha256 81230f6a3c84ee572e300d6178618d5c65d88ac43b49999989d291d65d95d1f1 170103f2ca821c57a0a19da1327dd3cdae0854ad.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 51c7f254ae53..ba7ab8f5f83c 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.3 -CRI_DOCKERD_AARCH64_REV = b58acf8 -CRI_DOCKERD_AARCH64_VERSION = b58acf8f78f9d7bce1241d1cddb0932e7101f278 +CRI_DOCKERD_AARCH64_VER = 0.3.7 +CRI_DOCKERD_AARCH64_REV = 170103f +CRI_DOCKERD_AARCH64_VERSION = 170103f2ca821c57a0a19da1327dd3cdae0854ad 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 96b96dd89186..60247a1e1e1a 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 @@ -6,3 +6,4 @@ sha256 a2e31a5c8ef122a91c4d4107ba2e0cb4950940f9bbf02ee3020715ba051caef9 0de30fc5 sha256 fc467606256ef13d89365df00a1c4b4b4226628c1a6fd68d2c3fda32bdf36291 9a87d6ae274ecf0f23776920964d6484bd679282.tar.gz sha256 b01ec9f9953d0017e8728927ebcc46c7ee63e435027b7e67106eb93fc83c387f 23513f4cfe8f02bc02130b4edba2c9d2c8fd320b.tar.gz sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f78f9d7bce1241d1cddb0932e7101f278.tar.gz +sha256 81230f6a3c84ee572e300d6178618d5c65d88ac43b49999989d291d65d95d1f1 170103f2ca821c57a0a19da1327dd3cdae0854ad.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 026c554dd98a..b5097148530c 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.3 -CRI_DOCKERD_REV = b58acf8 -CRI_DOCKERD_VERSION = b58acf8f78f9d7bce1241d1cddb0932e7101f278 +CRI_DOCKERD_VER = 0.3.7 +CRI_DOCKERD_REV = 170103f +CRI_DOCKERD_VERSION = 170103f2ca821c57a0a19da1327dd3cdae0854ad 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 0cbea2ab49b0..c310d8e129c8 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -43,8 +43,8 @@ FROM ${UBUNTU_JAMMY_IMAGE} as kicbase ARG BUILDKIT_VERSION="v0.12.3" ARG CRIO_VERSION="1.24" -ARG CRI_DOCKERD_VERSION="v0.3.3" -ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278" +ARG CRI_DOCKERD_VERSION="v0.3.7" +ARG CRI_DOCKERD_COMMIT="170103f2ca821c57a0a19da1327dd3cdae0854ad" ARG CNI_PLUGINS_VERSION="v1.3.0" ARG TARGETARCH ARG NERDCTL_VERSION="1.7.0" diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 4ca7910f4dbb..dad1c9a36c8e 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.3" +CRI_DOCKERD_VERSION="0.3.7" 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="b58acf8f78f9d7bce1241d1cddb0932e7101f278" + CRI_DOCKERD_COMMIT="170103f2ca821c57a0a19da1327dd3cdae0854ad" 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