Skip to content

Commit 9bbf827

Browse files
authored
Merge branch 'develop' into fix-api-responses
2 parents 0125f54 + cd3403b commit 9bbf827

File tree

222 files changed

+17756
-1290
lines changed

Some content is hidden

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

222 files changed

+17756
-1290
lines changed

go.mod

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,26 @@ require (
7474
go.opentelemetry.io/otel/sdk v1.36.0
7575
go.opentelemetry.io/otel/trace v1.36.0
7676
go.uber.org/zap v1.27.0
77-
golang.org/x/crypto v0.38.0
77+
golang.org/x/crypto v0.40.0
7878
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
79-
golang.org/x/mod v0.24.0
79+
golang.org/x/mod v0.25.0
8080
golang.org/x/oauth2 v0.30.0
8181
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237
8282
google.golang.org/grpc v1.72.2
8383
google.golang.org/protobuf v1.36.6
8484
gopkg.in/go-playground/validator.v9 v9.31.0
8585
gopkg.in/igm/sockjs-go.v3 v3.0.0
8686
gopkg.in/yaml.v2 v2.4.0
87-
helm.sh/helm/v3 v3.18.1
88-
k8s.io/api v0.33.1
89-
k8s.io/apimachinery v0.33.1
90-
k8s.io/client-go v0.33.1
87+
helm.sh/helm/v3 v3.18.6
88+
k8s.io/api v0.33.3
89+
k8s.io/apimachinery v0.33.3
90+
k8s.io/client-go v0.33.3
9191
k8s.io/helm v2.12.3+incompatible
92-
k8s.io/kubectl v0.33.0
92+
k8s.io/kubectl v0.33.3
9393
k8s.io/kubernetes v1.33.1
94-
k8s.io/metrics v0.33.0
94+
k8s.io/metrics v0.33.3
9595
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
96-
sigs.k8s.io/yaml v1.4.0
96+
sigs.k8s.io/yaml v1.5.0
9797
)
9898

9999
require (
@@ -129,7 +129,7 @@ require (
129129
github.com/casbin/govaluate v1.2.0 // indirect
130130
github.com/cespare/xxhash/v2 v2.3.0 // indirect
131131
github.com/chai2010/gettext-go v1.0.2 // indirect
132-
github.com/cloudflare/circl v1.3.7 // indirect
132+
github.com/cloudflare/circl v1.6.1 // indirect
133133
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
134134
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
135135
github.com/distribution/reference v0.6.0 // indirect
@@ -214,7 +214,7 @@ require (
214214
github.com/sirupsen/logrus v1.9.3 // indirect
215215
github.com/skeema/knownhosts v1.3.0 // indirect
216216
github.com/spf13/cobra v1.9.1 // indirect
217-
github.com/spf13/pflag v1.0.6 // indirect
217+
github.com/spf13/pflag v1.0.7 // indirect
218218
github.com/stoewer/go-strcase v1.3.0 // indirect
219219
github.com/stretchr/objx v0.5.2 // indirect
220220
github.com/syndtr/goleveldb v1.0.0 // indirect
@@ -231,28 +231,28 @@ require (
231231
go.opentelemetry.io/otel/metric v1.36.0 // indirect
232232
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
233233
go.uber.org/multierr v1.11.0 // indirect
234-
golang.org/x/net v0.40.0 // indirect
235-
golang.org/x/sync v0.14.0 // indirect
236-
golang.org/x/sys v0.33.0 // indirect
237-
golang.org/x/term v0.32.0 // indirect
238-
golang.org/x/text v0.25.0 // indirect
234+
golang.org/x/net v0.41.0 // indirect
235+
golang.org/x/sync v0.16.0 // indirect
236+
golang.org/x/sys v0.34.0 // indirect
237+
golang.org/x/term v0.33.0 // indirect
238+
golang.org/x/text v0.27.0 // indirect
239239
golang.org/x/time v0.11.0 // indirect
240240
google.golang.org/api v0.234.0 // indirect
241241
google.golang.org/genproto v0.0.0-20250519155744-55703ea1f237 // indirect
242242
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
243243
gopkg.in/inf.v0 v0.9.1 // indirect
244244
gopkg.in/warnings.v0 v0.1.2 // indirect
245245
gopkg.in/yaml.v3 v3.0.1 // indirect
246-
k8s.io/apiextensions-apiserver v0.33.0 // indirect
247-
k8s.io/apiserver v0.33.0 // indirect
248-
k8s.io/cli-runtime v0.33.0 // indirect
249-
k8s.io/component-base v0.33.0 // indirect
250-
k8s.io/component-helpers v0.33.0 // indirect
246+
k8s.io/apiextensions-apiserver v0.33.3 // indirect
247+
k8s.io/apiserver v0.33.3 // indirect
248+
k8s.io/cli-runtime v0.33.3 // indirect
249+
k8s.io/component-base v0.33.3 // indirect
250+
k8s.io/component-helpers v0.33.3 // indirect
251251
k8s.io/klog/v2 v2.130.1 // indirect
252252
k8s.io/kube-aggregator v0.33.0 // indirect
253253
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
254254
mellium.im/sasl v0.3.2 // indirect
255-
oras.land/oras-go/v2 v2.5.0 // indirect
255+
oras.land/oras-go/v2 v2.6.0 // indirect
256256
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
257257
sigs.k8s.io/kustomize/api v0.19.0 // indirect
258258
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
@@ -317,6 +317,7 @@ require (
317317
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
318318
github.com/perimeterx/marshmallow v1.1.5 // indirect
319319
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
320+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
320321
github.com/speakeasy-api/jsonpath v0.6.0 // indirect
321322
github.com/speakeasy-api/openapi-overlay v0.10.2 // indirect
322323
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
@@ -326,7 +327,9 @@ require (
326327
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
327328
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
328329
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
329-
golang.org/x/tools v0.33.0 // indirect
330+
go.yaml.in/yaml/v2 v2.4.2 // indirect
331+
go.yaml.in/yaml/v3 v3.0.3 // indirect
332+
golang.org/x/tools v0.34.0 // indirect
330333
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
331334
k8s.io/controller-manager v0.33.0 // indirect
332335
sigs.k8s.io/randfill v1.0.0 // indirect
@@ -335,7 +338,7 @@ require (
335338
replace (
336339
github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
337340
github.com/cyphar/filepath-securejoin v0.4.1 => github.com/cyphar/filepath-securejoin v0.3.6 // indirect
338-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250806142853-d5a47198188d
339-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806142853-d5a47198188d
341+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250902070957-ff08ef4190df
342+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250902070957-ff08ef4190df
340343
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
341344
)

0 commit comments

Comments
 (0)