Skip to content

Commit 8507bb7

Browse files
SATYAsasinivikramdevtronprkhrkatsystemsdtakshatsinha007
authored
fix: dependabot security advisory (#6945)
* vendor files * feat: auto assign permission group (#6923) * feat: auto-assign role groups * fix: sync claims with casbin policy * feat: file re-structuring for ent oss sync * feat: global auth apis * sync file name with oss * fix: global auth apis wire register for ea mode (#6929) * fix: global auth apis wire register for ea mode * fix: linting * release: PR for v2.1.0 (#6928) * Updated release-notes files * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated devtron to 59238e8-434-38692 tag in values file * Updated kubelink to 6b408df4-564-38694 tag in values file * Updated dashboard to d87d9a07-690-38693 tag in values file * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated kubewatch to fbde4d5e-419-38744 tag in values file * Updated hyperion to 37b07f1-280-38743 tag in values file * Updated devtron to 37b07f1-434-38746 tag in values file * Updated kubelink to fbde4d5e-564-38749 tag in values file * Updated git-sensor to fbde4d5e-200-38750 tag in values file * Updated lens to fbde4d5e-333-38752 tag in values file * Updated dashboard to d4a16ea7-690-38751 tag in values file * Updated ci-runner to fbde4d5e-138-38754 tag in values file * Updated image-scanner to fbde4d5e-141-38756 tag in values file * Updated notifier to 580d409b-372-38755 tag in values file * Updated chart-sync to fbde4d5e-836-38757 tag in values file * Updated the version in scripts * Update TimescaleDB password secret reference * Bump version from 0.22.99 to 0.23.1 * Add CLUSTER_OVERVIEW_MAX_STALE_DATA_SECONDS variable * Update releasenotes.md * Update release-notes-v2.1.0.md * Updated devtron to 634eb59-434-38762 tag in values file * Updated hyperion to 634eb59-280-38763 tag in values file --------- Co-authored-by: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com> * add support of container name in cronjob * fix: clusterId check for modifying triggers for cluster level notification (#6932) * fix: auto assign permission group related fixes (#6934) * fix: sync auto-assigned groups with casbin_rule user→group policies * fix: support token for rbac check for clusters * fix: support token for checkUser roles * fix: support token based authentication for policy rest handlers * fix: check for user isGroupClaims active in all rbac related functions * fix: add email in case of devtron system managed * fix: ea mode dependency updates * fix: vendor and tidy sync * fix: vendor and tidy sync * fix: dependabot fixes * sync: vendor files sync * release: PR for v2.1.1 (#6940) * Updated release-notes files * Updated release notes * Updated release notes * Updated devtron to 1188d0b-434-38818 tag in values file * Updated hyperion to 1188d0b-280-38819 tag in values file * Updated release notes * Updated dashboard to 8a175cbd-690-38843 tag in values file * Updated the version in scripts * Update release notes for version 2.1.1 * Update release notes for version 2.1.1 Removed the Enhancements and Others sections from the release notes. --------- Co-authored-by: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com> * sync: migration seq (#6942) * sync: migration files * sync: migration files * sync: develop main and dep syncs --------- Co-authored-by: Vikram <73224103+vikramdevtron@users.noreply.github.com> Co-authored-by: prakhar katiyar <prkhrkat@gmail.com> Co-authored-by: prakhar katiyar <39842461+prkhrkat@users.noreply.github.com> Co-authored-by: systemsdt <129372406+systemsdt@users.noreply.github.com> Co-authored-by: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com> Co-authored-by: Neha Sharma <nehasharma@Nehas-MacBook-Pro.local> Co-authored-by: AJAY KUMAR <99399155+ajaydevtron@users.noreply.github.com>
1 parent ef11462 commit 8507bb7

File tree

661 files changed

+67323
-21199
lines changed

Some content is hidden

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

661 files changed

+67323
-21199
lines changed

‎go.mod‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ require (
5959
github.com/prometheus/client_golang v1.22.0
6060
github.com/robfig/cron/v3 v3.0.1
6161
github.com/satori/go.uuid v1.2.0
62-
github.com/stretchr/testify v1.10.0
62+
github.com/stretchr/testify v1.11.1
6363
github.com/tidwall/gjson v1.14.4
6464
github.com/tidwall/sjson v1.2.4
6565
github.com/xanzy/go-gitlab v0.114.0
@@ -68,19 +68,19 @@ require (
6868
github.com/zclconf/go-cty v1.13.2
6969
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.44.0
7070
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0
71-
go.opentelemetry.io/otel v1.36.0
71+
go.opentelemetry.io/otel v1.40.0
7272
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0
7373
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0
74-
go.opentelemetry.io/otel/sdk v1.36.0
75-
go.opentelemetry.io/otel/trace v1.36.0
74+
go.opentelemetry.io/otel/sdk v1.40.0
75+
go.opentelemetry.io/otel/trace v1.40.0
7676
go.uber.org/zap v1.27.0
77-
golang.org/x/crypto v0.45.0
77+
golang.org/x/crypto v0.46.0
7878
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
79-
golang.org/x/mod v0.29.0
80-
golang.org/x/oauth2 v0.30.0
81-
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237
82-
google.golang.org/grpc v1.72.2
83-
google.golang.org/protobuf v1.36.6
79+
golang.org/x/mod v0.30.0
80+
golang.org/x/oauth2 v0.34.0
81+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217
82+
google.golang.org/grpc v1.79.3
83+
google.golang.org/protobuf v1.36.10
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
@@ -98,7 +98,7 @@ require (
9898

9999
require (
100100
cloud.google.com/go v0.121.2 // indirect
101-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
101+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
102102
cloud.google.com/go/iam v1.5.2 // indirect
103103
cloud.google.com/go/storage v1.54.0 // indirect
104104
dario.cat/mergo v1.0.1 // indirect
@@ -133,7 +133,7 @@ require (
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
136-
github.com/docker/cli v28.1.1+incompatible // indirect
136+
github.com/docker/cli v29.2.0+incompatible // indirect
137137
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
138138
github.com/emirpasic/gods v1.18.1 // indirect
139139
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
@@ -142,8 +142,8 @@ require (
142142
github.com/gammazero/deque v1.0.0 // indirect
143143
github.com/go-errors/errors v1.4.2 // indirect
144144
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
145-
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
146-
github.com/go-logr/logr v1.4.2 // indirect
145+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
146+
github.com/go-logr/logr v1.4.3 // indirect
147147
github.com/go-logr/stdr v1.2.2 // indirect
148148
github.com/go-openapi/jsonpointer v0.21.1 // indirect
149149
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -166,7 +166,7 @@ require (
166166
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
167167
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
168168
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
169-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
169+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
170170
github.com/hashicorp/errwrap v1.1.0 // indirect
171171
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
172172
github.com/hashicorp/go-retryablehttp v0.7.7
@@ -228,18 +228,18 @@ require (
228228
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
229229
github.com/xlab/treeprint v1.2.0 // indirect
230230
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
231-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
232-
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
231+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
232+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
233233
go.uber.org/multierr v1.11.0 // indirect
234-
golang.org/x/net v0.47.0 // indirect
235-
golang.org/x/sync v0.18.0 // indirect
236-
golang.org/x/sys v0.38.0 // indirect
237-
golang.org/x/term v0.37.0 // indirect
238-
golang.org/x/text v0.31.0 // indirect
234+
golang.org/x/net v0.48.0 // indirect
235+
golang.org/x/sync v0.19.0 // indirect
236+
golang.org/x/sys v0.40.0 // indirect
237+
golang.org/x/term v0.38.0 // indirect
238+
golang.org/x/text v0.32.0 // indirect
239239
golang.org/x/time v0.12.0 // indirect
240240
google.golang.org/api v0.234.0 // indirect
241241
google.golang.org/genproto v0.0.0-20250519155744-55703ea1f237 // indirect
242-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
242+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // 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
@@ -273,11 +273,11 @@ require (
273273
)
274274

275275
require (
276-
cel.dev/expr v0.24.0 // indirect
276+
cel.dev/expr v0.25.1 // indirect
277277
cloud.google.com/go/auth v0.16.1 // indirect
278278
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
279279
cloud.google.com/go/monitoring v1.24.2 // indirect
280-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
280+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
281281
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
282282
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
283283
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
@@ -301,11 +301,11 @@ require (
301301
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
302302
github.com/aws/smithy-go v1.22.3 // indirect
303303
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
304-
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
304+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
305305
github.com/dlclark/regexp2 v1.11.4 // indirect
306306
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
307-
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
308-
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
307+
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
308+
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
309309
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
310310
github.com/fluxcd/pkg/apis/acl v0.7.0 // indirect
311311
github.com/fluxcd/pkg/apis/kustomize v1.10.0 // indirect
@@ -320,16 +320,15 @@ require (
320320
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
321321
github.com/speakeasy-api/jsonpath v0.6.0 // indirect
322322
github.com/speakeasy-api/openapi-overlay v0.10.2 // indirect
323-
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
323+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
324324
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
325325
github.com/x448/float16 v0.8.4 // indirect
326-
github.com/zeebo/errs v1.4.0 // indirect
327-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
328-
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
329-
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
326+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
327+
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
328+
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
330329
go.yaml.in/yaml/v2 v2.4.2 // indirect
331330
go.yaml.in/yaml/v3 v3.0.3 // indirect
332-
golang.org/x/tools v0.38.0 // indirect
331+
golang.org/x/tools v0.39.0 // indirect
333332
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
334333
k8s.io/controller-manager v0.33.0 // indirect
335334
sigs.k8s.io/randfill v1.0.0 // indirect
@@ -338,7 +337,7 @@ require (
338337
replace (
339338
github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
340339
github.com/cyphar/filepath-securejoin v0.4.1 => github.com/cyphar/filepath-securejoin v0.3.6 // indirect
341-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20260227055702-7fe9d47354a0
342-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20260227055702-7fe9d47354a0
340+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20260329062641-3ec7b74dfe09
341+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20260329062641-3ec7b74dfe09
343342
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
344343
)

0 commit comments

Comments
 (0)