Skip to content

Commit d8a0b4f

Browse files
prkhrkatprkhrkat
authored
Merge branch 'develop' into user-attribute-api
2 parents a645721 + 9186fae commit d8a0b4f

File tree

723 files changed

+184639
-2954
lines changed

Some content is hidden

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

723 files changed

+184639
-2954
lines changed

‎api/restHandler/CoreAppRestHandler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1847,11 +1847,11 @@ func (handler CoreAppRestHandlerImpl) createEnvDeploymentTemplate(appId int, use
18471847
templateRequest := bean3.TemplateRequest{
18481848
AppId: appId,
18491849
ChartRefId: chartRefId,
1850-
ValuesOverride: []byte("{}"),
1850+
ValuesOverride: util.GetEmptyJSON(),
18511851
UserId: userId,
18521852
IsAppMetricsEnabled: deploymentTemplateOverride.ShowAppMetrics,
18531853
}
1854-
newChartEntry, err := handler.chartService.CreateChartFromEnvOverride(templateRequest, context.Background())
1854+
newChartEntry, err := handler.chartService.CreateChartFromEnvOverride(context.Background(), templateRequest)
18551855
if err != nil {
18561856
handler.logger.Errorw("service err, CreateChartFromEnvOverride", "err", err, "appId", appId, "envId", envId, "chartRefId", chartRefId)
18571857
return err

‎api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go

Lines changed: 103 additions & 163 deletions
Large diffs are not rendered by default.

‎api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler_ent.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright (c) 2020-2024. Devtron Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package configure
18+
19+
type DevtronAppDeploymentConfigRestHandlerEnt interface {
20+
}

‎api/restHandler/app/pipeline/configure/PipelineConfigRestHandler.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
read5 "github.com/devtron-labs/devtron/pkg/chart/read"
3131
repository2 "github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
3232
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deployedAppMetrics"
33-
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate"
3433
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/chartRef"
34+
validator2 "github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/validator"
3535
security2 "github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning"
3636
"github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/read"
3737
read3 "github.com/devtron-labs/devtron/pkg/team/read"
@@ -108,7 +108,7 @@ type PipelineConfigRestHandlerImpl struct {
108108
ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository
109109
ciHandler pipeline.CiHandler
110110
Logger *zap.SugaredLogger
111-
deploymentTemplateValidationService deploymentTemplate.DeploymentTemplateValidationService
111+
deploymentTemplateValidationService validator2.DeploymentTemplateValidationService
112112
chartService chart.ChartService
113113
devtronAppGitOpConfigService gitOpsConfig.DevtronAppGitOpConfigService
114114
propertiesConfigService pipeline.PropertiesConfigService
@@ -141,7 +141,7 @@ type PipelineConfigRestHandlerImpl struct {
141141
}
142142

143143
func NewPipelineRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, Logger *zap.SugaredLogger,
144-
deploymentTemplateValidationService deploymentTemplate.DeploymentTemplateValidationService,
144+
deploymentTemplateValidationService validator2.DeploymentTemplateValidationService,
145145
chartService chart.ChartService,
146146
devtronAppGitOpConfigService gitOpsConfig.DevtronAppGitOpConfigService,
147147
propertiesConfigService pipeline.PropertiesConfigService,

‎charts/devtron/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ keywords:
1111
- argocd
1212
- Hyperion
1313
engine: gotpl
14-
version: 0.22.87
14+
version: 0.22.88
1515
sources:
1616
- https://github.com/devtron-labs/charts
1717
dependencies:

‎charts/devtron/templates/configmap-secret.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,13 @@ metadata:
2929
data:
3030
{{- if $.Values.configs }}
3131
{{ toYaml $.Values.configs | indent 2 }}
32+
{{- end }}
33+
{{- if $.Values.devtronEnterprise.enabled }}
34+
DEVTRON_INSTALLATION_TYPE: "enterprise"
3235
{{- end }}
3336
INSTALLATION_THROUGH_HELM: "True"
3437
DEVTRON_HELM_RELEASE_NAME: {{ $.Release.Name }}
38+
DEVTRON_HELM_RELEASE_NAMESPACE: {{ $.Release.Namespace }}
3539
{{- if and ($.Values.minio.enabled) (not $.Values.configs.BLOB_STORAGE_PROVIDER) }}
3640
BLOB_STORAGE_PROVIDER: "S3"
3741
BLOB_STORAGE_S3_ENDPOINT: "http://devtron-minio.devtroncd:9000"
@@ -302,7 +306,8 @@ metadata:
302306
data:
303307
{{- if $.Values.global.configs }}
304308
{{- toYaml $.Values.global.configs | nindent 2 }}
305-
{{- end }}
309+
{{- end }}
310+
{{- if not $.Values.devtronEnterprise.enabled }}
306311
---
307312
apiVersion: v1
308313
kind: ConfigMap
@@ -317,7 +322,7 @@ data:
317322
{{- if $.Values.global.configs }}
318323
{{- toYaml $.Values.global.configs | nindent 2 }}
319324
{{- end }}
320-
325+
{{- end }}
321326
{{- if $.Values.imagePullSecret }}
322327
{{- if $.Values.imagePullSecret.create }}
323328
---
@@ -356,7 +361,7 @@ metadata:
356361
type: kubernetes.io/dockerconfigjson
357362
data:
358363
.dockerconfigjson: {{ include "imagePullSecret" . }}
359-
364+
{{- if not $.Values.devtronEnterprise.enabled }}
360365
---
361366
apiVersion: v1
362367
kind: Secret
@@ -371,3 +376,4 @@ data:
371376
{{- end }}
372377
{{- end }}
373378
{{- end }}
379+
{{- end }}

‎charts/devtron/templates/dashboard.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ metadata:
1818
annotations:
1919
"helm.sh/resource-policy": keep
2020
data:
21+
{{- if $.Values.devtronEnterprise.enabled }}
22+
GATEKEEPER_URL: "https://license.devtron.ai/dashboard"
23+
{{- end }}
2124
{{- if .config }}
2225
GA_ENABLED: {{ .config.analytics | default "false" | quote }}
2326
HOTJAR_ENABLED: {{ .config.hotjar | default "false" | quote }}

‎charts/devtron/templates/devtron-installer.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ metadata:
88
name: installer-devtron
99
namespace: devtroncd
1010
spec:
11+
{{- if $.Values.devtronEnterprise.enabled }}
12+
url: https://raw.githubusercontent.com/{{ $.Values.installer.repo }}/refs/tags/devtron-enterprise-{{ $.Values.installer.release }}/charts/devtron-enterprise/installation-script
13+
{{- else }}
1114
{{- if or (eq $.Values.installer.source "gitee") (eq $.Values.installer.source "Gitee")}}
1215
url: https://gitee.com/{{ $.Values.installer.repo }}/raw/{{ $.Values.installer.release }}/manifests/installation-script
1316
{{- else }}
1417
url: https://raw.githubusercontent.com/{{ $.Values.installer.repo }}/{{ $.Values.installer.release }}/manifests/installation-script
1518
{{- end }}
19+
{{- end }}
1620
reSync: true
1721
{{- end }}
1822
{{- end }}

‎charts/devtron/templates/devtron.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ data:
1414
DEVTRON_HELM_RELEASE_NAMESPACE: {{ $.Release.Namespace }}
1515
FEATURE_MIGRATE_ARGOCD_APPLICATION_ENABLE: "true"
1616
PG_USER: postgres
17+
{{- if not $.Values.devtronEnterprise.enabled }}
1718
PG_ADDR: postgresql-postgresql.devtroncd
19+
{{- end }}
1820
PG_PORT: "5432"
1921
HELM_CLIENT_URL: kubelink-service:50051
2022
DASHBOARD_PORT: "80"
@@ -28,6 +30,11 @@ data:
2830
{{- end }}
2931
{{- if $.Values.devtronEnterprise.enabled }}
3032
CASBIN_CLIENT_URL: casbin-service.devtroncd:9000
33+
CD_WORKFLOW_EXECUTOR_TYPE: SYSTEM
34+
CI_WORKFLOW_EXECUTOR_TYPE: SYSTEM
35+
DEVTRON_INSTALLATION_TYPE: enterprise
36+
DEVTRON_VERSION_IDENTIFIER_IN_HELM_VALUES: "devtron.installer.release"
37+
DEVTRON_BOM_URL: https://raw.githubusercontent.com/devtron-labs/charts/refs/tags/devtron-enterprise-%s/charts/devtron-enterprise/devtron-bom.yaml
3138
{{- end }}
3239
{{- if $.Values.installer.modules }}
3340
{{- if has "cicd" $.Values.installer.modules }}
@@ -324,4 +331,4 @@ spec:
324331
matchLabels:
325332
app: devtron
326333
{{- end }}
327-
{{- end }}
334+
{{- end }}

‎charts/devtron/templates/install.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ spec:
101101
envFrom:
102102
- configMapRef:
103103
name: devtron-common-cm
104+
- configMapRef:
105+
name: devtron-operator-cm
104106
{{- if $.Values.installer.resources }}
105107
resources:
106108
{{- toYaml $.Values.installer.resources | nindent 12 }}

0 commit comments

Comments
 (0)