Skip to content

Commit 3e7fd5f

Browse files
bug: fix broken go install workflow (#1469)
1 parent 0bedbc2 commit 3e7fd5f

File tree

2 files changed

+29
-35
lines changed

2 files changed

+29
-35
lines changed

go.mod

+29-34
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,6 @@ module github.com/k3d-io/k3d/v5
22

33
go 1.22.4
44

5-
replace k8s.io/kubelet => k8s.io/kubelet v0.30.2
6-
7-
require (
8-
github.com/Microsoft/go-winio v0.6.2 // indirect
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
12-
github.com/docker/docker-credential-helpers v0.8.1 // indirect
13-
github.com/docker/go-connections v0.5.0
14-
github.com/docker/go-metrics v0.0.1 // indirect
15-
github.com/docker/go-units v0.5.0
16-
github.com/fvbommel/sortorder v1.1.0 // indirect
17-
github.com/go-test/deep v1.1.0
18-
github.com/imdario/mergo v0.3.14
19-
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
20-
github.com/mitchellh/copystructure v1.2.0
21-
github.com/mitchellh/go-homedir v1.1.0
22-
github.com/moby/term v0.5.0 // indirect
23-
github.com/pkg/errors v0.9.1
24-
github.com/sirupsen/logrus v1.9.3
25-
github.com/spf13/cobra v1.8.0
26-
github.com/spf13/viper v1.18.2
27-
github.com/theupdateframework/notary v0.7.0 // indirect
28-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
29-
github.com/xeipuuv/gojsonschema v1.2.0
30-
golang.org/x/sync v0.7.0
31-
golang.org/x/sys v0.21.0 // indirect
32-
golang.org/x/text v0.16.0 // indirect
33-
gopkg.in/yaml.v2 v2.4.0
34-
gotest.tools v2.2.0+incompatible
35-
k8s.io/client-go v0.30.2
36-
sigs.k8s.io/yaml v1.4.0
37-
)
38-
395
require (
406
github.com/goodhosts/hostsfile v0.1.6
417
github.com/google/go-containerregistry v0.19.1
@@ -49,22 +15,32 @@ require (
4915

5016
require (
5117
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
18+
github.com/Microsoft/go-winio v0.6.2 // indirect
5219
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
5320
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
5421
github.com/beorn7/perks v1.0.1 // indirect
5522
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5623
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24+
github.com/containerd/containerd v1.7.19 // indirect
5725
github.com/containerd/log v0.1.0 // indirect
5826
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
5927
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6028
github.com/dimchansky/utfbom v1.1.1 // indirect
6129
github.com/distribution/reference v0.6.0 // indirect
30+
github.com/docker/cli v27.0.3+incompatible
6231
github.com/docker/distribution v2.8.2+incompatible // indirect
32+
github.com/docker/docker v27.0.3+incompatible
33+
github.com/docker/docker-credential-helpers v0.8.1 // indirect
6334
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
35+
github.com/docker/go-connections v0.5.0
36+
github.com/docker/go-metrics v0.0.1 // indirect
37+
github.com/docker/go-units v0.5.0
6438
github.com/felixge/httpsnoop v1.0.3 // indirect
6539
github.com/fsnotify/fsnotify v1.7.0 // indirect
40+
github.com/fvbommel/sortorder v1.1.0 // indirect
6641
github.com/go-logr/logr v1.4.2 // indirect
6742
github.com/go-logr/stdr v1.2.2 // indirect
43+
github.com/go-test/deep v1.1.0
6844
github.com/gogo/protobuf v1.3.2 // indirect
6945
github.com/golang/protobuf v1.5.4 // indirect
7046
github.com/google/go-cmp v0.6.0 // indirect
@@ -73,37 +49,49 @@ require (
7349
github.com/gorilla/mux v1.8.0 // indirect
7450
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
7551
github.com/hashicorp/hcl v1.0.0 // indirect
52+
github.com/imdario/mergo v0.3.14
7653
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7754
github.com/json-iterator/go v1.1.12 // indirect
7855
github.com/klauspost/compress v1.17.0 // indirect
56+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
7957
github.com/magefile/mage v1.15.0 // indirect
8058
github.com/magiconair/properties v1.8.7 // indirect
8159
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8260
github.com/miekg/pkcs11 v1.1.1 // indirect
61+
github.com/mitchellh/copystructure v1.2.0
62+
github.com/mitchellh/go-homedir v1.1.0
8363
github.com/mitchellh/mapstructure v1.5.0 // indirect
8464
github.com/mitchellh/reflectwalk v1.0.2 // indirect
8565
github.com/moby/docker-image-spec v1.3.1 // indirect
8666
github.com/moby/patternmatcher v0.5.0 // indirect
8767
github.com/moby/sys/sequential v0.5.0 // indirect
8868
github.com/moby/sys/user v0.1.0 // indirect
69+
github.com/moby/term v0.5.0 // indirect
8970
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9071
github.com/modern-go/reflect2 v1.0.2 // indirect
9172
github.com/opencontainers/go-digest v1.0.0 // indirect
9273
github.com/opencontainers/image-spec v1.1.0 // indirect
9374
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
75+
github.com/pkg/errors v0.9.1
9476
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
9577
github.com/prometheus/client_golang v1.14.0 // indirect
9678
github.com/prometheus/client_model v0.3.0 // indirect
9779
github.com/prometheus/common v0.39.0 // indirect
9880
github.com/prometheus/procfs v0.9.0 // indirect
9981
github.com/sagikazarmark/locafero v0.4.0 // indirect
10082
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
83+
github.com/sirupsen/logrus v1.9.3
10184
github.com/sourcegraph/conc v0.3.0 // indirect
10285
github.com/spf13/afero v1.11.0 // indirect
10386
github.com/spf13/cast v1.6.0 // indirect
87+
github.com/spf13/cobra v1.8.0
88+
github.com/spf13/viper v1.18.2
10489
github.com/subosito/gotenv v1.6.0 // indirect
90+
github.com/theupdateframework/notary v0.7.0 // indirect
10591
github.com/vbatts/tar-split v0.11.3 // indirect
92+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
10693
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
94+
github.com/xeipuuv/gojsonschema v1.2.0
10795
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
10896
go.opentelemetry.io/otel v1.28.0 // indirect
10997
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
@@ -120,17 +108,24 @@ require (
120108
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
121109
golang.org/x/net v0.26.0 // indirect
122110
golang.org/x/oauth2 v0.20.0 // indirect
111+
golang.org/x/sync v0.7.0
112+
golang.org/x/sys v0.21.0 // indirect
123113
golang.org/x/term v0.21.0 // indirect
114+
golang.org/x/text v0.16.0 // indirect
124115
golang.org/x/time v0.5.0 // indirect
125116
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
126117
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
127118
google.golang.org/grpc v1.64.0 // indirect
128119
google.golang.org/protobuf v1.34.2 // indirect
129120
gopkg.in/inf.v0 v0.9.1 // indirect
130121
gopkg.in/ini.v1 v1.67.0 // indirect
122+
gopkg.in/yaml.v2 v2.4.0
123+
gotest.tools v2.2.0+incompatible
131124
gotest.tools/v3 v3.4.0 // indirect
132125
k8s.io/apimachinery v0.30.2 // indirect
126+
k8s.io/client-go v0.30.2
133127
k8s.io/klog/v2 v2.120.1 // indirect
134128
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
135129
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
130+
sigs.k8s.io/yaml v1.4.0
136131
)

vendor/modules.txt

-1
Original file line numberDiff line numberDiff line change
@@ -929,4 +929,3 @@ sigs.k8s.io/structured-merge-diff/v4/value
929929
## explicit; go 1.12
930930
sigs.k8s.io/yaml
931931
sigs.k8s.io/yaml/goyaml.v2
932-
# k8s.io/kubelet => k8s.io/kubelet v0.30.2

0 commit comments

Comments
 (0)