Skip to content

Commit 41049a2

Browse files
authored
chore: upgrade docker dependency and adjust for deprecations (#1460)
1 parent 2d44b31 commit 41049a2

File tree

690 files changed

+103492
-16811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

690 files changed

+103492
-16811
lines changed

docs/faq/faq.md

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
- Related issues: [#133 - Pods evicted due to `NodeHasDiskPressure`](https://github.com/k3d-io/k3d/issues/133) (collection of #119 and #130)
2323
- Background: somehow docker runs out of space for the k3d node containers, which triggers a hard eviction in the kubelet
2424
- Possible [fix/workaround by @zer0def](https://github.com/k3d-io/k3d/issues/133#issuecomment-549065666):
25+
- cleanup your host file system: Yes, your host file system may actually be quite packed, triggering the eviction threshold.
26+
- on large disks, you may still have quite a few GB leftover, which is more than enough. In that case, lower the threshold as per below.
2527
- use a docker storage driver which cleans up properly (e.g. overlay2)
2628
- clean up or expand docker root filesystem
2729
- change the kubelet's eviction thresholds upon cluster creation:

go.mod

+27-16
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ replace k8s.io/kubelet => k8s.io/kubelet v0.30.2
66

77
require (
88
github.com/Microsoft/go-winio v0.6.2 // indirect
9-
github.com/containerd/containerd v1.7.19
10-
github.com/docker/cli v26.0.0+incompatible
11-
github.com/docker/docker v26.0.0+incompatible
9+
github.com/containerd/containerd v1.7.19 // indirect
10+
github.com/docker/cli v27.0.3+incompatible
11+
github.com/docker/docker v27.0.3+incompatible
1212
github.com/docker/docker-credential-helpers v0.8.1 // indirect
1313
github.com/docker/go-connections v0.5.0
1414
github.com/docker/go-metrics v0.0.1 // indirect
@@ -28,8 +28,8 @@ require (
2828
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
2929
github.com/xeipuuv/gojsonschema v1.2.0
3030
golang.org/x/sync v0.7.0
31-
golang.org/x/sys v0.19.0 // indirect
32-
golang.org/x/text v0.14.0 // indirect
31+
golang.org/x/sys v0.21.0 // indirect
32+
golang.org/x/text v0.16.0 // indirect
3333
gopkg.in/yaml.v2 v2.4.0
3434
gotest.tools v2.2.0+incompatible
3535
k8s.io/client-go v0.30.2
@@ -41,7 +41,7 @@ require (
4141
github.com/google/go-containerregistry v0.19.1
4242
github.com/rancher/wharfie v0.6.2
4343
github.com/spf13/pflag v1.0.5
44-
github.com/stretchr/testify v1.8.4
44+
github.com/stretchr/testify v1.9.0
4545
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
4646
gopkg.in/yaml.v3 v3.0.1
4747
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
@@ -52,6 +52,7 @@ require (
5252
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
5353
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
5454
github.com/beorn7/perks v1.0.1 // indirect
55+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5556
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5657
github.com/containerd/log v0.1.0 // indirect
5758
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
@@ -62,13 +63,15 @@ require (
6263
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
6364
github.com/felixge/httpsnoop v1.0.3 // indirect
6465
github.com/fsnotify/fsnotify v1.7.0 // indirect
65-
github.com/go-logr/logr v1.4.1 // indirect
66+
github.com/go-logr/logr v1.4.2 // indirect
6667
github.com/go-logr/stdr v1.2.2 // indirect
6768
github.com/gogo/protobuf v1.3.2 // indirect
6869
github.com/golang/protobuf v1.5.4 // indirect
6970
github.com/google/go-cmp v0.6.0 // indirect
7071
github.com/google/gofuzz v1.2.0 // indirect
72+
github.com/google/uuid v1.6.0 // indirect
7173
github.com/gorilla/mux v1.8.0 // indirect
74+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
7275
github.com/hashicorp/hcl v1.0.0 // indirect
7376
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7477
github.com/json-iterator/go v1.1.12 // indirect
@@ -102,19 +105,27 @@ require (
102105
github.com/vbatts/tar-split v0.11.3 // indirect
103106
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
104107
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
105-
go.opentelemetry.io/otel v1.19.0 // indirect
106-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
107-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
108+
go.opentelemetry.io/otel v1.28.0 // indirect
109+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
110+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
111+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
112+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
113+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
114+
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
115+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
116+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
108117
go.uber.org/atomic v1.9.0 // indirect
109118
go.uber.org/multierr v1.9.0 // indirect
110-
golang.org/x/crypto v0.22.0 // indirect
119+
golang.org/x/crypto v0.24.0 // indirect
111120
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
112-
golang.org/x/net v0.23.0 // indirect
113-
golang.org/x/oauth2 v0.15.0 // indirect
114-
golang.org/x/term v0.19.0 // indirect
121+
golang.org/x/net v0.26.0 // indirect
122+
golang.org/x/oauth2 v0.20.0 // indirect
123+
golang.org/x/term v0.21.0 // indirect
115124
golang.org/x/time v0.5.0 // indirect
116-
google.golang.org/appengine v1.6.7 // indirect
117-
google.golang.org/protobuf v1.33.0 // indirect
125+
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
126+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
127+
google.golang.org/grpc v1.64.0 // indirect
128+
google.golang.org/protobuf v1.34.2 // indirect
118129
gopkg.in/inf.v0 v0.9.1 // indirect
119130
gopkg.in/ini.v1 v1.67.0 // indirect
120131
gotest.tools/v3 v3.4.0 // indirect

0 commit comments

Comments
 (0)