Skip to content

Commit 7f9a798

Browse files
authored
Merge pull request #3231 from devspace-sh/combined-dependabot-go
Combines all the Go dependency updates for the current dependabot prs
2 parents a8592f2 + 188d9b5 commit 7f9a798

3,081 files changed

Lines changed: 274764 additions & 133129 deletions

File tree

Some content is hidden

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

assets/assets.go

Lines changed: 10 additions & 12 deletions
Large diffs are not rendered by default.

e2e/tests/devspacehelper/inject.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ var _ = DevSpaceDescribe("devspacehelper", func() {
121121
pods, err = kubeClient.RawClient().CoreV1().Pods(ns).List(ctx, metav1.ListOptions{LabelSelector: "app=non-curl-container"})
122122
if err != nil {
123123
return false, err
124+
} else if len(pods.Items) == 0 || len(pods.Items[0].Status.ContainerStatuses) == 0 {
125+
return false, nil
124126
}
125127
return pods.Items[0].Status.ContainerStatuses[0].Ready, nil
126128
})

go.mod

Lines changed: 59 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/loft-sh/devspace
22

3-
go 1.25
3+
go 1.25.0
44

55
toolchain go1.25.9
66

@@ -21,10 +21,10 @@ require (
2121
github.com/fujiwara/shapeio v1.0.0
2222
github.com/gertd/go-pluralize v0.2.0
2323
github.com/gliderlabs/ssh v0.3.5
24-
github.com/go-resty/resty/v2 v2.7.0
24+
github.com/go-resty/resty/v2 v2.17.1
2525
github.com/google/go-containerregistry v0.20.6
2626
github.com/google/uuid v1.6.0
27-
github.com/gorilla/websocket v1.5.0
27+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
2828
github.com/invopop/jsonschema v0.4.0
2929
github.com/jessevdk/go-flags v1.4.0
3030
github.com/joho/godotenv v1.5.1
@@ -39,45 +39,47 @@ require (
3939
github.com/mitchellh/go-homedir v1.1.0
4040
github.com/moby/buildkit v0.11.4
4141
github.com/moby/patternmatcher v0.6.0
42-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587
42+
github.com/moby/term v0.5.0
4343
github.com/olekukonko/tablewriter v0.0.5
44-
github.com/onsi/ginkgo/v2 v2.13.0
45-
github.com/onsi/gomega v1.29.0
44+
github.com/onsi/ginkgo/v2 v2.27.2
45+
github.com/onsi/gomega v1.38.2
4646
github.com/otiai10/copy v1.7.0
4747
github.com/pkg/errors v0.9.1
4848
github.com/pkg/sftp v1.13.10
4949
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94
5050
github.com/sirupsen/logrus v1.9.3
5151
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
52-
github.com/spf13/cobra v1.9.1
52+
github.com/spf13/cobra v1.10.0
5353
github.com/spf13/pflag v1.0.10
5454
github.com/vmware-labs/yaml-jsonpath v0.3.2
55-
golang.org/x/crypto v0.41.0
56-
golang.org/x/net v0.42.0
57-
golang.org/x/text v0.28.0
55+
golang.org/x/crypto v0.44.0
56+
golang.org/x/net v0.47.0
57+
golang.org/x/text v0.31.0
5858
google.golang.org/grpc v1.74.2
59-
google.golang.org/protobuf v1.36.6
59+
google.golang.org/protobuf v1.36.8
6060
gopkg.in/natefinch/lumberjack.v2 v2.0.0
6161
gopkg.in/src-d/go-git.v4 v4.13.1
6262
gopkg.in/yaml.v3 v3.0.1
6363
gotest.tools v2.2.0+incompatible
64-
k8s.io/api v0.29.0
65-
k8s.io/apimachinery v0.29.0
66-
k8s.io/client-go v0.29.0
64+
k8s.io/api v0.35.0
65+
k8s.io/apimachinery v0.35.0
66+
k8s.io/client-go v0.35.0
6767
k8s.io/klog v1.0.0
68-
k8s.io/klog/v2 v2.110.1
69-
k8s.io/kubectl v0.29.0
68+
k8s.io/klog/v2 v2.130.1
69+
k8s.io/kubectl v0.35.0
7070
mvdan.cc/sh/v3 v3.5.1
71-
sigs.k8s.io/yaml v1.4.0
71+
sigs.k8s.io/yaml v1.6.0
7272
)
7373

7474
require (
7575
cloud.google.com/go/compute/metadata v0.7.0 // indirect
76-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
76+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
7777
github.com/MakeNowJust/heredoc v1.0.0 // indirect
78+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
7879
github.com/Microsoft/go-winio v0.6.2 // indirect
7980
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
8081
github.com/beorn7/perks v1.0.1 // indirect
82+
github.com/blang/semver/v4 v4.0.0 // indirect
8183
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8284
github.com/chai2010/gettext-go v1.0.2 // indirect
8385
github.com/containerd/console v1.0.3 // indirect
@@ -96,33 +98,33 @@ require (
9698
github.com/docker/go-metrics v0.0.1 // indirect
9799
github.com/docker/go-units v0.5.0 // indirect
98100
github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960 // indirect
99-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
101+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
100102
github.com/emirpasic/gods v1.12.0 // indirect
101-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
103+
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
102104
github.com/felixge/httpsnoop v1.0.4 // indirect
105+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
103106
github.com/go-errors/errors v1.4.2 // indirect
104107
github.com/go-logr/logr v1.4.3 // indirect
105108
github.com/go-logr/stdr v1.2.2 // indirect
106-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
109+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
107110
github.com/go-openapi/jsonreference v0.20.2 // indirect
108-
github.com/go-openapi/swag v0.22.3 // indirect
109-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
111+
github.com/go-openapi/swag v0.23.0 // indirect
112+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
110113
github.com/gofrs/flock v0.8.1 // indirect
111114
github.com/gogo/googleapis v1.4.1 // indirect
112115
github.com/gogo/protobuf v1.3.2 // indirect
113116
github.com/golang/protobuf v1.5.4 // indirect
114-
github.com/google/btree v1.0.1 // indirect
115-
github.com/google/gnostic-models v0.6.8 // indirect
117+
github.com/google/btree v1.1.3 // indirect
118+
github.com/google/gnostic-models v0.7.0 // indirect
116119
github.com/google/go-cmp v0.7.0 // indirect
117120
github.com/google/go-github/v30 v30.1.0 // indirect
118121
github.com/google/go-querystring v1.0.0 // indirect
119-
github.com/google/gofuzz v1.2.0 // indirect
120-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
122+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
121123
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
122124
github.com/gorilla/mux v1.8.0 // indirect
123-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
125+
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
124126
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
125-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
127+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
126128
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
127129
github.com/imdario/mergo v0.3.12 // indirect
128130
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
@@ -140,12 +142,11 @@ require (
140142
github.com/mattn/go-isatty v0.0.17 // indirect
141143
github.com/mattn/go-runewidth v0.0.9 // indirect
142144
github.com/mattn/go-shellwords v1.0.12 // indirect
143-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
144145
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
145146
github.com/mitchellh/mapstructure v1.4.3 // indirect
146147
github.com/moby/docker-image-spec v1.3.1 // indirect
147148
github.com/moby/go-archive v0.1.0 // indirect
148-
github.com/moby/spdystream v0.2.0 // indirect
149+
github.com/moby/spdystream v0.5.0 // indirect
149150
github.com/moby/sys/atomicwriter v0.1.0 // indirect
150151
github.com/moby/sys/capability v0.4.0 // indirect
151152
github.com/moby/sys/mountinfo v0.7.2 // indirect
@@ -155,7 +156,7 @@ require (
155156
github.com/moby/sys/user v0.4.0 // indirect
156157
github.com/moby/sys/userns v0.1.0 // indirect
157158
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
158-
github.com/modern-go/reflect2 v1.0.2 // indirect
159+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
159160
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
160161
github.com/morikuni/aec v1.0.0 // indirect
161162
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -164,12 +165,12 @@ require (
164165
github.com/opencontainers/image-spec v1.1.1 // indirect
165166
github.com/opencontainers/runtime-spec v1.2.1 // indirect
166167
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
167-
github.com/prometheus/client_golang v1.16.0 // indirect
168-
github.com/prometheus/client_model v0.4.0 // indirect
169-
github.com/prometheus/common v0.44.0 // indirect
170-
github.com/prometheus/procfs v0.10.1 // indirect
168+
github.com/prometheus/client_golang v1.23.2 // indirect
169+
github.com/prometheus/client_model v0.6.2 // indirect
170+
github.com/prometheus/common v0.66.1 // indirect
171+
github.com/prometheus/procfs v0.16.1 // indirect
171172
github.com/russross/blackfriday/v2 v2.1.0 // indirect
172-
github.com/sergi/go-diff v1.1.0 // indirect
173+
github.com/sergi/go-diff v1.2.0 // indirect
173174
github.com/src-d/gcfg v1.4.0 // indirect
174175
github.com/syncthing/notify v0.0.0-20250528144937-c7027d4f7465 // indirect
175176
github.com/tcnksm/go-gitconfig v0.1.2 // indirect
@@ -178,6 +179,7 @@ require (
178179
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
179180
github.com/ulikunitz/xz v0.5.15 // indirect
180181
github.com/vbatts/tar-split v0.12.1 // indirect
182+
github.com/x448/float16 v0.8.4 // indirect
181183
github.com/xanzy/ssh-agent v0.2.1 // indirect
182184
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
183185
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -187,32 +189,36 @@ require (
187189
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
188190
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
189191
go.opentelemetry.io/otel v1.36.0 // indirect
190-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
192+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
191193
go.opentelemetry.io/otel/metric v1.36.0 // indirect
192194
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
193195
go.opentelemetry.io/otel/trace v1.36.0 // indirect
194-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
195-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
196+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
197+
go.yaml.in/yaml/v2 v2.4.3 // indirect
198+
go.yaml.in/yaml/v3 v3.0.4 // indirect
199+
golang.org/x/mod v0.29.0 // indirect
196200
golang.org/x/oauth2 v0.30.0 // indirect
197-
golang.org/x/sync v0.16.0 // indirect
198-
golang.org/x/sys v0.35.0 // indirect
199-
golang.org/x/term v0.34.0 // indirect
200-
golang.org/x/time v0.3.0 // indirect
201-
golang.org/x/tools v0.35.0 // indirect
201+
golang.org/x/sync v0.18.0 // indirect
202+
golang.org/x/sys v0.38.0 // indirect
203+
golang.org/x/term v0.37.0 // indirect
204+
golang.org/x/time v0.12.0 // indirect
205+
golang.org/x/tools v0.38.0 // indirect
202206
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
203207
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
208+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
204209
gopkg.in/inf.v0 v0.9.1 // indirect
205210
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
206211
gopkg.in/warnings.v0 v0.1.2 // indirect
207212
gopkg.in/yaml.v2 v2.4.0 // indirect
208-
k8s.io/cli-runtime v0.29.0 // indirect
209-
k8s.io/component-base v0.29.0 // indirect
210-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
211-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
212-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
213-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
214-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
215-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
213+
k8s.io/cli-runtime v0.35.0 // indirect
214+
k8s.io/component-base v0.35.0 // indirect
215+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
216+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
217+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
218+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
219+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
220+
sigs.k8s.io/randfill v1.0.0 // indirect
221+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
216222
)
217223

218224
replace github.com/distribution/reference => github.com/distribution/reference v0.5.0

0 commit comments

Comments
 (0)