Skip to content

Commit 6fcdfe3

Browse files
committed
initial changes
1 parent c8e75fb commit 6fcdfe3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+8142
-3
lines changed

internal/util/ChartTemplateService.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import (
4040

4141
const (
4242
PIPELINE_DEPLOYMENT_TYPE_ACD = "argo_cd"
43+
PIPELINE_DEPLOYMENT_TYPE_FLUX = "flux_cd"
4344
PIPELINE_DEPLOYMENT_TYPE_HELM = "helm"
4445
PIPELINE_DEPLOYMENT_TYPE_MANIFEST_DOWNLOAD = "manifest_download"
4546
PIPELINE_DEPLOYMENT_TYPE_MANIFEST_PUSH = "manifest_push"

pkg/deployment/trigger/devtronApps/bean/bean.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ type TriggerEvent struct {
3434
PerformChartPush bool
3535
PerformDeploymentOnCluster bool
3636
DeployArgoCdApp bool
37+
DeployFluxCdApp bool
3738
DeploymentAppType string
3839
ManifestStorageType string
3940
TriggeredBy int32
@@ -77,6 +78,7 @@ type DeploymentType = string
7778
const (
7879
Helm DeploymentType = "helm"
7980
ArgoCd DeploymentType = "argo_cd"
81+
FluxCd DeploymentType = "flux_cd"
8082
ManifestDownload DeploymentType = "manifest_download"
8183
GitOpsWithoutDeployment DeploymentType = "git_ops_without_deployment"
8284
)

pkg/deployment/trigger/devtronApps/helper/helper.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,16 @@ func NewTriggerEvent(deploymentAppType string, triggeredAt time.Time, deployedBy
3434
TriggeredAt: triggeredAt,
3535
}
3636
switch deploymentAppType {
37-
case bean.ArgoCd:
37+
case bean.ArgoCd, bean.FluxCd:
3838
triggerEvent.PerformChartPush = true
3939
triggerEvent.PerformDeploymentOnCluster = true
40-
triggerEvent.DeployArgoCdApp = true
41-
triggerEvent.DeploymentAppType = bean.ArgoCd
40+
triggerEvent.DeploymentAppType = deploymentAppType
4241
triggerEvent.ManifestStorageType = bean2.ManifestStorageGit
42+
if deploymentAppType == bean.FluxCd {
43+
triggerEvent.DeployFluxCdApp = true
44+
} else {
45+
triggerEvent.DeployArgoCdApp = true
46+
}
4347
case bean.Helm:
4448
triggerEvent.PerformChartPush = false
4549
triggerEvent.PerformDeploymentOnCluster = true
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Patterns to ignore when building packages.
2+
# This supports shell glob matching, relative path matching, and
3+
# negation (prefixed with !). Only one pattern per line.
4+
.DS_Store
5+
# Common VCS dirs
6+
.git/
7+
.gitignore
8+
.bzr/
9+
.bzrignore
10+
.hg/
11+
.hgignore
12+
.svn/
13+
# Common backup files
14+
*.swp
15+
*.bak
16+
*.tmp
17+
*~
18+
# Various IDEs
19+
.project
20+
.idea/
21+
*.tmproj
22+
.vscode/
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"server":{"deployment":{"image_tag":"{{.Tag}}","image":"{{.Name}}"}},"pipelineName": "{{.PipelineName}}","releaseVersion":"{{.ReleaseVersion}}","deploymentType": "{{.DeploymentType}}", "app": "{{.App}}", "env": "{{.Env}}", "appMetrics": {{.AppMetrics}}}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: v1
2+
appVersion: "1.0"
3+
description: A Helm chart for Kubernetes
4+
name: deployment-chart_4-21-0
5+
version: 4.21.0

0 commit comments

Comments
 (0)