Skip to content

Commit 39f98db

Browse files
prkhrkatprkhrkat
committed
Merge branch 'develop' into hibernated-fix
2 parents 31cdfec + c22a646 commit 39f98db

File tree

688 files changed

+183965
-2441
lines changed

Some content is hidden

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

688 files changed

+183965
-2441
lines changed

‎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 }}

‎charts/devtron/templates/migrator.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,10 @@ apiVersion: batch/v1beta1
320320
kind: Job
321321
metadata:
322322
namespace: devtroncd
323-
name: postgresql-migrate-enterprise
323+
name: postgresql-migrate-enterprise-{{ randAlphaNum 5 | lower }}
324324
spec:
325325
activeDeadlineSeconds: 1500
326-
ttlSecondsAfterFinished: 600
326+
ttlSecondsAfterFinished: 1000
327327
backoffLimit: 20
328328
completions: 1
329329
parallelism: 1

‎charts/devtron/templates/workflow.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if not $.Values.devtronEnterprise.enabled }}
12
apiVersion: v1
23
kind: Namespace
34
metadata:
@@ -7,6 +8,7 @@ metadata:
78
annotations:
89
"helm.sh/hook": pre-install
910
"helm.sh/resource-policy": keep
11+
{{- end }}
1012
---
1113
apiVersion: v1
1214
kind: Namespace
@@ -62,6 +64,7 @@ metadata:
6264
release: devtron
6365
{{- if $.Values.installer.modules }}
6466
{{- if has "cicd" $.Values.installer.modules }}
67+
{{- if not $.Values.devtronEnterprise.enabled }}
6568
---
6669
apiVersion: apiextensions.k8s.io/v1
6770
kind: CustomResourceDefinition
@@ -951,6 +954,7 @@ kind: ServiceAccount
951954
metadata:
952955
name: argo
953956
namespace: argo
957+
{{- end }}
954958
---
955959
apiVersion: v1
956960
kind: ServiceAccount
@@ -981,6 +985,7 @@ imagePullSecrets:
981985
imagePullSecrets:
982986
{{ toYaml .Values.global.imagePullSecrets | indent 2 }}
983987
{{- end }}
988+
{{- if not $.Values.devtronEnterprise.enabled }}
984989
---
985990
apiVersion: rbac.authorization.k8s.io/v1
986991
kind: Role
@@ -1184,12 +1189,28 @@ rules:
11841189
- create
11851190
- get
11861191
- delete
1192+
{{- end }}
11871193
---
11881194
apiVersion: rbac.authorization.k8s.io/v1
11891195
kind: ClusterRole
11901196
metadata:
11911197
name: workflow-cluster-role
11921198
rules:
1199+
- apiGroups:
1200+
- '*'
1201+
resources:
1202+
- deployments
1203+
- pods
1204+
- pods/exec
1205+
verbs:
1206+
- watch
1207+
- patch
1208+
- delete
1209+
- create
1210+
- list
1211+
- get
1212+
- update
1213+
- exec
11931214
- apiGroups:
11941215
- ""
11951216
resources:
@@ -1236,6 +1257,7 @@ subjects:
12361257
- kind: ServiceAccount
12371258
name: devtron
12381259
namespace: devtroncd
1260+
{{- if not $.Values.devtronEnterprise.enabled }}
12391261
---
12401262
apiVersion: rbac.authorization.k8s.io/v1
12411263
kind: ClusterRoleBinding
@@ -1332,3 +1354,4 @@ spec:
13321354
serviceAccountName: argo
13331355
{{- end }}
13341356
{{- end }}
1357+
{{- end }}

‎client/cron/CiTriggerCron.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"fmt"
2121
"github.com/caarlos0/env"
2222
repository2 "github.com/devtron-labs/devtron/internal/sql/repository"
23+
bean2 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
2324
"github.com/devtron-labs/devtron/pkg/bean"
2425
pipelineConfigBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
2526
"github.com/devtron-labs/devtron/pkg/pipeline"
@@ -98,7 +99,7 @@ func (impl *CiTriggerCronImpl) TriggerCiCron() {
9899
ciTriggerRequest := bean.CiTriggerRequest{
99100
PipelineId: ciPipelineId,
100101
CiPipelineMaterial: ciPipelineMaterials,
101-
TriggeredBy: 1,
102+
TriggeredBy: bean2.SYSTEM_USER_ID,
102103
InvalidateCache: false,
103104
PipelineType: string(pipelineConfigBean.CI_JOB),
104105
}

‎client/telemetry/TelemetryEventClient.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ type TelemetryEventClientImpl struct {
7878
userAttributesRepository repository.UserAttributesRepository
7979
cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService
8080
telemetryConfig TelemetryConfig
81+
globalEnvVariables *util.GlobalEnvVariables
8182
}
8283

8384
type TelemetryEventClient interface {
@@ -96,7 +97,8 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
9697
serverDataStore *serverDataStore.ServerDataStore, userAuditService user2.UserAuditService,
9798
helmAppClient gRPC.HelmAppClient,
9899
cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService, cronLogger *cron3.CronLoggerImpl,
99-
installedAppReadService installedAppReader.InstalledAppReadServiceEA) (*TelemetryEventClientImpl, error) {
100+
installedAppReadService installedAppReader.InstalledAppReadServiceEA,
101+
envVariables *util.EnvironmentVariables) (*TelemetryEventClientImpl, error) {
100102
cron := cron.New(
101103
cron.WithChain(cron.Recover(cronLogger)))
102104
cron.Start()
@@ -118,6 +120,7 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
118120
installedAppReadService: installedAppReadService,
119121
cloudProviderIdentifierService: cloudProviderIdentifierService,
120122
telemetryConfig: TelemetryConfig{},
123+
globalEnvVariables: envVariables.GlobalEnvVariables,
121124
}
122125

123126
watcher.HeartbeatEventForTelemetry()
@@ -423,7 +426,7 @@ func (impl *TelemetryEventClientImpl) EnqueueGenericPostHogEvent(ucid string, ev
423426
impl.PosthogClient.Client = client
424427
}
425428
}
426-
if impl.PosthogClient.Client != nil {
429+
if impl.PosthogClient.Client != nil && !impl.globalEnvVariables.IsAirGapEnvironment {
427430
err := impl.PosthogClient.Client.Enqueue(posthog.Capture{
428431
DistinctId: ucid,
429432
Event: eventType,

0 commit comments

Comments
 (0)