Skip to content

sync: main changes synced into develop #6492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Apr 2, 2025
Merged

sync: main changes synced into develop #6492

merged 5 commits into from
Apr 2, 2025

Conversation

Shivam-nagar23
Copy link
Member

@Shivam-nagar23 Shivam-nagar23 commented Apr 2, 2025 •
edited
Loading

Description

main sync
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?

Shivam-nagar23 and others added 5 commits April 1, 2025 15:58
@Shivam-nagar23
feat: licensing changes (#6474)
e140316 
* modules handling

* example

* sql files

* common lib update
@akshatsinha007
release: Compatibility Modifications for Enterprise and OSS Chart (#6486
1676a65 
)

* added devtronEnterprise check conditions

* added devtron-operator-cm in inception

* added eneterprise flag in devtron-cm

* updated dashboard cm

* added random alpha for ent-job

* added DEVTRON_VERSION_IDENTIFIER_IN_HELM_VALUES in devtro-cm

* updated installer for enterprise

* bom
@Shivam-nagar23
main sync
858b35e
@Shivam-nagar23
make dep update oss
999d346
@Shivam-nagar23
vendor
7b9bc48
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Apr 2, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@Shivam-nagar23 Shivam-nagar23 changed the title sync: main sync chore: main sync Apr 2, 2025
@Shivam-nagar23 Shivam-nagar23 changed the title chore: main sync sync: main sync Apr 2, 2025
@Shivam-nagar23 Shivam-nagar23 changed the title sync: main sync chore: main sync Apr 2, 2025
@Shivam-nagar23 Shivam-nagar23 changed the title chore: main sync sync: main changes synced into develop Apr 2, 2025
@Shivam-nagar23 Shivam-nagar23 merged commit ac74eb4 into develop Apr 2, 2025
17 checks passed
@Shivam-nagar23 Shivam-nagar23 deleted the main-sync branch April 2, 2025 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vikramdevtron vikramdevtron vikramdevtron approved these changes

@prakarsh-dt prakarsh-dt Awaiting requested review from prakarsh-dt prakarsh-dt is a code owner

@nishant-d nishant-d Awaiting requested review from nishant-d nishant-d is a code owner

@vivek-devtron vivek-devtron Awaiting requested review from vivek-devtron vivek-devtron is a code owner

@pawan-mehta-dt pawan-mehta-dt Awaiting requested review from pawan-mehta-dt pawan-mehta-dt is a code owner

Assignees
No one assigned
Labels
PR:Ready-to-Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Shivam-nagar23 @vikramdevtron @akshatsinha007