From 6d383d5eb22643b97df2e81f21eb3af2d0b5ebf8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 15 Jul 2024 10:02:59 +0000 Subject: [PATCH] Kicbase/ISO: Update cri-dockerd from v0.3.14 to v0.3.15 --- .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 4b6d016a43..935474312b 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -661,8 +661,8 @@ jobs: - name: Install cri_dockerd & crictl shell: bash run: | - CRI_DOCKERD_VERSION="v0.3.14" - CRI_DOCKERD_COMMIT="683f70f69901e66d49dfac802841ff843171f131" + CRI_DOCKERD_VERSION="v0.3.15" + CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" 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 444cac69ef..d8b6c65339 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -659,8 +659,8 @@ jobs: - name: Install cri_dockerd & crictl shell: bash run: | - CRI_DOCKERD_VERSION="v0.3.14" - CRI_DOCKERD_COMMIT="683f70f69901e66d49dfac802841ff843171f131" + CRI_DOCKERD_VERSION="v0.3.15" + CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" 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 ca7c039e3d..d437de2f1f 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 @@ -8,3 +8,4 @@ sha256 b01ec9f9953d0017e8728927ebcc46c7ee63e435027b7e67106eb93fc83c387f 23513f4c sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f78f9d7bce1241d1cddb0932e7101f278.tar.gz sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f69901e66d49dfac802841ff843171f131.tar.gz +sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.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 1a6e9e03eb..0d2201fbb9 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.14 -CRI_DOCKERD_AARCH64_REV = 683f70f -CRI_DOCKERD_AARCH64_VERSION = 683f70f69901e66d49dfac802841ff843171f131 +CRI_DOCKERD_AARCH64_VER = 0.3.15 +CRI_DOCKERD_AARCH64_REV = c1c566e +CRI_DOCKERD_AARCH64_VERSION = c1c566e0cc84abe6972f0bf857ecd8fe306258d9 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 ca7c039e3d..d437de2f1f 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 @@ -8,3 +8,4 @@ sha256 b01ec9f9953d0017e8728927ebcc46c7ee63e435027b7e67106eb93fc83c387f 23513f4c sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f78f9d7bce1241d1cddb0932e7101f278.tar.gz sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f69901e66d49dfac802841ff843171f131.tar.gz +sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.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 63c1d8eb7d..49df70d89c 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.14 -CRI_DOCKERD_REV = 683f70f -CRI_DOCKERD_VERSION = 683f70f69901e66d49dfac802841ff843171f131 +CRI_DOCKERD_VER = 0.3.15 +CRI_DOCKERD_REV = c1c566e +CRI_DOCKERD_VERSION = c1c566e0cc84abe6972f0bf857ecd8fe306258d9 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 dd2ba00a7a..bc8b0f214c 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -43,8 +43,8 @@ FROM ${UBUNTU_JAMMY_IMAGE} as kicbase ARG BUILDKIT_VERSION="v0.14.1" ARG CRIO_VERSION="1.24" -ARG CRI_DOCKERD_VERSION="v0.3.14" -ARG CRI_DOCKERD_COMMIT="683f70f69901e66d49dfac802841ff843171f131" +ARG CRI_DOCKERD_VERSION="v0.3.15" +ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" ARG CNI_PLUGINS_VERSION="v1.4.0" ARG TARGETARCH ARG NERDCTL_VERSION="1.7.6" diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 90b92f4142..7257d9d023 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.14" +CRI_DOCKERD_VERSION="0.3.15" 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="683f70f69901e66d49dfac802841ff843171f131" + CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" 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