Skip to content

Commit d216470

Browse files
authored
Merge pull request #4505 from AkihiroSuda/dev
update runc (1.3.1), CNI plugins (1.8.0), BuildKit (0.24.0)
2 parents 07a394e + d97808d commit d216470

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

.github/workflows/workflow-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,5 +145,5 @@ jobs:
145145
# Note: these as for amd64
146146
containerd-sha: 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515
147147
containerd-service-sha: 1941362cbaa89dd591b99c32b050d82c583d3cd2e5fa63085d7017457ec5fca8
148-
linux-cni-version: v1.7.1
149-
linux-cni-sha: 1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098
148+
linux-cni-version: v1.8.0
149+
linux-cni-sha: ab3bda535f9d90766cccc90d3dddb5482003dd744d7f22bcf98186bf8eea8be6

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
# Basic deps
1919
# @BINARY: the binary checksums are verified via Dockerfile.d/SHA256SUMS.d/<COMPONENT>-<VERSION>
2020
ARG CONTAINERD_VERSION=v2.1.4@75cb2b7193e4e490e9fbdc236c0e811ccaba3376
21-
ARG RUNC_VERSION=v1.3.0@4ca628d1d4c974f92d24daccb901aa078aad748e
22-
ARG CNI_PLUGINS_VERSION=v1.7.1@BINARY
21+
ARG RUNC_VERSION=v1.3.1@e6457afc48eff1ce22dece664932395026a7105e
22+
ARG CNI_PLUGINS_VERSION=v1.8.0@BINARY
2323

2424
# Extra deps: Build
25-
ARG BUILDKIT_VERSION=v0.23.2@BINARY
25+
ARG BUILDKIT_VERSION=v0.24.0@BINARY
2626
# Extra deps: Lazy-pulling
2727
ARG STARGZ_SNAPSHOTTER_VERSION=v0.17.0@BINARY
2828
# Extra deps: Encryption

Dockerfile.d/SHA256SUMS.d/buildkit-v0.23.2

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
af8064eca16077b4d6937745988ba2d2dfa439540874cdcd918318315f3ba1d3 buildkit-v0.24.0.linux-amd64.tar.gz
2+
38dc4433d220bb43c198df2070e49d5dde5ed44ee31fb80d6b13722eec21d4ea buildkit-v0.24.0.linux-arm64.tar.gz

Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.7.1

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ab3bda535f9d90766cccc90d3dddb5482003dd744d7f22bcf98186bf8eea8be6 cni-plugins-linux-amd64-v1.8.0.tgz
2+
57ce466fc3b79db1f19b8f4c63e07a1112306efa53c94fe810a2150dd9e07ddb cni-plugins-linux-arm64-v1.8.0.tgz

hack/provisioning/kube/kind.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ readonly root
2121
. "$root/../../scripts/lib.sh"
2222

2323
GO_VERSION=1.25
24-
KIND_VERSION=v0.27.0
25-
CNI_PLUGINS_VERSION=v1.7.1
24+
KIND_VERSION=v0.30.0
25+
CNI_PLUGINS_VERSION=v1.8.0
2626
# shellcheck disable=SC2034
27-
CNI_PLUGINS_SHA_AMD64=1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098
27+
CNI_PLUGINS_SHA_AMD64=ab3bda535f9d90766cccc90d3dddb5482003dd744d7f22bcf98186bf8eea8be6
2828
# shellcheck disable=SC2034
29-
CNI_PLUGINS_SHA_ARM64=119fcb508d1ac2149e49a550752f9cd64d023a1d70e189b59c476e4d2bf7c497
29+
CNI_PLUGINS_SHA_ARM64=57ce466fc3b79db1f19b8f4c63e07a1112306efa53c94fe810a2150dd9e07ddb
3030

3131
[ "$(uname -m)" == "aarch64" ] && GOARCH=arm64 || GOARCH=amd64
3232

0 commit comments

Comments
 (0)