Skip to content

feat: rename deployment app type gitops to argo #790

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

Merged
merged 3 commits into from
Jun 26, 2025
Merged

feat: rename deployment app type gitops to argo #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e80662b
feat: rename deployment app type gitops to argo
arunjaindev Jun 18, 2025
bbcb6c7
chore: add feature flag
arunjaindev Jun 19, 2025
526e6dc
Merge branch 'feat/flux-deployment' of https://github.com/devtron-lab…
arunjaindev Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtron-labs/devtron-fe-common-lib",
"version": "1.16.0",
"version": "1.16.0-beta-1",
"description": "Supporting common component library",
"type": "module",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ export interface CommonNodeAttr extends Pick<MandatoryPluginBaseStateType, 'isTr

export enum DeploymentAppTypes {
HELM = 'helm',
GITOPS = 'argo_cd',
ARGO = 'argo_cd',
MANIFEST_DOWNLOAD = 'manifest_download',
MANIFEST_PUSH = 'manifest_push',
FLUX = 'flux_cd',
Expand Down
4 changes: 2 additions & 2 deletions src/Shared/Components/CICDHistory/DeploymentStatusBreakdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ const DeploymentStatusDetailBreakdown = ({
{(
[
TIMELINE_STATUS.GIT_COMMIT,
...(appDetails.deploymentAppType === DeploymentAppTypes.GITOPS ||
deploymentAppType === DeploymentAppTypes.GITOPS
...(appDetails.deploymentAppType === DeploymentAppTypes.ARGO ||
deploymentAppType === DeploymentAppTypes.ARGO
? [TIMELINE_STATUS.ARGOCD_SYNC, TIMELINE_STATUS.KUBECTL_APPLY]
: []),
] as DeploymentStatusDetailRowType['type'][]
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/Components/CICDHistory/TriggerOutput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
deploymentAppType={deploymentAppType}
userApprovalMetadata={userApprovalMetadata}
isGitops={
deploymentAppType === DeploymentAppTypes.GITOPS ||
deploymentAppType === DeploymentAppTypes.ARGO ||
deploymentAppType === DeploymentAppTypes.FLUX ||
deploymentAppType === DeploymentAppTypes.MANIFEST_DOWNLOAD ||
deploymentAppType === DeploymentAppTypes.MANIFEST_PUSH
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/Components/DeploymentStatusBreakdown/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const getDefaultDeploymentStatusTimeline = (
...commonProps,
displayText: 'Push manifest to Git',
},
...(deploymentAppType === DeploymentAppTypes.GITOPS
...(deploymentAppType === DeploymentAppTypes.ARGO
? {
[TIMELINE_STATUS.ARGOCD_SYNC]: {
...commonProps,
Expand Down
1 change: 1 addition & 0 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ export interface customEnv {
* @default false
*/
FEATURE_FLUX_DEPLOYMENTS_ENABLE?: boolean
FEATURE_LINK_EXTERNAL_FLUX_ENABLE?: boolean
/**
* If true, online/offline connectivity banner is enabled
* @default true
Expand Down