Skip to content

Commit 641ef54

Browse files
committed
Kicbase/ISO: Update cri-dockerd from v0.3.15 to v0.3.16
1 parent d510d46 commit 641ef54

File tree

8 files changed

+16
-14
lines changed

8 files changed

+16
-14
lines changed

.github/workflows/master.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ jobs:
553553
- name: Install cri_dockerd & crictl
554554
shell: bash
555555
run: |
556-
CRI_DOCKERD_VERSION="v0.3.15"
557-
CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
556+
CRI_DOCKERD_VERSION="v0.3.16"
557+
CRI_DOCKERD_COMMIT="71198646b30cacd45ae509e1cddf3b261fb12610"
558558
CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}"
559559
sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd
560560
sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket

.github/workflows/pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,8 @@ jobs:
551551
- name: Install cri_dockerd & crictl
552552
shell: bash
553553
run: |
554-
CRI_DOCKERD_VERSION="v0.3.15"
555-
CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
554+
CRI_DOCKERD_VERSION="v0.3.16"
555+
CRI_DOCKERD_COMMIT="71198646b30cacd45ae509e1cddf3b261fb12610"
556556
CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}"
557557
sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd
558558
sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket

deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f
99
sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz
1010
sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f69901e66d49dfac802841ff843171f131.tar.gz
1111
sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.tar.gz
12+
sha256 b9bd8c4ea64548071b0f78fde019a755f520c59cc97386f8d93bcf8dc9a0d5db 71198646b30cacd45ae509e1cddf3b261fb12610.tar.gz

deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
################################################################################
66

7-
CRI_DOCKERD_AARCH64_VER = 0.3.15
8-
CRI_DOCKERD_AARCH64_REV = c1c566e
9-
CRI_DOCKERD_AARCH64_VERSION = c1c566e0cc84abe6972f0bf857ecd8fe306258d9
7+
CRI_DOCKERD_AARCH64_VER = 0.3.16
8+
CRI_DOCKERD_AARCH64_REV = 7119864
9+
CRI_DOCKERD_AARCH64_VERSION = 71198646b30cacd45ae509e1cddf3b261fb12610
1010
CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive
1111
CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz
1212

deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f
99
sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz
1010
sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f69901e66d49dfac802841ff843171f131.tar.gz
1111
sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.tar.gz
12+
sha256 b9bd8c4ea64548071b0f78fde019a755f520c59cc97386f8d93bcf8dc9a0d5db 71198646b30cacd45ae509e1cddf3b261fb12610.tar.gz

deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
################################################################################
66

7-
CRI_DOCKERD_VER = 0.3.15
8-
CRI_DOCKERD_REV = c1c566e
9-
CRI_DOCKERD_VERSION = c1c566e0cc84abe6972f0bf857ecd8fe306258d9
7+
CRI_DOCKERD_VER = 0.3.16
8+
CRI_DOCKERD_REV = 7119864
9+
CRI_DOCKERD_VERSION = 71198646b30cacd45ae509e1cddf3b261fb12610
1010
CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive
1111
CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz
1212

deploy/kicbase/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ FROM ${UBUNTU_JAMMY_IMAGE} as kicbase
4343

4444
ARG BUILDKIT_VERSION="v0.18.1"
4545
ARG CRIO_VERSION="1.24"
46-
ARG CRI_DOCKERD_VERSION="v0.3.15"
47-
ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
46+
ARG CRI_DOCKERD_VERSION="v0.3.16"
47+
ARG CRI_DOCKERD_COMMIT="71198646b30cacd45ae509e1cddf3b261fb12610"
4848
ARG CNI_PLUGINS_VERSION="v1.4.0"
4949
ARG TARGETARCH
5050
ARG NERDCTL_VERSION="1.7.7"

hack/jenkins/linux_integration_tests_none.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ if ! which socat &>/dev/null; then
7070
fi
7171

7272
# cri-dockerd is required for Kubernetes v1.24+ with none driver
73-
CRI_DOCKERD_VERSION="0.3.15"
73+
CRI_DOCKERD_VERSION="0.3.16"
7474
if [[ $(cri-dockerd --version 2>&1) != *"$CRI_DOCKERD_VERSION"* ]]; then
7575
echo "WARNING: expected version of cri-dockerd is not installed. will try to install."
7676
sudo systemctl stop cri-docker.socket || true
7777
sudo systemctl stop cri-docker.service || true
78-
CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
78+
CRI_DOCKERD_COMMIT="71198646b30cacd45ae509e1cddf3b261fb12610"
7979
CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}"
8080
sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd
8181
sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket

0 commit comments

Comments
 (0)