Skip to content

feat: flux cd deployment #6660

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

Merged
merged 82 commits into from
Jul 2, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
6fcdfe3
initial changes
kartik-579 Jun 11, 2025
2ae227e
sql scripts
kartik-579 Jun 11, 2025
b26451c
wip
kartik-579 Jun 11, 2025
8a789f9
refactoring git factory
kartik-579 Jun 12, 2025
9f85769
adding app status
iamayushm Jun 12, 2025
429d574
added deployment logic
kartik-579 Jun 12, 2025
5fe1f4c
wip
kartik-579 Jun 12, 2025
171cdf1
added delete support
kartik-579 Jun 12, 2025
e2a92b5
adding app status
iamayushm Jun 12, 2025
9ed0126
Merge remote-tracking branch 'origin/feat-flux-cd' into feat-flux-cd-k2
iamayushm Jun 12, 2025
a2f28d5
Feat flux cd k2 crud (#6662)
iamayushm Jun 13, 2025
e13b43a
Merge pull request #6661 from devtron-labs/feat-flux-cd-k2
kartik-579 Jun 13, 2025
8771d2a
Flux deployment status (#6663)
iamayushm Jun 13, 2025
1b8ba12
updated sql file name
kartik-579 Jun 13, 2025
4f1d3a2
changes constants
kartik-579 Jun 13, 2025
21bcda7
adjusted go version to 1.23.4 and mathced with ent
kartik-579 Jun 13, 2025
cb8dc64
updated go toolchain
kartik-579 Jun 13, 2025
76c3975
wire
kartik-579 Jun 13, 2025
86e50b9
permitted deployment app type
iamayushm Jun 13, 2025
542e9e5
updated chart.ymal
kartik-579 Jun 13, 2025
53a65ea
Merge branch 'feat-flux-cd' of github.com:devtron-labs/devtron into f…
kartik-579 Jun 13, 2025
c1cba77
updated schema
kartik-579 Jun 13, 2025
072d9c9
value file change
kartik-579 Jun 13, 2025
42eab61
timeline fix
kartik-579 Jun 13, 2025
5e1e1ce
revision strategy
kartik-579 Jun 13, 2025
a62e4e9
wip
kartik-579 Jun 13, 2025
b9be502
changes condition
kartik-579 Jun 13, 2025
877add2
updated deployment app type
kartik-579 Jun 13, 2025
854c8f8
wip: deployment app tyoe un timeline
iamayushm Jun 13, 2025
e194596
Merge remote-tracking branch 'origin/feat-flux-cd' into feat-flux-cd
iamayushm Jun 13, 2025
3ecffd4
removed duplicate path
kartik-579 Jun 13, 2025
0b6412a
added handling for multiple pipeline parallel trigger in one app
kartik-579 Jun 13, 2025
5bd74bc
drift detection enbaled
kartik-579 Jun 13, 2025
9294352
rollout new chart
kartik-579 Jun 13, 2025
588c3cf
rollout new chart
kartik-579 Jun 13, 2025
442adbc
healthy status handling
iamayushm Jun 13, 2025
d5e2b08
Merge remote-tracking branch 'origin/feat-flux-cd' into feat-flux-cd
iamayushm Jun 13, 2025
89e1881
crud for cd pipeline and override
iamayushm Jun 14, 2025
f7abfa9
wip
iamayushm Jun 14, 2025
fec2a1a
adding config type
iamayushm Jun 14, 2025
7deb17a
wip: hibernating status
iamayushm Jun 14, 2025
1e5da77
wip: external app link changes
iamayushm Jun 17, 2025
088604f
fixing name and namespace
iamayushm Jun 17, 2025
9da3a1c
Merge remote-tracking branch 'origin/feat-flux-cd' into feat-ext-flux…
iamayushm Jun 17, 2025
2fd915c
adding flux cd in validation api
iamayushm Jun 17, 2025
661b08c
delete client
iamayushm Jun 17, 2025
22c6436
fix namespace
iamayushm Jun 17, 2025
aed0a42
validation for flux git repository
iamayushm Jun 18, 2025
c38304e
repo url validation fix
iamayushm Jun 18, 2025
225bb99
fix validation
iamayushm Jun 18, 2025
c13e718
conditional validation on chart type
iamayushm Jun 18, 2025
563e07e
fix deployment app type validation
iamayushm Jun 18, 2025
ca4818e
msg fic
iamayushm Jun 18, 2025
e43dbbc
fix override deployment app type
iamayushm Jun 18, 2025
631d9e8
values handling for ext flux app
iamayushm Jun 18, 2025
9549f87
git repository create update fix
iamayushm Jun 18, 2025
37a205a
updating namespace
iamayushm Jun 19, 2025
aa03392
env flag
iamayushm Jun 19, 2025
4356431
wip
kartik-579 Jun 25, 2025
2d97a2a
wip
kartik-579 Jun 25, 2025
ad4962e
wip
kartik-579 Jun 25, 2025
e84c1f8
wip
kartik-579 Jun 26, 2025
0cceb50
ea mode change
kartik-579 Jun 26, 2025
c74391c
Merge pull request #6690 from devtron-labs/feat-flux-cd-chart-store
kartik-579 Jun 26, 2025
02d847e
feature branch merge
iamayushm Jun 26, 2025
31b7637
Merge pull request #6666 from devtron-labs/feat-ext-flux-linking
iamayushm Jun 26, 2025
ab58689
Merge branch 'main' into feat-flux-cd
kartik-579 Jun 26, 2025
c7ef338
wip: migration update
iamayushm Jun 27, 2025
08aeb44
fix helm release name
iamayushm Jun 30, 2025
240b4f5
git repo name fix
iamayushm Jun 30, 2025
385f8d7
resource tree change
kartik-579 Jul 1, 2025
d46d11b
Merge branch 'feat-flux-cd' of github.com:devtron-labs/devtron into f…
kartik-579 Jul 1, 2025
a0eb554
wip
kartik-579 Jul 1, 2025
ac37578
wip
kartik-579 Jul 2, 2025
e8205aa
values file change
kartik-579 Jul 2, 2025
15678f2
ent change synced
kartik-579 Jul 2, 2025
96f4119
set rollout chart default to deployment
kartik-579 Jul 2, 2025
dc88f25
change
kartik-579 Jul 2, 2025
869270f
wip
kartik-579 Jul 2, 2025
ea27b33
wip
kartik-579 Jul 2, 2025
e4035b5
Merge branch 'develop' into feat-flux-cd
kartik-579 Jul 2, 2025
e3ed6e5
Updated oss hash for devtron-services
kartik-579 Jul 2, 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
1 change: 1 addition & 0 deletions internal/util/ChartTemplateService.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import (

const (
PIPELINE_DEPLOYMENT_TYPE_ACD = "argo_cd"
PIPELINE_DEPLOYMENT_TYPE_FLUX = "flux_cd"
PIPELINE_DEPLOYMENT_TYPE_HELM = "helm"
PIPELINE_DEPLOYMENT_TYPE_MANIFEST_DOWNLOAD = "manifest_download"
PIPELINE_DEPLOYMENT_TYPE_MANIFEST_PUSH = "manifest_push"
Expand Down
2 changes: 2 additions & 0 deletions pkg/deployment/trigger/devtronApps/bean/bean.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type TriggerEvent struct {
PerformChartPush bool
PerformDeploymentOnCluster bool
DeployArgoCdApp bool
DeployFluxCdApp bool
DeploymentAppType string
ManifestStorageType string
TriggeredBy int32
Expand Down Expand Up @@ -77,6 +78,7 @@ type DeploymentType = string
const (
Helm DeploymentType = "helm"
ArgoCd DeploymentType = "argo_cd"
FluxCd DeploymentType = "flux_cd"
ManifestDownload DeploymentType = "manifest_download"
GitOpsWithoutDeployment DeploymentType = "git_ops_without_deployment"
)
Expand Down
10 changes: 7 additions & 3 deletions pkg/deployment/trigger/devtronApps/helper/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,16 @@ func NewTriggerEvent(deploymentAppType string, triggeredAt time.Time, deployedBy
TriggeredAt: triggeredAt,
}
switch deploymentAppType {
case bean.ArgoCd:
case bean.ArgoCd, bean.FluxCd:
triggerEvent.PerformChartPush = true
triggerEvent.PerformDeploymentOnCluster = true
triggerEvent.DeployArgoCdApp = true
triggerEvent.DeploymentAppType = bean.ArgoCd
triggerEvent.DeploymentAppType = deploymentAppType
triggerEvent.ManifestStorageType = bean2.ManifestStorageGit
if deploymentAppType == bean.FluxCd {
triggerEvent.DeployFluxCdApp = true
} else {
triggerEvent.DeployArgoCdApp = true
}
case bean.Helm:
triggerEvent.PerformChartPush = false
triggerEvent.PerformDeploymentOnCluster = true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"server":{"deployment":{"image_tag":"{{.Tag}}","image":"{{.Name}}"}},"pipelineName": "{{.PipelineName}}","releaseVersion":"{{.ReleaseVersion}}","deploymentType": "{{.DeploymentType}}", "app": "{{.App}}", "env": "{{.Env}}", "appMetrics": {{.AppMetrics}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: deployment-chart_4-21-0
version: 4.21.0
Loading
Loading