Skip to content

Commit e463a87

Browse files
ktockktock
committed
Bump up k3s to 1.32
Signed-off-by: Kohei Tokunaga <[email protected]>
1 parent 5a1b37f commit e463a87

File tree

7 files changed

+42
-33
lines changed

7 files changed

+42
-33
lines changed

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ARG SLIRP4NETNS_VERSION=v1.3.1
3030
ARG PAUSE_IMAGE_NAME_TEST=registry.k8s.io/pause:3.10
3131

3232
# Used in CI
33-
ARG CRI_TOOLS_VERSION=v1.30.0
33+
ARG CRI_TOOLS_VERSION=v1.30.1
3434

3535
# Legacy builder that doesn't support TARGETARCH should set this explicitly using --build-arg.
3636
# If TARGETARCH isn't supported by the builder, the default value is "amd64".
@@ -246,7 +246,7 @@ RUN apt-get update && apt-get install -y iptables && \
246246
curl -Ls https://github.com/containernetworking/plugins/releases/download/${CNI_PLUGINS_VERSION}/cni-plugins-linux-${TARGETARCH:-amd64}-${CNI_PLUGINS_VERSION}.tgz | tar xzv -C /opt/cni/bin
247247

248248
# Image which can be used as a node image for KinD (containerd with builtin snapshotter)
249-
FROM kindest/node:v1.30.0 AS kind-builtin-snapshotter
249+
FROM kindest/node:v1.32.5 AS kind-builtin-snapshotter
250250
COPY --from=containerd-snapshotter-dev /out/bin/containerd /out/bin/containerd-shim-runc-v2 /usr/local/bin/
251251
COPY --from=snapshotter-dev /out/ctr-remote /usr/local/bin/
252252
COPY ./script/config/ /
@@ -287,7 +287,7 @@ COPY ./script/config-cri-o/ /
287287
ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
288288

289289
# Image which can be used as a node image for KinD
290-
FROM kindest/node:v1.30.0
290+
FROM kindest/node:v1.32.5
291291
COPY --from=containerd-dev /out/bin/containerd /out/bin/containerd-shim-runc-v2 /usr/local/bin/
292292
COPY --from=snapshotter-dev /out/* /usr/local/bin/
293293
COPY ./script/config/ /

‎cmd/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/containerd/stargz-snapshotter/cmd
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.24.1
5+
toolchain go1.24.2
66

77
require (
88
github.com/containerd/containerd/api v1.9.0
@@ -137,10 +137,10 @@ require (
137137
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
138138
gopkg.in/inf.v0 v0.9.1 // indirect
139139
gopkg.in/yaml.v3 v3.0.1 // indirect
140-
k8s.io/api v0.32.3 // indirect
141-
k8s.io/apimachinery v0.32.3 // indirect
142-
k8s.io/client-go v0.32.3 // indirect
143-
k8s.io/cri-api v0.32.3 // indirect
140+
k8s.io/api v0.32.5 // indirect
141+
k8s.io/apimachinery v0.32.5 // indirect
142+
k8s.io/client-go v0.32.5 // indirect
143+
k8s.io/cri-api v0.32.5 // indirect
144144
k8s.io/klog/v2 v2.130.1 // indirect
145145
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
146146
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

‎cmd/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -509,14 +509,14 @@ gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
509509
gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
510510
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
511511
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
512-
k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls=
513-
k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k=
514-
k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U=
515-
k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
516-
k8s.io/client-go v0.32.3 h1:RKPVltzopkSgHS7aS98QdscAgtgah/+zmpAogooIqVU=
517-
k8s.io/client-go v0.32.3/go.mod h1:3v0+3k4IcT9bXTc4V2rt+d2ZPPG700Xy6Oi0Gdl2PaY=
518-
k8s.io/cri-api v0.32.3 h1:E8VXbXNn4yAgmuKTeNzg0C1MFSxzTdlHSwUvjuYlPTY=
519-
k8s.io/cri-api v0.32.3/go.mod h1:DCzMuTh2padoinefWME0G678Mc3QFbLMF2vEweGzBAI=
512+
k8s.io/api v0.32.5 h1:uqjjsYo1kTJr5NIcoIaP9F+TgXgADH7nKQx91FDAhtk=
513+
k8s.io/api v0.32.5/go.mod h1:bXXFU3fGCZ/eFMZvfHZC69PeGbXEL4zzjuPVzOxHF64=
514+
k8s.io/apimachinery v0.32.5 h1:6We3aJ6crC0ap8EhsEXcgX3LpI6SEjubpiOMXLROwPM=
515+
k8s.io/apimachinery v0.32.5/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
516+
k8s.io/client-go v0.32.5 h1:huFmQMzgWu0z4kbWsuZci+Gt4Fo72I4CcrvhToZ/Qp0=
517+
k8s.io/client-go v0.32.5/go.mod h1:Qchw6f9WIVrur7DKojAHpRgGLcANT0RLIvF39Jz58xA=
518+
k8s.io/cri-api v0.32.5 h1:T+EBuBOnTJ6YUihg5XQUlI7wDCZqDAWSnOi8slg335U=
519+
k8s.io/cri-api v0.32.5/go.mod h1:DCzMuTh2padoinefWME0G678Mc3QFbLMF2vEweGzBAI=
520520
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
521521
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
522522
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/containerd/stargz-snapshotter
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.24.1
5+
toolchain go1.24.2
66

77
require (
88
github.com/containerd/console v1.0.5
@@ -32,10 +32,10 @@ require (
3232
golang.org/x/sync v0.15.0
3333
golang.org/x/sys v0.33.0
3434
google.golang.org/grpc v1.73.0
35-
k8s.io/api v0.32.3
36-
k8s.io/apimachinery v0.32.3
37-
k8s.io/client-go v0.32.3
38-
k8s.io/cri-api v0.32.3
35+
k8s.io/api v0.32.5
36+
k8s.io/apimachinery v0.32.5
37+
k8s.io/client-go v0.32.5
38+
k8s.io/cri-api v0.32.5
3939
)
4040

4141
require (

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -395,14 +395,14 @@ gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
395395
gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
396396
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
397397
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
398-
k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls=
399-
k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k=
400-
k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U=
401-
k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
402-
k8s.io/client-go v0.32.3 h1:RKPVltzopkSgHS7aS98QdscAgtgah/+zmpAogooIqVU=
403-
k8s.io/client-go v0.32.3/go.mod h1:3v0+3k4IcT9bXTc4V2rt+d2ZPPG700Xy6Oi0Gdl2PaY=
404-
k8s.io/cri-api v0.32.3 h1:E8VXbXNn4yAgmuKTeNzg0C1MFSxzTdlHSwUvjuYlPTY=
405-
k8s.io/cri-api v0.32.3/go.mod h1:DCzMuTh2padoinefWME0G678Mc3QFbLMF2vEweGzBAI=
398+
k8s.io/api v0.32.5 h1:uqjjsYo1kTJr5NIcoIaP9F+TgXgADH7nKQx91FDAhtk=
399+
k8s.io/api v0.32.5/go.mod h1:bXXFU3fGCZ/eFMZvfHZC69PeGbXEL4zzjuPVzOxHF64=
400+
k8s.io/apimachinery v0.32.5 h1:6We3aJ6crC0ap8EhsEXcgX3LpI6SEjubpiOMXLROwPM=
401+
k8s.io/apimachinery v0.32.5/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
402+
k8s.io/client-go v0.32.5 h1:huFmQMzgWu0z4kbWsuZci+Gt4Fo72I4CcrvhToZ/Qp0=
403+
k8s.io/client-go v0.32.5/go.mod h1:Qchw6f9WIVrur7DKojAHpRgGLcANT0RLIvF39Jz58xA=
404+
k8s.io/cri-api v0.32.5 h1:T+EBuBOnTJ6YUihg5XQUlI7wDCZqDAWSnOi8slg335U=
405+
k8s.io/cri-api v0.32.5/go.mod h1:DCzMuTh2padoinefWME0G678Mc3QFbLMF2vEweGzBAI=
406406
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
407407
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
408408
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=

‎script/cri-containerd/test-legacy.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ if [ "${FAIL}" == "" ] ; then
6262
docker exec "${TEST_NODE_ID}" runc --version && \
6363
docker exec "${TEST_NODE_ID}" containerd --version && \
6464
echo "===============================" && \
65-
docker exec -i "${TEST_NODE_ID}" /go/bin/critest --runtime-endpoint=${CONTAINERD_SOCK} --image-endpoint=${SNAPSHOTTER_SOCK}
65+
# FIXME: remove the skip flag once kind adds support for the user namespace
66+
# See also https://github.com/kubernetes-sigs/kind/issues/3436
67+
docker exec -i "${TEST_NODE_ID}" /go/bin/critest \
68+
--runtime-endpoint=${CONTAINERD_SOCK} --image-endpoint=${SNAPSHOTTER_SOCK} \
69+
--ginkgo.skip 'runtime should support NamespaceMode_POD'
6670
) ; then
6771
FAIL=true
6872
fi

‎script/cri-containerd/test-stargz.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,12 @@ echo "===== VERSION INFORMATION ====="
182182
docker exec "${TEST_NODE_NAME}" runc --version
183183
docker exec "${TEST_NODE_NAME}" containerd --version
184184
echo "==============================="
185-
docker exec "${TEST_NODE_NAME}" /go/bin/critest --runtime-endpoint=${CONTAINERD_SOCK} --image-endpoint=${SNAPSHOTTER_SOCK}
185+
186+
# FIXME: remove the skip flag once kind adds support for the user namespace
187+
# See also https://github.com/kubernetes-sigs/kind/issues/3436
188+
docker exec "${TEST_NODE_NAME}" /go/bin/critest \
189+
--runtime-endpoint=${CONTAINERD_SOCK} --image-endpoint=${SNAPSHOTTER_SOCK} \
190+
--ginkgo.skip 'runtime should support NamespaceMode_POD'
186191

187192
echo "Check if stargz snapshotter is working"
188193
docker exec "${TEST_NODE_NAME}" \

0 commit comments

Comments
 (0)