Kicbase/ISO: Update cri-dockerd from v0.3.15 to v0.3.16

kubernetes · Dec 16, 2024 · 96b3950 · 96b3950
1 parent a8a0aa0
commit 96b3950
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -553,8 +553,8 @@ jobs:
       - name: Install cri_dockerd & crictl
         shell: bash
         run: |
-          CRI_DOCKERD_VERSION="v0.3.15"
-          CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
+          CRI_DOCKERD_VERSION="v0.3.16"
+          CRI_DOCKERD_COMMIT="71198646b30cacd45ae509e1cddf3b261fb12610"
           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
@@ -551,8 +551,8 @@ jobs:
       - name: Install cri_dockerd & crictl
         shell: bash
         run: |
-          CRI_DOCKERD_VERSION="v0.3.15"
-          CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
+          CRI_DOCKERD_VERSION="v0.3.16"
+          CRI_DOCKERD_COMMIT="71198646b30cacd45ae509e1cddf3b261fb12610"
           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
@@ -9,3 +9,4 @@ sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f
 sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz
 sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f69901e66d49dfac802841ff843171f131.tar.gz
 sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.tar.gz
+sha256 b9bd8c4ea64548071b0f78fde019a755f520c59cc97386f8d93bcf8dc9a0d5db 71198646b30cacd45ae509e1cddf3b261fb12610.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
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CRI_DOCKERD_AARCH64_VER = 0.3.15
-CRI_DOCKERD_AARCH64_REV = c1c566e
-CRI_DOCKERD_AARCH64_VERSION = c1c566e0cc84abe6972f0bf857ecd8fe306258d9
+CRI_DOCKERD_AARCH64_VER = 0.3.16
+CRI_DOCKERD_AARCH64_REV = 7119864
+CRI_DOCKERD_AARCH64_VERSION = 71198646b30cacd45ae509e1cddf3b261fb12610
 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
@@ -9,3 +9,4 @@ sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f
 sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz
 sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f69901e66d49dfac802841ff843171f131.tar.gz
 sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.tar.gz
+sha256 b9bd8c4ea64548071b0f78fde019a755f520c59cc97386f8d93bcf8dc9a0d5db 71198646b30cacd45ae509e1cddf3b261fb12610.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
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CRI_DOCKERD_VER = 0.3.15
-CRI_DOCKERD_REV = c1c566e
-CRI_DOCKERD_VERSION = c1c566e0cc84abe6972f0bf857ecd8fe306258d9
+CRI_DOCKERD_VER = 0.3.16
+CRI_DOCKERD_REV = 7119864
+CRI_DOCKERD_VERSION = 71198646b30cacd45ae509e1cddf3b261fb12610
 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
@@ -43,8 +43,8 @@ FROM ${UBUNTU_JAMMY_IMAGE} as kicbase
 
 ARG BUILDKIT_VERSION="v0.18.1"
 ARG CRIO_VERSION="1.24"
-ARG CRI_DOCKERD_VERSION="v0.3.15"
-ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
+ARG CRI_DOCKERD_VERSION="v0.3.16"
+ARG CRI_DOCKERD_COMMIT="71198646b30cacd45ae509e1cddf3b261fb12610"
 ARG CNI_PLUGINS_VERSION="v1.4.0"
 ARG TARGETARCH
 ARG NERDCTL_VERSION="1.7.7"

diff --git 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.15"
+CRI_DOCKERD_VERSION="0.3.16"
 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="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
+  CRI_DOCKERD_COMMIT="71198646b30cacd45ae509e1cddf3b261fb12610"
   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