Skip to content
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.

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

fix: switch ci fixes #5358

Merged
merged 11 commits into from
Jul 12, 2024
Merged

fix: switch ci fixes #5358

merged 11 commits into from
Jul 12, 2024

Conversation

gireesh-naidu
Copy link
Member

@gireesh-naidu gireesh-naidu commented Jun 25, 2024

Description

Fixes #2396

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?


kripanshdevtron
kripanshdevtron previously approved these changes Jul 8, 2024
Copy link

gitguardian bot commented Jul 11, 2024

⚠️ GitGuardian has uncovered 2 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
10220829 Triggered Generic High Entropy Secret 983c890 charts/devtron/devtron-bom.yaml View secret
10220829 Triggered Generic High Entropy Secret 983c890 charts/devtron/values.yaml View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Copy link

sonarcloud bot commented Jul 12, 2024

@gireesh-naidu gireesh-naidu merged commit 5c20f35 into main Jul 12, 2024
8 checks passed
@gireesh-naidu gireesh-naidu deleted the fixes/change-ci-oss branch July 12, 2024 12:14
Ash-exp added a commit that referenced this pull request Jul 17, 2024
* feat: 5xx issue for manual cd trigger API

* fix: panic handling for case scantool not found

* fix: switch ci fixes (#5358)

* fix: switch ci fixes

* chore: review refactoring

* chore: refactoring

* fix: add missing validations in switching to external ci

* fix: ci pipeline id is not being updated in cd pipeline if switching from external ci to other ci types

* fix: update ci pipeline id in all the cd workflows that exists in the given workflow

* fix: checkIfNsExistsForEnvIds , empty envIds check fix

* fix: ci patch rbac fixes (#5461)

* fix: ci patch rbac fixes

* fix: rbac optimisation

* fix: refactoring

---------

Co-authored-by: Asutosh Das <asutosh2000ad@gmail.com>

* feat: deployment config migration (#5368)

* inital commit - deployment config service

* wip: migration changes for devtron apps

* changes for helm apps

* dev testing fixes

* wire fix

* bulk get function

* wip: bulk logic fixes

* wip: bulk fixes

* feat: Cd pipeline migration sql and query usage update (#5416)

* Added sql

* removed unused mthod

* wip

* wip

* wip

* wip

* wip

* wip

* QUERY : updated GetOfLatestCdWfrByCdPipelineId

* QUERY : GetOfLatestInstalledAppVersionHistoryByInstalledAppVersionId

* QUERY : fix GetOfLatestCdWfrByCdPipelineId

* QUERY : fix GetOfLatestInstalledAppVersionHistoryByInstalledAppVersionId

* QUERY : updated GetLatestTriggersOfHelmPipelinesStuckInNonTerminalStatuses

* QUERY : updated GetArgoPipelineByArgoAppName

* QUERY : updated GetArgoPipelinesHavingLatestTriggerStuckInNonTerminalStatuses

* QUERY : updated GetArgoPipelinesHavingTriggersStuckInLastPossibleNonTerminalTimelines

* QUERY : updated GetAppAndEnvDetailsForDeploymentAppTypePipeline

* QUERY : updated FindActiveByEnvIdAndDeploymentType

* QUERY : updated GetActiveInstalledAppByEnvIdAndDeploymentType

* QUERY : updated GetArgoPipelinesHavingTriggersStuckInLastPossibleNonTerminalTimelinesForAppStore

* QUERY : updated GetArgoPipelinesHavingLatestTriggerStuckInNonTerminalStatusesForAppStore

* QUERY : updated GetInstalledAppByInstalledAppVersionId

* QUERY : updated GetInstalledAppByAppIdAndDeploymentType

* QUERY : updated GetAppAndEnvDetailsForDeploymentAppTypeInstalledApps

* QUERY : updated FindLatestByAppIdAndEnvId

* QUERY : updated GetInstalledAppByGitRepoUrl

* QUERY : updated FindChartByGitRepoUrl

* dev testing fixes

* QUERY : UPDATED buildAppListingWhereCondition and FIXED deploymentDetailsByAppIdAndEnvId

* function for bulk update config

* query changes

* remaining query changes

* PR review changes and logical fixes

* nil pointer fix

* fix cd pipeline helm app create

* dev testing fixes

* updating app stages status check

* query active check for deployment config

* wip

* adding flag for migration and removing bulk code

* build fix

* wip: modifying get function

* handling custom gitops case for app clone

* handling app clone with custom gitops for system generated url

* fix: wrong call for helm app deployment app type change

* fix migration function for helm app

* wip: updating dc on template update

* fix: replacing migrate with get call

* fix: wrong call for helm app

* minor fixes

* renaming chart path

* updating deprecated columns

* updating dc.active

* updating dc.active

* fix redirection

* removing chart path

* updating migration

* conditions in patch object

* fix error in flag off-> custom-gitops-> app-clone-> deploy-> flag-on-> migrate

* wire fix

* audit log fix

* migation update

* reverted 107 sql newline add

---------

Co-authored-by: kartik-579 <kartik@devtron.ai>
Co-authored-by: kartik-579 <84493919+kartik-579@users.noreply.github.com>

* handle nil check (#5497)

* doc: Added FAQ no. 28 + GoLang-migrate Link + Code Block Fix (#5502)

* Added FAQ no. 28 + GoLang-migrate Link + Code Block Fix

* Removed extra spacing at EOF

* fix: bitbucket commit race condition for concurrent requests (#5505)

* fix: hotfix v0.14.0 fixes (#5500)

* fix: patch ci rbac fix (#5498)

* handle nil check (#5497)

* fix: patch ci rbac fix

---------

Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>

* fix: external ci creation fix (#5499)

* handle nil check (#5497)

* fix: external ci creation fix

---------

Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>

* fix for deployment config - auto post cd not working (#5501)

* fix: do not create deployment config for switch ci, if pipeline is already created. (#5506)

* chore: main sync (#5510)

* handle nil check (#5497)

* doc: Added FAQ no. 28 + GoLang-migrate Link + Code Block Fix (#5502)

* Added FAQ no. 28 + GoLang-migrate Link + Code Block Fix

* Removed extra spacing at EOF

* fix: bitbucket commit race condition for concurrent requests (#5505)

---------

Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>
Co-authored-by: ashokdevtron <141001279+ashokdevtron@users.noreply.github.com>
Co-authored-by: Asutosh Das <asutosh2000ad@gmail.com>

---------

Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>
Co-authored-by: kartik-579 <84493919+kartik-579@users.noreply.github.com>
Co-authored-by: ashokdevtron <141001279+ashokdevtron@users.noreply.github.com>
Co-authored-by: Asutosh Das <asutosh2000ad@gmail.com>

---------

Co-authored-by: Gireesh Naidu <111440205+gireesh-devtron@users.noreply.github.com>
Co-authored-by: iamayushm <32041961+iamayushm@users.noreply.github.com>
Co-authored-by: kartik-579 <kartik@devtron.ai>
Co-authored-by: kartik-579 <84493919+kartik-579@users.noreply.github.com>
Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>
Co-authored-by: ashokdevtron <141001279+ashokdevtron@users.noreply.github.com>
Ash-exp added a commit that referenced this pull request Jul 18, 2024
* fix: autoscale error handling

* minor updates

* chore: renaming and logging improved

* chore: logging

* chore: k8s request adapters

* chore: k8s adapter

* chore: updated common-lib version

* fix: 5xx fixes issues and Panic handling  (#5402)

* feat: 5xx issue for manual cd trigger API

* fix: panic handling for case scantool not found

* fix: switch ci fixes (#5358)

* fix: switch ci fixes

* chore: review refactoring

* chore: refactoring

* fix: add missing validations in switching to external ci

* fix: ci pipeline id is not being updated in cd pipeline if switching from external ci to other ci types

* fix: update ci pipeline id in all the cd workflows that exists in the given workflow

* fix: checkIfNsExistsForEnvIds , empty envIds check fix

* fix: ci patch rbac fixes (#5461)

* fix: ci patch rbac fixes

* fix: rbac optimisation

* fix: refactoring

---------

Co-authored-by: Asutosh Das <asutosh2000ad@gmail.com>

* feat: deployment config migration (#5368)

* inital commit - deployment config service

* wip: migration changes for devtron apps

* changes for helm apps

* dev testing fixes

* wire fix

* bulk get function

* wip: bulk logic fixes

* wip: bulk fixes

* feat: Cd pipeline migration sql and query usage update (#5416)

* Added sql

* removed unused mthod

* wip

* wip

* wip

* wip

* wip

* wip

* QUERY : updated GetOfLatestCdWfrByCdPipelineId

* QUERY : GetOfLatestInstalledAppVersionHistoryByInstalledAppVersionId

* QUERY : fix GetOfLatestCdWfrByCdPipelineId

* QUERY : fix GetOfLatestInstalledAppVersionHistoryByInstalledAppVersionId

* QUERY : updated GetLatestTriggersOfHelmPipelinesStuckInNonTerminalStatuses

* QUERY : updated GetArgoPipelineByArgoAppName

* QUERY : updated GetArgoPipelinesHavingLatestTriggerStuckInNonTerminalStatuses

* QUERY : updated GetArgoPipelinesHavingTriggersStuckInLastPossibleNonTerminalTimelines

* QUERY : updated GetAppAndEnvDetailsForDeploymentAppTypePipeline

* QUERY : updated FindActiveByEnvIdAndDeploymentType

* QUERY : updated GetActiveInstalledAppByEnvIdAndDeploymentType

* QUERY : updated GetArgoPipelinesHavingTriggersStuckInLastPossibleNonTerminalTimelinesForAppStore

* QUERY : updated GetArgoPipelinesHavingLatestTriggerStuckInNonTerminalStatusesForAppStore

* QUERY : updated GetInstalledAppByInstalledAppVersionId

* QUERY : updated GetInstalledAppByAppIdAndDeploymentType

* QUERY : updated GetAppAndEnvDetailsForDeploymentAppTypeInstalledApps

* QUERY : updated FindLatestByAppIdAndEnvId

* QUERY : updated GetInstalledAppByGitRepoUrl

* QUERY : updated FindChartByGitRepoUrl

* dev testing fixes

* QUERY : UPDATED buildAppListingWhereCondition and FIXED deploymentDetailsByAppIdAndEnvId

* function for bulk update config

* query changes

* remaining query changes

* PR review changes and logical fixes

* nil pointer fix

* fix cd pipeline helm app create

* dev testing fixes

* updating app stages status check

* query active check for deployment config

* wip

* adding flag for migration and removing bulk code

* build fix

* wip: modifying get function

* handling custom gitops case for app clone

* handling app clone with custom gitops for system generated url

* fix: wrong call for helm app deployment app type change

* fix migration function for helm app

* wip: updating dc on template update

* fix: replacing migrate with get call

* fix: wrong call for helm app

* minor fixes

* renaming chart path

* updating deprecated columns

* updating dc.active

* updating dc.active

* fix redirection

* removing chart path

* updating migration

* conditions in patch object

* fix error in flag off-> custom-gitops-> app-clone-> deploy-> flag-on-> migrate

* wire fix

* audit log fix

* migation update

* reverted 107 sql newline add

---------

Co-authored-by: kartik-579 <kartik@devtron.ai>
Co-authored-by: kartik-579 <84493919+kartik-579@users.noreply.github.com>

* handle nil check (#5497)

* doc: Added FAQ no. 28 + GoLang-migrate Link + Code Block Fix (#5502)

* Added FAQ no. 28 + GoLang-migrate Link + Code Block Fix

* Removed extra spacing at EOF

* fix: bitbucket commit race condition for concurrent requests (#5505)

* fix: hotfix v0.14.0 fixes (#5500)

* fix: patch ci rbac fix (#5498)

* handle nil check (#5497)

* fix: patch ci rbac fix

---------

Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>

* fix: external ci creation fix (#5499)

* handle nil check (#5497)

* fix: external ci creation fix

---------

Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>

* fix for deployment config - auto post cd not working (#5501)

* fix: do not create deployment config for switch ci, if pipeline is already created. (#5506)

* chore: main sync (#5510)

* handle nil check (#5497)

* doc: Added FAQ no. 28 + GoLang-migrate Link + Code Block Fix (#5502)

* Added FAQ no. 28 + GoLang-migrate Link + Code Block Fix

* Removed extra spacing at EOF

* fix: bitbucket commit race condition for concurrent requests (#5505)

---------

Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>
Co-authored-by: ashokdevtron <141001279+ashokdevtron@users.noreply.github.com>
Co-authored-by: Asutosh Das <asutosh2000ad@gmail.com>

---------

Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>
Co-authored-by: kartik-579 <84493919+kartik-579@users.noreply.github.com>
Co-authored-by: ashokdevtron <141001279+ashokdevtron@users.noreply.github.com>
Co-authored-by: Asutosh Das <asutosh2000ad@gmail.com>

---------

Co-authored-by: Gireesh Naidu <111440205+gireesh-devtron@users.noreply.github.com>
Co-authored-by: iamayushm <32041961+iamayushm@users.noreply.github.com>
Co-authored-by: kartik-579 <kartik@devtron.ai>
Co-authored-by: kartik-579 <84493919+kartik-579@users.noreply.github.com>
Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>
Co-authored-by: ashokdevtron <141001279+ashokdevtron@users.noreply.github.com>

* updated: common-lib version

---------

Co-authored-by: Gireesh Naidu <111440205+gireesh-devtron@users.noreply.github.com>
Co-authored-by: iamayushm <32041961+iamayushm@users.noreply.github.com>
Co-authored-by: kartik-579 <kartik@devtron.ai>
Co-authored-by: kartik-579 <84493919+kartik-579@users.noreply.github.com>
Co-authored-by: ayu-devtron <167413063+ayu-devtron@users.noreply.github.com>
Co-authored-by: ashokdevtron <141001279+ashokdevtron@users.noreply.github.com>
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.

Feature: Support to change the source type in ci-pipeline
3 participants