Merge branch 'develop' into user-attribute-api

Author: prkhrkat

api/restHandler/CoreAppRestHandler.go

@@ -1847,11 +1847,11 @@ func (handler CoreAppRestHandlerImpl) createEnvDeploymentTemplate(appId int, use
 			templateRequest := bean3.TemplateRequest{
 				AppId:               appId,
 				ChartRefId:          chartRefId,
-				ValuesOverride:      []byte("{}"),
+				ValuesOverride:      util.GetEmptyJSON(),
 				UserId:              userId,
 				IsAppMetricsEnabled: deploymentTemplateOverride.ShowAppMetrics,
 			}
-			newChartEntry, err := handler.chartService.CreateChartFromEnvOverride(templateRequest, context.Background())
+			newChartEntry, err := handler.chartService.CreateChartFromEnvOverride(context.Background(), templateRequest)
 			if err != nil {
 				handler.logger.Errorw("service err, CreateChartFromEnvOverride", "err", err, "appId", appId, "envId", envId, "chartRefId", chartRefId)
 				return err

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2020-2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package configure
+
+type DevtronAppDeploymentConfigRestHandlerEnt interface {
+}

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

@@ -30,8 +30,8 @@ import (
 	read5 "github.com/devtron-labs/devtron/pkg/chart/read"
 	repository2 "github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deployedAppMetrics"
-	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate"
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/chartRef"
+	validator2 "github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/validator"
 	security2 "github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning"
 	"github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/read"
 	read3 "github.com/devtron-labs/devtron/pkg/team/read"
@@ -108,7 +108,7 @@ type PipelineConfigRestHandlerImpl struct {
 	ciPipelineMaterialRepository        pipelineConfig.CiPipelineMaterialRepository
 	ciHandler                           pipeline.CiHandler
 	Logger                              *zap.SugaredLogger
-	deploymentTemplateValidationService deploymentTemplate.DeploymentTemplateValidationService
+	deploymentTemplateValidationService validator2.DeploymentTemplateValidationService
 	chartService                        chart.ChartService
 	devtronAppGitOpConfigService        gitOpsConfig.DevtronAppGitOpConfigService
 	propertiesConfigService             pipeline.PropertiesConfigService
@@ -141,7 +141,7 @@ type PipelineConfigRestHandlerImpl struct {
 }
 
 func NewPipelineRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, Logger *zap.SugaredLogger,
-	deploymentTemplateValidationService deploymentTemplate.DeploymentTemplateValidationService,
+	deploymentTemplateValidationService validator2.DeploymentTemplateValidationService,
 	chartService chart.ChartService,
 	devtronAppGitOpConfigService gitOpsConfig.DevtronAppGitOpConfigService,
 	propertiesConfigService pipeline.PropertiesConfigService,

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

@@ -11,7 +11,7 @@ keywords:
   - argocd
   - Hyperion
 engine: gotpl
-version: 0.22.87
+version: 0.22.88
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:

charts/devtron/Chart.yaml

@@ -29,9 +29,13 @@ metadata:
 data:
 {{- if $.Values.configs }}
 {{ toYaml $.Values.configs | indent 2 }}
+{{- end }}
+{{- if $.Values.devtronEnterprise.enabled }}
+  DEVTRON_INSTALLATION_TYPE:  "enterprise"
 {{- end }}
   INSTALLATION_THROUGH_HELM: "True"
   DEVTRON_HELM_RELEASE_NAME: {{ $.Release.Name }}
+  DEVTRON_HELM_RELEASE_NAMESPACE: {{ $.Release.Namespace }}
 {{- if and ($.Values.minio.enabled) (not $.Values.configs.BLOB_STORAGE_PROVIDER) }}
   BLOB_STORAGE_PROVIDER: "S3"
   BLOB_STORAGE_S3_ENDPOINT: "http://devtron-minio.devtroncd:9000"
@@ -302,7 +306,8 @@ metadata:
 data:
 {{- if $.Values.global.configs }}
 {{- toYaml $.Values.global.configs | nindent 2 }}
-{{- end }} 
+{{- end }}
+{{- if not $.Values.devtronEnterprise.enabled }} 
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -317,7 +322,7 @@ data:
 {{- if $.Values.global.configs }}
 {{- toYaml $.Values.global.configs | nindent 2 }}
 {{- end }} 
-
+{{- end }}
 {{- if $.Values.imagePullSecret }}
 {{- if $.Values.imagePullSecret.create }}
 ---
@@ -356,7 +361,7 @@ metadata:
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ include "imagePullSecret" . }}
-
+{{- if not $.Values.devtronEnterprise.enabled }}
 ---
 apiVersion: v1
 kind: Secret
@@ -371,3 +376,4 @@ data:
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}

charts/devtron/templates/configmap-secret.yaml

@@ -18,6 +18,9 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 data:
+{{- if $.Values.devtronEnterprise.enabled }}
+  GATEKEEPER_URL: "https://license.devtron.ai/dashboard"
+{{- end }}
 {{- if .config }}
   GA_ENABLED: {{ .config.analytics | default "false" | quote }}
   HOTJAR_ENABLED: {{ .config.hotjar | default "false" | quote }}

charts/devtron/templates/dashboard.yaml

@@ -8,11 +8,15 @@ metadata:
   name: installer-devtron
   namespace: devtroncd
 spec:
+  {{- if $.Values.devtronEnterprise.enabled }}
+  url: https://raw.githubusercontent.com/{{ $.Values.installer.repo }}/refs/tags/devtron-enterprise-{{ $.Values.installer.release }}/charts/devtron-enterprise/installation-script
+  {{- else }}
   {{- if or (eq $.Values.installer.source "gitee") (eq $.Values.installer.source "Gitee")}}
   url: https://gitee.com/{{ $.Values.installer.repo }}/raw/{{ $.Values.installer.release }}/manifests/installation-script
   {{- else }}
   url: https://raw.githubusercontent.com/{{ $.Values.installer.repo }}/{{ $.Values.installer.release }}/manifests/installation-script
   {{- end }}
+  {{- end }}
   reSync: true
 {{- end }}
 {{- end }}

charts/devtron/templates/devtron-installer.yaml

@@ -14,7 +14,9 @@ data:
   DEVTRON_HELM_RELEASE_NAMESPACE: {{ $.Release.Namespace }}
   FEATURE_MIGRATE_ARGOCD_APPLICATION_ENABLE: "true"
   PG_USER: postgres
+  {{- if not $.Values.devtronEnterprise.enabled }}
   PG_ADDR: postgresql-postgresql.devtroncd
+  {{- end }}
   PG_PORT: "5432"
   HELM_CLIENT_URL: kubelink-service:50051
   DASHBOARD_PORT: "80"
@@ -28,6 +30,11 @@ data:
   {{- end }}
   {{- if $.Values.devtronEnterprise.enabled }}
   CASBIN_CLIENT_URL: casbin-service.devtroncd:9000
+  CD_WORKFLOW_EXECUTOR_TYPE: SYSTEM
+  CI_WORKFLOW_EXECUTOR_TYPE: SYSTEM
+  DEVTRON_INSTALLATION_TYPE: enterprise
+  DEVTRON_VERSION_IDENTIFIER_IN_HELM_VALUES: "devtron.installer.release"
+  DEVTRON_BOM_URL: https://raw.githubusercontent.com/devtron-labs/charts/refs/tags/devtron-enterprise-%s/charts/devtron-enterprise/devtron-bom.yaml
   {{- end }}
 {{- if $.Values.installer.modules }}
 {{- if has "cicd" $.Values.installer.modules }}
@@ -324,4 +331,4 @@ spec:
     matchLabels:
       app: devtron
 {{- end }}
-{{- end }}
+{{- end }}

charts/devtron/templates/devtron.yaml

@@ -101,6 +101,8 @@ spec:
           envFrom:
           - configMapRef:
               name: devtron-common-cm
+          - configMapRef: 
+              name: devtron-operator-cm
           {{- if $.Values.installer.resources }}    
           resources:
           {{- toYaml $.Values.installer.resources | nindent 12 }}

charts/devtron/templates/install.yaml

@@ -320,10 +320,10 @@ apiVersion: batch/v1beta1
 kind: Job
 metadata:
   namespace: devtroncd
-  name: postgresql-migrate-enterprise
+  name: postgresql-migrate-enterprise-{{ randAlphaNum 5 | lower }}
 spec:
   activeDeadlineSeconds: 1500
-  ttlSecondsAfterFinished: 600
+  ttlSecondsAfterFinished: 1000
   backoffLimit: 20
   completions: 1
   parallelism: 1

charts/devtron/templates/migrator.yaml

@@ -1,3 +1,4 @@
+{{- if not $.Values.devtronEnterprise.enabled }}
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -7,6 +8,7 @@ metadata:
   annotations:
     "helm.sh/hook": pre-install
     "helm.sh/resource-policy": keep
+{{- end }}
 ---
 apiVersion: v1
 kind: Namespace
@@ -62,6 +64,7 @@ metadata:
     release: devtron
 {{- if $.Values.installer.modules }}
 {{- if has "cicd" $.Values.installer.modules }}
+{{- if not $.Values.devtronEnterprise.enabled }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -951,6 +954,7 @@ kind: ServiceAccount
 metadata:
   name: argo
   namespace: argo
+{{- end }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -981,6 +985,7 @@ imagePullSecrets:
 imagePullSecrets:
 {{ toYaml .Values.global.imagePullSecrets | indent 2 }}
 {{- end }}
+{{- if not $.Values.devtronEnterprise.enabled }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -1184,12 +1189,28 @@ rules:
   - create
   - get
   - delete
+{{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: workflow-cluster-role
 rules:
+- apiGroups:
+  - '*'
+  resources:
+  - deployments
+  - pods
+  - pods/exec
+  verbs:
+  - watch
+  - patch
+  - delete
+  - create
+  - list
+  - get
+  - update
+  - exec
 - apiGroups:
   - ""
   resources:
@@ -1236,6 +1257,7 @@ subjects:
 - kind: ServiceAccount
   name: devtron
   namespace: devtroncd
+{{- if not $.Values.devtronEnterprise.enabled }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -1332,3 +1354,4 @@ spec:
       serviceAccountName: argo
 {{- end }}
 {{- end }}
+{{- end }}

charts/devtron/templates/workflow.yaml

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"github.com/caarlos0/env"
 	repository2 "github.com/devtron-labs/devtron/internal/sql/repository"
+	bean2 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
 	"github.com/devtron-labs/devtron/pkg/bean"
 	pipelineConfigBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
 	"github.com/devtron-labs/devtron/pkg/pipeline"
@@ -98,7 +99,7 @@ func (impl *CiTriggerCronImpl) TriggerCiCron() {
 		ciTriggerRequest := bean.CiTriggerRequest{
 			PipelineId:         ciPipelineId,
 			CiPipelineMaterial: ciPipelineMaterials,
-			TriggeredBy:        1,
+			TriggeredBy:        bean2.SYSTEM_USER_ID,
 			InvalidateCache:    false,
 			PipelineType:       string(pipelineConfigBean.CI_JOB),
 		}

client/cron/CiTriggerCron.go

@@ -78,6 +78,7 @@ type TelemetryEventClientImpl struct {
 	userAttributesRepository       repository.UserAttributesRepository
 	cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService
 	telemetryConfig                TelemetryConfig
+	globalEnvVariables             *util.GlobalEnvVariables
 }
 
 type TelemetryEventClient interface {
@@ -96,7 +97,9 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
 	serverDataStore *serverDataStore.ServerDataStore, userAuditService user2.UserAuditService,
 	helmAppClient gRPC.HelmAppClient,
 	cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService, cronLogger *cron3.CronLoggerImpl,
-	installedAppReadService installedAppReader.InstalledAppReadServiceEA) (*TelemetryEventClientImpl, error) {
+	installedAppReadService installedAppReader.InstalledAppReadServiceEA,
+	envVariables *util.EnvironmentVariables,
+	userAttributesRepository repository.UserAttributesRepository) (*TelemetryEventClientImpl, error) {
 	cron := cron.New(
 		cron.WithChain(cron.Recover(cronLogger)))
 	cron.Start()
@@ -118,6 +121,8 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
 		installedAppReadService:        installedAppReadService,
 		cloudProviderIdentifierService: cloudProviderIdentifierService,
 		telemetryConfig:                TelemetryConfig{},
+		globalEnvVariables:             envVariables.GlobalEnvVariables,
+		userAttributesRepository:       userAttributesRepository,
 	}
 
 	watcher.HeartbeatEventForTelemetry()
@@ -423,7 +428,7 @@ func (impl *TelemetryEventClientImpl) EnqueueGenericPostHogEvent(ucid string, ev
 			impl.PosthogClient.Client = client
 		}
 	}
-	if impl.PosthogClient.Client != nil {
+	if impl.PosthogClient.Client != nil && !impl.globalEnvVariables.IsAirGapEnvironment {
 		err := impl.PosthogClient.Client.Enqueue(posthog.Capture{
 			DistinctId: ucid,
 			Event:      eventType,

client/telemetry/TelemetryEventClient.go

@@ -84,7 +84,7 @@ func NewTelemetryEventClientImplExtended(logger *zap.SugaredLogger, client *http
 	ciBuildConfigService pipeline.CiBuildConfigService, moduleRepository moduleRepo.ModuleRepository, serverDataStore *serverDataStore.ServerDataStore,
 	helmAppClient client.HelmAppClient, installedAppReadService installedAppReader.InstalledAppReadService, userAttributesRepository repository.UserAttributesRepository,
 	cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService, cronLogger *cron3.CronLoggerImpl,
-	gitOpsConfigReadService config.GitOpsConfigReadService) (*TelemetryEventClientImplExtended, error) {
+	gitOpsConfigReadService config.GitOpsConfigReadService, envVariables *util.EnvironmentVariables) (*TelemetryEventClientImplExtended, error) {
 
 	cron := cron.New(
 		cron.WithChain(cron.Recover(cronLogger)))
@@ -123,6 +123,7 @@ func NewTelemetryEventClientImplExtended(logger *zap.SugaredLogger, client *http
 			userAttributesRepository:       userAttributesRepository,
 			cloudProviderIdentifierService: cloudProviderIdentifierService,
 			telemetryConfig:                TelemetryConfig{},
+			globalEnvVariables:             envVariables.GlobalEnvVariables,
 		},
 	}
 

client/telemetry/TelemetryEventClientExtended.go

@@ -97,7 +97,6 @@ import (
 func InitializeApp() (*App, error) {
 	wire.Build(
 		user.SelfRegistrationWireSet,
-
 		sql.PgSqlWireSet,
 		user.UserWireSet,
 		sso.SsoConfigWireSet,

cmd/external-app/wire.go

@@ -191,10 +191,12 @@
  | GRAFANA_USERNAME | string |admin |  |  | false |
  | HIDE_IMAGE_TAGGING_HARD_DELETE | bool |false |  |  | false |
  | IGNORE_AUTOCOMPLETE_AUTH_CHECK | bool |false |  |  | false |
+ | INSTALLED_MODULES |  | | List of installed modules given in helm values/yaml are written in cm and used by devtron to know which modules are given | security.trivy,security.clair | false |
  | INSTALLER_CRD_NAMESPACE | string |devtroncd |  |  | false |
  | INSTALLER_CRD_OBJECT_GROUP_NAME | string |installer.devtron.ai |  |  | false |
  | INSTALLER_CRD_OBJECT_RESOURCE | string |installers |  |  | false |
  | INSTALLER_CRD_OBJECT_VERSION | string |v1alpha1 |  |  | false |
+ | IS_AIR_GAP_ENVIRONMENT | bool |false |  |  | false |
  | JwtExpirationTime | int |120 |  |  | false |
  | K8s_CLIENT_MAX_IDLE_CONNS_PER_HOST | int |25 |  |  | false |
  | K8s_TCP_IDLE_CONN_TIMEOUT | int |300 |  |  | false |