Kicbase/ISO: Update cri-dockerd from v0.3.3 to v0.3.4

kubernetes · Sep 25, 2023 · 648a558 · 648a558
1 parent 075c1b0
commit 648a558
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
@@ -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.3"
-          CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
+          CRI_DOCKERD_VERSION="v0.3.4"
+          CRI_DOCKERD_COMMIT="e88b1605d08e943ed4cef61a1ed3982ec8f331bc"
           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
@@ -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.3"
-          CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
+          CRI_DOCKERD_VERSION="v0.3.4"
+          CRI_DOCKERD_COMMIT="e88b1605d08e943ed4cef61a1ed3982ec8f331bc"
           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
@@ -6,3 +6,4 @@ sha256 a2e31a5c8ef122a91c4d4107ba2e0cb4950940f9bbf02ee3020715ba051caef9 0de30fc5
 sha256 fc467606256ef13d89365df00a1c4b4b4226628c1a6fd68d2c3fda32bdf36291 9a87d6ae274ecf0f23776920964d6484bd679282.tar.gz
 sha256 b01ec9f9953d0017e8728927ebcc46c7ee63e435027b7e67106eb93fc83c387f 23513f4cfe8f02bc02130b4edba2c9d2c8fd320b.tar.gz
 sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f78f9d7bce1241d1cddb0932e7101f278.tar.gz
+sha256 f898a3fafe419d732da5cdec0d786ce4fb233c0def38470f685ad17187576de7 e88b1605d08e943ed4cef61a1ed3982ec8f331bc.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.3
-CRI_DOCKERD_AARCH64_REV = b58acf8
-CRI_DOCKERD_AARCH64_VERSION = b58acf8f78f9d7bce1241d1cddb0932e7101f278
+CRI_DOCKERD_AARCH64_VER = 0.3.4
+CRI_DOCKERD_AARCH64_REV = e88b160
+CRI_DOCKERD_AARCH64_VERSION = e88b1605d08e943ed4cef61a1ed3982ec8f331bc
 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
@@ -6,3 +6,4 @@ sha256 a2e31a5c8ef122a91c4d4107ba2e0cb4950940f9bbf02ee3020715ba051caef9 0de30fc5
 sha256 fc467606256ef13d89365df00a1c4b4b4226628c1a6fd68d2c3fda32bdf36291 9a87d6ae274ecf0f23776920964d6484bd679282.tar.gz
 sha256 b01ec9f9953d0017e8728927ebcc46c7ee63e435027b7e67106eb93fc83c387f 23513f4cfe8f02bc02130b4edba2c9d2c8fd320b.tar.gz
 sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f78f9d7bce1241d1cddb0932e7101f278.tar.gz
+sha256 f898a3fafe419d732da5cdec0d786ce4fb233c0def38470f685ad17187576de7 e88b1605d08e943ed4cef61a1ed3982ec8f331bc.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.3
-CRI_DOCKERD_REV = b58acf8
-CRI_DOCKERD_VERSION = b58acf8f78f9d7bce1241d1cddb0932e7101f278
+CRI_DOCKERD_VER = 0.3.4
+CRI_DOCKERD_REV = e88b160
+CRI_DOCKERD_VERSION = e88b1605d08e943ed4cef61a1ed3982ec8f331bc
 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
@@ -45,8 +45,8 @@ ARG BUILDKIT_VERSION="v0.12.2"
 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.3"
-ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
+ARG CRI_DOCKERD_VERSION="v0.3.4"
+ARG CRI_DOCKERD_COMMIT="e88b1605d08e943ed4cef61a1ed3982ec8f331bc"
 ARG CNI_PLUGINS_VERSION="v1.3.0"
 ARG TARGETARCH
 ARG NERDCTL_VERSION="1.5.0"

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.3"
+CRI_DOCKERD_VERSION="0.3.4"
 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="e88b1605d08e943ed4cef61a1ed3982ec8f331bc"
   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