Skip to content

Commit 145e53c

Browse files
authored
Merge pull request #26 from lengrongfu/feat/nertctl-version-check
add nerdctl version and containerd version validate
2 parents f5906b9 + 7cf54b9 commit 145e53c

File tree

7 files changed

+598
-142
lines changed

7 files changed

+598
-142
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM docker.io/golang:1.22 AS builder
2+
FROM docker.io/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

@@ -30,7 +30,7 @@ FROM docker.io/ubuntu:22.04
3030
WORKDIR /
3131

3232
ENV DOCKER_VERSION=26.1.3
33-
ENV NERDCTL_VERSION=2.0.4
33+
ENV NERDCTL_VERSION=2.1.2
3434

3535
RUN apt-get update && apt-get install -y curl && apt-get clean && \
3636
curl -fsSL https://download.docker.com/linux/static/stable/$(uname -m)/docker-${DOCKER_VERSION}.tgz | tar -xzC /usr/local/bin --strip-components=1 docker/docker && \

go.mod

Lines changed: 111 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,162 @@
11
module github.com/baizeai/kube-snapshot
22

3-
go 1.22.0
3+
go 1.24.0
44

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

77
require (
8+
github.com/Masterminds/semver/v3 v3.3.1
9+
github.com/containerd/containerd/v2 v2.1.1
10+
github.com/containerd/nerdctl/v2 v2.1.3-0.20250611024800-401800a2f38c
811
github.com/containers/image/v5 v5.31.0
9-
github.com/google/go-cmp v0.6.0
12+
github.com/google/go-cmp v0.7.0
1013
github.com/google/uuid v1.6.0
11-
github.com/onsi/ginkgo/v2 v2.19.0
12-
github.com/onsi/gomega v1.33.1
13-
github.com/open-policy-agent/cert-controller v0.10.2-0.20240531181455-2649f121ab97
14+
github.com/onsi/ginkgo/v2 v2.23.4
15+
github.com/onsi/gomega v1.37.0
16+
github.com/open-policy-agent/cert-controller v0.13.0
1417
github.com/samber/lo v1.39.0
1518
gomodules.xyz/jsonpatch/v2 v2.4.0
16-
k8s.io/api v0.30.1
17-
k8s.io/apimachinery v0.30.2
18-
k8s.io/client-go v0.30.1
19-
k8s.io/klog/v2 v2.120.1
20-
sigs.k8s.io/controller-runtime v0.18.3
19+
k8s.io/api v0.33.1
20+
k8s.io/apimachinery v0.33.1
21+
k8s.io/client-go v0.33.1
22+
k8s.io/klog/v2 v2.130.1
23+
sigs.k8s.io/controller-runtime v0.21.0
2124
)
2225

2326
require (
2427
github.com/BurntSushi/toml v1.3.2 // indirect
28+
github.com/Microsoft/go-winio v0.6.2 // indirect
29+
github.com/Microsoft/hcsshim v0.13.0 // indirect
2530
github.com/beorn7/perks v1.0.1 // indirect
31+
github.com/blang/semver/v4 v4.0.0 // indirect
2632
github.com/cespare/xxhash/v2 v2.3.0 // indirect
33+
github.com/cilium/ebpf v0.16.0 // indirect
34+
github.com/containerd/cgroups/v3 v3.0.5 // indirect
35+
github.com/containerd/console v1.0.5 // indirect
36+
github.com/containerd/containerd/api v1.9.0 // indirect
37+
github.com/containerd/continuity v0.4.5 // indirect
38+
github.com/containerd/errdefs v1.0.0 // indirect
39+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
40+
github.com/containerd/fifo v1.1.0 // indirect
41+
github.com/containerd/go-cni v1.1.12 // indirect
42+
github.com/containerd/imgcrypt/v2 v2.0.1 // indirect
43+
github.com/containerd/log v0.1.0 // indirect
44+
github.com/containerd/platforms v1.0.0-rc.1 // indirect
45+
github.com/containerd/plugin v1.0.0 // indirect
46+
github.com/containerd/stargz-snapshotter v0.16.3 // indirect
47+
github.com/containerd/ttrpc v1.2.7 // indirect
48+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
49+
github.com/containernetworking/cni v1.3.0 // indirect
50+
github.com/containernetworking/plugins v1.7.1 // indirect
2751
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
28-
github.com/containers/ocicrypt v1.1.10 // indirect
52+
github.com/containers/ocicrypt v1.2.1 // indirect
2953
github.com/containers/storage v1.54.0 // indirect
54+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3055
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3156
github.com/distribution/reference v0.6.0 // indirect
57+
github.com/docker/cli v28.2.2+incompatible // indirect
3258
github.com/docker/distribution v2.8.3+incompatible // indirect
33-
github.com/docker/docker v26.1.3+incompatible // indirect
34-
github.com/docker/docker-credential-helpers v0.8.1 // indirect
59+
github.com/docker/docker v28.2.2+incompatible // indirect
60+
github.com/docker/docker-credential-helpers v0.8.2 // indirect
3561
github.com/docker/go-connections v0.5.0 // indirect
3662
github.com/docker/go-units v0.5.0 // indirect
3763
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
3864
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
39-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
40-
github.com/fsnotify/fsnotify v1.7.0 // indirect
41-
github.com/go-logr/logr v1.4.1 // indirect
65+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
66+
github.com/felixge/httpsnoop v1.0.4 // indirect
67+
github.com/fsnotify/fsnotify v1.9.0 // indirect
68+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
69+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
70+
github.com/go-logr/logr v1.4.2 // indirect
71+
github.com/go-logr/stdr v1.2.2 // indirect
4272
github.com/go-logr/zapr v1.3.0 // indirect
4373
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4474
github.com/go-openapi/jsonreference v0.21.0 // indirect
4575
github.com/go-openapi/swag v0.23.0 // indirect
4676
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
77+
github.com/godbus/dbus/v5 v5.1.0 // indirect
4778
github.com/gogo/protobuf v1.3.2 // indirect
4879
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4980
github.com/golang/protobuf v1.5.4 // indirect
50-
github.com/google/gnostic-models v0.6.8 // indirect
51-
github.com/google/gofuzz v1.2.0 // indirect
52-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
81+
github.com/google/btree v1.1.3 // indirect
82+
github.com/google/gnostic-models v0.6.9 // indirect
83+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
5384
github.com/gorilla/mux v1.8.1 // indirect
54-
github.com/imdario/mergo v0.3.16 // indirect
85+
github.com/ipfs/go-cid v0.5.0 // indirect
5586
github.com/josharian/intern v1.0.0 // indirect
5687
github.com/json-iterator/go v1.1.12 // indirect
88+
github.com/klauspost/compress v1.18.0 // indirect
89+
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
5790
github.com/mailru/easyjson v0.7.7 // indirect
58-
github.com/moby/sys/mountinfo v0.7.1 // indirect
59-
github.com/moby/sys/user v0.1.0 // indirect
91+
github.com/miekg/pkcs11 v1.1.1 // indirect
92+
github.com/minio/sha256-simd v1.0.1 // indirect
93+
github.com/moby/locker v1.0.1 // indirect
94+
github.com/moby/sys/mountinfo v0.7.2 // indirect
95+
github.com/moby/sys/sequential v0.6.0 // indirect
96+
github.com/moby/sys/signal v0.7.1 // indirect
97+
github.com/moby/sys/user v0.4.0 // indirect
98+
github.com/moby/sys/userns v0.1.0 // indirect
6099
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
61100
github.com/modern-go/reflect2 v1.0.2 // indirect
101+
github.com/mr-tron/base58 v1.2.0 // indirect
102+
github.com/multiformats/go-base32 v0.1.0 // indirect
103+
github.com/multiformats/go-base36 v0.2.0 // indirect
104+
github.com/multiformats/go-multibase v0.2.0 // indirect
105+
github.com/multiformats/go-multihash v0.2.3 // indirect
106+
github.com/multiformats/go-varint v0.0.7 // indirect
62107
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
63108
github.com/opencontainers/go-digest v1.0.0 // indirect
64-
github.com/opencontainers/image-spec v1.1.0 // indirect
65-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
109+
github.com/opencontainers/image-spec v1.1.1 // indirect
110+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
111+
github.com/opencontainers/selinux v1.12.0 // indirect
112+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
113+
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
66114
github.com/pkg/errors v0.9.1 // indirect
67-
github.com/prometheus/client_golang v1.19.1 // indirect
115+
github.com/prometheus/client_golang v1.22.0 // indirect
68116
github.com/prometheus/client_model v0.6.1 // indirect
69-
github.com/prometheus/common v0.53.0 // indirect
70-
github.com/prometheus/procfs v0.15.0 // indirect
117+
github.com/prometheus/common v0.62.0 // indirect
118+
github.com/prometheus/procfs v0.15.1 // indirect
119+
github.com/rootless-containers/rootlesskit/v2 v2.3.5 // indirect
120+
github.com/sasha-s/go-deadlock v0.3.5 // indirect
71121
github.com/sirupsen/logrus v1.9.3 // indirect
72-
github.com/spf13/pflag v1.0.5 // indirect
122+
github.com/smallstep/pkcs7 v0.1.1 // indirect
123+
github.com/spaolacci/murmur3 v1.1.0 // indirect
124+
github.com/spf13/pflag v1.0.6 // indirect
125+
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
73126
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
127+
github.com/x448/float16 v0.8.4 // indirect
128+
go.opencensus.io v0.24.0 // indirect
129+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
130+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
131+
go.opentelemetry.io/otel v1.35.0 // indirect
132+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
133+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
74134
go.uber.org/atomic v1.11.0 // indirect
135+
go.uber.org/automaxprocs v1.6.0 // indirect
75136
go.uber.org/multierr v1.11.0 // indirect
76137
go.uber.org/zap v1.27.0 // indirect
77-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
78-
golang.org/x/net v0.25.0 // indirect
79-
golang.org/x/oauth2 v0.20.0 // indirect
80-
golang.org/x/sys v0.21.0 // indirect
81-
golang.org/x/term v0.21.0 // indirect
82-
golang.org/x/text v0.16.0 // indirect
83-
golang.org/x/time v0.5.0 // indirect
84-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
85-
google.golang.org/protobuf v1.34.2 // indirect
138+
golang.org/x/crypto v0.39.0 // indirect
139+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
140+
golang.org/x/net v0.41.0 // indirect
141+
golang.org/x/oauth2 v0.27.0 // indirect
142+
golang.org/x/sync v0.15.0 // indirect
143+
golang.org/x/sys v0.33.0 // indirect
144+
golang.org/x/term v0.32.0 // indirect
145+
golang.org/x/text v0.26.0 // indirect
146+
golang.org/x/time v0.9.0 // indirect
147+
golang.org/x/tools v0.33.0 // indirect
148+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
149+
google.golang.org/grpc v1.72.0 // indirect
150+
google.golang.org/protobuf v1.36.6 // indirect
151+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
86152
gopkg.in/inf.v0 v0.9.1 // indirect
87-
gopkg.in/yaml.v2 v2.4.0 // indirect
88153
gopkg.in/yaml.v3 v3.0.1 // indirect
89-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
90-
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
91-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
92-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
93-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
154+
k8s.io/apiextensions-apiserver v0.33.1 // indirect
155+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
156+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
157+
lukechampine.com/blake3 v1.3.0 // indirect
158+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
159+
sigs.k8s.io/randfill v1.0.0 // indirect
160+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
94161
sigs.k8s.io/yaml v1.4.0 // indirect
95162
)

0 commit comments

Comments
 (0)