Skip to content

chore: main sync develop 4/8 - #7004

Open
Shivam-nagar23 wants to merge 62 commits into
developfrom
chore-main-sync-4-8
Open

chore: main sync develop 4/8#7004
Shivam-nagar23 wants to merge 62 commits into
developfrom
chore-main-sync-4-8

Conversation

@Shivam-nagar23

Copy link
Copy Markdown
Member

Description

Fixes #

Checklist:

  • The title of the PR states what changed and the related issues number (used for the release note).
  • Does this PR requires documentation updates?
  • I've updated documentation as required by this PR.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have tested it for all user roles.
  • I have added all the required unit/api test cases.

Does this PR introduce a user-facing change?


vikramdevtron and others added 30 commits February 27, 2026 11:33
* 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

* fix: linting
* 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>
* 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: add support of container name in cronjob
* 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 files

* sync: migration files
Introduces BUILDX_BUILDER_POD_WAIT_DURATION_SECS (default 120s) to
control how long ci-runner waits for buildx k8s driver builder pods
to reach Running state — both on initial startup and after spot
interruption recovery. Previously the post-interruption wait was
hardcoded to 2 minutes with no control on initial startup.

Changes:
- BuildxGlobalFlags: add BuildxBuilderPodWaitDurationSecs field
- WorkflowRequest: add buildxBuilderPodWaitDurationSecs JSON field
- HandlerService_ent: propagate new field in updateWorkflowRequestWithBuildxFlags
- env_gen.json: document new CI_BUILDX env var
- Tests: BuildxGlobalFlags defaults, propagation, JSON compat
…it-timeout

feat: add env-driven timeout for buildx builder pod readiness
* feat: add native sidecar container support

* sync: dep update oss sync
misc: migration number changed to 46
# Conflicts:
#	go.mod
#	go.sum
#	vendor/modules.txt
Shivam-nagar23 and others added 15 commits July 9, 2026 10:28
Re-vendor common-lib from devtron-services main so the vendored
utils/sql carries BuildTLSConfig + PG_SSL_MODE/PG_SSL_ROOT_CERT.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Resolve 26 of 30 open Dependabot alerts by bumping to patched versions
and re-vendoring. All updates verified with make build (binary compiles,
wire codegen unchanged).

Updated:
- golang.org/x/crypto 0.46.0 -> 0.52.0 (7 alerts, incl. critical)
- github.com/go-git/go-git/v5 5.13.2 -> 5.19.1 (7 alerts)
- oras.land/oras-go/v2 2.6.0 -> 2.6.1 (3 alerts)
- github.com/go-git/go-billy/v5 5.6.2 -> 5.9.0
- golang.org/x/net 0.48.0 -> 0.55.0
- github.com/aws/aws-sdk-go-v2/service/s3 1.79.4 -> 1.97.3
- github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream 1.6.10 -> 1.7.8
- github.com/cloudflare/circl 1.6.1 -> 1.6.3
- k8s.io/kubernetes 1.33.4 -> 1.33.6 (aligned all k8s.io/* staging to 0.33.6)

Intentionally skipped (would break build or no upstream fix):
- helm.sh/helm/v3: fix (3.20.2) force-upgrades k8s stack to 0.35.x,
  incompatible with pinned argo-cd v2.14.20 / k8s 1.33
- github.com/argoproj/argo-cd/v2: no patched version available
- github.com/go-pg/pg: no patched version available

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* 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 release notes

* Updated release notes

* Updated release notes

* Added Athena, Silver Surfer and handled external postgres migration issue.

* Added Athena, Silver Surfer Yamls

* updated redis condition in Chart.yaml

* added condition for athena in devtron-bom.yaml

* updated flags for athena

* Handled cases discovered during 1st phase of release testing

* Updated Kublink, Devtron and hyperion image

* Updated kubelink to 09867a9c-564-39289 tag in values file

* Updated lens to 3b3d6d0e-333-39292 tag in values file

* Updated git-sensor to 3b3d6d0e-200-39291 tag in values file

* Updated dashboard to c7b89667-690-39290 tag in values file

* Updated ci-runner to 3b3d6d0e-138-39293 tag in values file

* Updated notifier to 9804331c-372-39294 tag in values file

* Updated image-scanner to 3b3d6d0e-141-39295 tag in values file

* Updated chart-sync to 3b3d6d0e-836-39296 tag in values file

* Added Proxy for Athena in devtron ingress

* updated the athena service images

* Updated the livenessProbe and readinessProbe for athena services

* updated the ports for health check

* Add terminationGracePeriodSeconds to athena-mcp.yaml

* Remove liveness and readiness probes

Removed liveness and readiness probes from athena-mcp.yaml.

* Updated the version in scripts

* Rename SERVICE_NAME to athena-api-service

* Added Athena flag for dashboard

* Switched the service account of athena to devtron-default-sa

---------

Co-authored-by: akshatsinha007 <akshat.sinha@devtron.ai>
Co-authored-by: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com>
Co-authored-by: Prakarsh <71125043+prakarsh-dt@users.noreply.github.com>
* feat: new common-lib key-value secret masking util

* feat: key value mask function
…ce (#7001)

* misc: branch sync with pr 3349

* feat: bitbucket auth refactor

* fix: remove ssh field from GitCredentialService.go

* debug: add debug logs for testing

* fix: set auth mode in GitConfig

* fix: save auth mode to DB while saving gitops config

* fix: add auth mode in response sent to frontend

* fix: unable to create deployment pipeline

* fix: get new client

* misc: remove new client and helper method for debugging

* fix: add missing auth mode

* refactor: use the common method to build gitopsconfigDTO

* fix: remove dead code based on review

---------

Co-authored-by: vivek-one2n <vivekanandan.gm@one2n.in>
Co-authored-by: Shivam Nagar <124123645+Shivam-nagar23@users.noreply.github.com>
@bito-code-review

Copy link
Copy Markdown

Bito Automatic Review Skipped - Branch Excluded

Bito didn't auto-review because the source or target branch is excluded from automatic reviews. To trigger review, type /review in the comment and save. You can change the settings here, or contact the agent instance creator at shivam@devtron.ai.

vivek-devtron
vivek-devtron previously approved these changes Aug 4, 2026
Shivam-nagar23 and others added 5 commits August 4, 2026 12:49
- Adjust assignees in issue templates (.github/ISSUE_TEMPLATE).
- Refactor CODEOWNERS to streamline ownership.
- Simplify PagerDuty workflow assignees.
- Adjust assignees in issue templates (.github/ISSUE_TEMPLATE).
- Refactor CODEOWNERS to streamline ownership.
- Simplify PagerDuty workflow assignees.
chore: update GitHub configurations and ownership assignments
@sonarqubecloud

sonarqubecloud Bot commented Aug 4, 2026

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.