Skip to content

Commit 787c5bb

Browse files
committed
always use cri to pull images
Signed-off-by: 守辰 <shouchen.zz@alibaba-inc.com> Signed-off-by: furykerry <furykerry@gmail.com>
1 parent d25416f commit 787c5bb

18 files changed

+94
-711
lines changed

go.mod

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ module github.com/openkruise/kruise
33
go 1.20
44

55
require (
6-
github.com/alibaba/pouch v0.0.0-20190328125340-37051654f368
76
github.com/appscode/jsonpatch v1.0.1
87
github.com/codegangsta/negroni v1.0.0
98
github.com/docker/distribution v2.8.2+incompatible
10-
github.com/docker/docker v26.1.5+incompatible
119
github.com/evanphx/json-patch v5.6.0+incompatible
1210
github.com/fsnotify/fsnotify v1.7.0
1311
github.com/go-bindata/go-bindata v3.1.2+incompatible
@@ -21,7 +19,6 @@ require (
2119
github.com/spf13/pflag v1.0.5
2220
github.com/stretchr/testify v1.9.0
2321
github.com/xyproto/simpleredis v0.0.0-20200201215242-1ff0da2967b4
24-
golang.org/x/net v0.24.0
2522
golang.org/x/time v0.3.0
2623
gomodules.xyz/jsonpatch/v2 v2.4.0
2724
google.golang.org/grpc v1.63.0
@@ -48,6 +45,7 @@ require (
4845
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
4946
github.com/coreos/go-semver v0.3.1 // indirect
5047
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
48+
github.com/docker/docker v24.0.0+incompatible // indirect
5149
github.com/go-logr/zapr v1.2.4 // indirect
5250
github.com/google/cel-go v0.16.1 // indirect
5351
github.com/google/gnostic-models v0.6.8 // indirect
@@ -61,6 +59,7 @@ require (
6159
go.uber.org/zap v1.25.0 // indirect
6260
golang.org/x/crypto v0.22.0 // indirect
6361
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
62+
golang.org/x/net v0.24.0 // indirect
6463
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
6564
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
6665
k8s.io/controller-manager v0.28.9 // indirect
@@ -69,38 +68,25 @@ require (
6968
)
7069

7170
require (
72-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
7371
github.com/Microsoft/go-winio v0.6.1 // indirect
7472
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
7573
github.com/beorn7/perks v1.0.1 // indirect
7674
github.com/blang/semver/v4 v4.0.0 // indirect
7775
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7876
github.com/cespare/xxhash/v2 v2.2.0 // indirect
79-
github.com/containerd/log v0.1.0 // indirect
8077
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
81-
github.com/contiv/executor v0.0.0-20180626233236-d263f4daa3ad // indirect
8278
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
8379
github.com/davecgh/go-spew v1.1.1 // indirect
84-
github.com/distribution/reference v0.6.0 // indirect
8580
github.com/docker/cli v24.0.0+incompatible // indirect
8681
github.com/docker/docker-credential-helpers v0.7.0 // indirect
87-
github.com/docker/go-connections v0.4.0 // indirect
88-
github.com/docker/go-units v0.5.0 // indirect
8982
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
9083
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
9184
github.com/felixge/httpsnoop v1.0.4 // indirect
9285
github.com/go-logr/logr v1.4.1 // indirect
9386
github.com/go-logr/stdr v1.2.2 // indirect
94-
github.com/go-openapi/analysis v0.21.2 // indirect
95-
github.com/go-openapi/errors v0.20.2 // indirect
9687
github.com/go-openapi/jsonpointer v0.19.6 // indirect
9788
github.com/go-openapi/jsonreference v0.20.2 // indirect
98-
github.com/go-openapi/loads v0.21.1 // indirect
99-
github.com/go-openapi/spec v0.20.4 // indirect
100-
github.com/go-openapi/strfmt v0.21.2 // indirect
10189
github.com/go-openapi/swag v0.22.3 // indirect
102-
github.com/go-openapi/validate v0.21.0 // indirect
103-
github.com/go-stack/stack v1.8.0 // indirect
10490
github.com/gogo/protobuf v1.3.2 // indirect
10591
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
10692
github.com/golang/protobuf v1.5.4 // indirect
@@ -116,17 +102,12 @@ require (
116102
github.com/mailru/easyjson v0.7.7 // indirect
117103
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
118104
github.com/mitchellh/go-homedir v1.1.0 // indirect
119-
github.com/mitchellh/mapstructure v1.4.1 // indirect
120-
github.com/moby/docker-image-spec v1.3.1 // indirect
121105
github.com/moby/spdystream v0.2.0 // indirect
122106
github.com/moby/sys/mountinfo v0.7.1 // indirect
123-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
124107
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
125108
github.com/modern-go/reflect2 v1.0.2 // indirect
126-
github.com/morikuni/aec v1.0.0 // indirect
127109
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
128110
github.com/nxadm/tail v1.4.8 // indirect
129-
github.com/oklog/ulid v1.3.1 // indirect
130111
github.com/opencontainers/go-digest v1.0.0 // indirect
131112
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
132113
github.com/opencontainers/runc v1.2.0-rc.1 // indirect
@@ -139,13 +120,11 @@ require (
139120
github.com/sirupsen/logrus v1.9.3 // indirect
140121
github.com/vbatts/tar-split v0.11.3 // indirect
141122
github.com/xyproto/pinterface v0.0.0-20200201214933-70763765f31f // indirect
142-
go.mongodb.org/mongo-driver v1.7.5 // indirect
143123
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
144124
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
145125
go.opentelemetry.io/otel v1.21.0 // indirect
146126
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
147127
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
148-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
149128
go.opentelemetry.io/otel/metric v1.21.0 // indirect
150129
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
151130
go.opentelemetry.io/otel/trace v1.21.0
@@ -176,33 +155,23 @@ require (
176155
)
177156

178157
replace (
158+
github.com/docker/docker => github.com/docker/docker v26.1.5+incompatible
179159
golang.org/x/sys => golang.org/x/sys v0.19.0
180160
k8s.io/api => k8s.io/api v0.28.9
181161
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.9
182162
k8s.io/apimachinery => k8s.io/apimachinery v0.28.9
183163
k8s.io/apiserver => k8s.io/apiserver v0.28.9
184-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.9
185164
k8s.io/client-go => k8s.io/client-go v0.28.9
186165
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.9
187-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.9
188166
k8s.io/code-generator => k8s.io/code-generator v0.28.9
189167
k8s.io/component-base => k8s.io/component-base v0.28.9
190168
k8s.io/component-helpers => k8s.io/component-helpers v0.28.9
191169
k8s.io/controller-manager => k8s.io/controller-manager v0.28.9
192170
k8s.io/cri-api => k8s.io/cri-api v0.28.9
193171
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.9
194172
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.9
195-
k8s.io/endpointslice => k8s.io/endpointslice v0.28.9
196173
k8s.io/kms => k8s.io/kms v0.28.9
197-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.9
198-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.9
199-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.9
200174
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.9
201-
k8s.io/kubectl => k8s.io/kubectl v0.28.9
202175
k8s.io/kubelet => k8s.io/kubelet v0.28.9
203-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.9
204-
k8s.io/metrics => k8s.io/metrics v0.28.9
205176
k8s.io/mount-utils => k8s.io/mount-utils v0.28.9
206-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.9
207-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.9
208177
)

0 commit comments

Comments
 (0)