Merge branch 'main' into feature-release-v1

devtron-labs · Apr 24, 2024 · 90fa8c6 · 90fa8c6
2 parents d9c42e6 + 1e666e4
commit 90fa8c6
Show file tree

Hide file tree

Showing 71 changed files with 1,417 additions and 474 deletions.
diff --git a/CHANGELOG/release-notes-v0.6.29.md b/CHANGELOG/release-notes-v0.6.29.md
@@ -0,0 +1,52 @@
+## v0.6.29
+
+
+
+## Bugs
+- fix: removed unused dependency (#4916)
+- fix: release not found alert (#4928)
+- fix: link external helm app to chart store (#4919)
+- fix: Corrected the error of fetching app name and pipeline name from CI_CD_EVENT (#4911)
+- fix:job name support added in input variables (#4863)
+- fix:duplicate workflow name fixed (#4841)
+- fix: deprecate latest in app store app version (#4896)
+- fix: rbac fix in case of project in upper case (#4840)
+- fix: use join cookie logic to extract token (#4892)
+- fix: chart sync job optimisation (#4631)
+- fix: depandabot version upgrade (#4792)
+- fix: injected app-serveice dependency into DeployedApplicationEventProcessor service (#4875)
+- fix: update argo app repo url in patch (#4876)
+- fix: removed code for gitops repo migration in devtron apps (#4838)
+- fix: return nil,err on git material fetch error (#4857)
+- fix: ns not found in case ips is being injected in cluster (in global config) (#4844)
+- fix: helm deployments stucked in queued for devtron apps (#4842)
+- fix: panic on re-trigger ci if pod deleted on BuildTriggerObject (#4826)
+- fix: hide ldap creds in in get req (#4788)
+- fix: 5xx 4.0 iter (#4620)
+- fix:  rolefilters correction with all applications and particular application selected. (#4820)
+- fix: extra check added for mono-repo migraiton (#4764)
+- fix: trim space from git repo Url on create and update material (#4787)
+## Enhancements
+- perf: memory optimizations and prom metrics on terminal session exposed (#4909)
+- feat: Added the Devtron CI Trigger Plugin (#4908)
+- feat:MailMaster Plugin v1.0 (#4825)
+- feat: Add support for git hash in the app and app group overview section _revised (#4836)
+- feat:Github Pull Request Closer (#4833)
+- feat: Added Apply job in k8s plugin (#4828)
+- feat: Branch Divergence Checker Plugin (#4806)
+- feat: added request method in audit logger (#4817)
+- feat: active inactive user phase 3 (#4649)
+## Documentation
+- doc: Added EnvVariablesFromFieldPath in Deployment Template (#4852)
+## Others
+- chore: migration support for notification db changes (#4906)
+- chore: App Store refactoring v4 (#4647)
+- chore: Resource mapping refactoring (#4813)
+- misc: Refactoring Pagerduty Issue Calculator script (#4856)
+- misc: Update github_pagerduty_score_calculation.yml (#4853)
+- misc: Update pager-duty.yaml (#4850)
+- misc: Pagerduty issue template change (#4796)
+- chore: Image scanning refactoring (#4802)
+- chore: refactoring v4 (#4775)
+
+
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 #!make
 
-all: build
+all: fetch-all-env build
 
 TAG?=$(shell bash -c 'git log --pretty=format:'%h' -n 1')
 FLAGS=
@@ -63,3 +63,7 @@ build-all: build
 
 build-ea:
 	make --directory ./cmd/external-app build
+
+
+fetch-all-env:
+	go run fetchAllEnv/fetchAllEnv.go
diff --git a/api/bean/AppView.go b/api/bean/AppView.go
@@ -144,6 +144,9 @@ type AppEnvironmentContainer struct {
 type DeploymentDetailContainer struct {
 	InstalledAppId                int             `json:"installedAppId,omitempty"`
 	AppId                         int             `json:"appId,omitempty"`
+	CdPipelineId                  int             `json:"cdPipelineId,omitempty"`
+	TriggerType                   string          `json:"triggerType,omitempty"`
+	ParentEnvironmentName         string          `json:"parentEnvironmentName"`
 	AppStoreInstalledAppVersionId int             `json:"appStoreInstalledAppVersionId,omitempty"`
 	AppStoreChartName             string          `json:"appStoreChartName,omitempty"`
 	AppStoreChartId               int             `json:"appStoreChartId,omitempty"`
@@ -169,7 +172,7 @@ type DeploymentDetailContainer struct {
 	ParentArtifactId              int             `json:"parentArtifactId"`
 	ClusterId                     int             `json:"clusterId"`
 	DeploymentAppType             string          `json:"deploymentAppType"`
-	CiPipelineId                  int             `json:"-"`
+	CiPipelineId                  int             `json:"ciPipelineId,omitempty"`
 	IsExternalCi                  bool            `json:"externalCi"`
 	ClusterName                   string          `json:"clusterName,omitempty"`
 	DockerRegistryId              string          `json:"dockerRegistryId,omitempty"`

diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 0.6.28
+appVersion: 0.6.29
 description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
 keywords:
   - Devtron
@@ -11,7 +11,7 @@ keywords:
   - argocd
   - Hyperion
 engine: gotpl
-version: 0.22.70
+version: 0.22.71
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
@@ -7,15 +7,15 @@ global:
     allowPrivilegeEscalation: false
     runAsUser: 1000
     runAsNonRoot: true
+  containerRegistry: "quay.io/devtron"
 
 installer:
-  release: "v0.6.28"
-  image: "quay.io/devtron/inception"
+  release: "v0.6.29"
+  registry: ""
+  image: "inception"
   tag: "473deaa4-185-21582"
-
 components:
   dashboard:
-    image: "quay.io/devtron/dashboard:9429b066-325-21529"
     config:
       extraConfigs:
         USE_V2: "true"
@@ -27,17 +27,35 @@ components:
         GLOBAL_API_TIMEOUT: "60000"
         TRIGGER_API_TIMEOUT: "60000"
         ENABLE_EXTERNAL_ARGO_CD: "false"
+        SERVICE_WORKER_TIMEOUT: "1"
+        API_BATCH_SIZE: "30"
+    registry: ""
+    image: "dashboard:1c86e84e-325-22108"
+    imagePullPolicy: IfNotPresent
+
   devtron:
-    image: "quay.io/devtron/hyperion:ca439071-280-21596"
-    cicdImage: "quay.io/devtron/devtron:ca439071-434-21597"
-    customOverrides:
-      DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:d5f875c7-138-21576"
+    registry: ""
+    image: "hyperion:e7f34f5a-280-22107"
+    cicdImage: "devtron:e7f34f5a-434-22106"
+    imagePullPolicy: IfNotPresent
+    customOverrides: {}
+
+  ciRunner:
+    registry: ""
+    image: "ci-runner:f5614d79-541-22176"
+
+
   argocdDexServer:
-    image: "ghcr.io/dexidp/dex:v2.30.2"
+    registry: ""
+    image: "dex:v2.30.2"
+    imagePullPolicy: IfNotPresent
     initContainer:
-      authenticator: "quay.io/devtron/authenticator:e414faff-393-13273"
+      authenticator: "authenticator:e414faff-393-13273"
+
   kubelink:
-    image: "quay.io/devtron/kubelink:7c66e0fc-564-21516"
+    registry: ""
+    image: "kubelink:2610ac5a-564-22109"
+    imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
       MANIFEST_FETCH_BATCH_SIZE: "2"
@@ -51,21 +69,31 @@ components:
     dbconfig:
       secretName: postgresql-postgresql
       keyName: postgresql-password
+
   kubewatch:
-    image: "quay.io/devtron/kubewatch:91c2cece-419-21178"
+    registry: ""
+    image: "kubewatch:50d4d32d-419-22116"
     imagePullPolicy: IfNotPresent
     configs:
       devtroncd_NAMESPACE: "devtron-ci"
       CI_INFORMER: "true"
       ACD_NAMESPACE: "devtroncd"
       ACD_INFORMER: "true"
       NATS_STREAM_MAX_AGE: "10800"
+
   postgres:
-    image: "quay.io/devtron/postgres:11.9.0-debian-10-r26"
-    armImage: "quay.io/devtron/postgres:11.9"
-  gitsensor:
-    image: "quay.io/devtron/git-sensor:4bacf5f7-200-21575"
+    registry: ""
+    image: "postgres:11.9.0-debian-10-r26"
+    armImage: "postgres:11.9"
+    initImage: "minideb:latest"
     imagePullPolicy: "IfNotPresent"
+    metrics:
+      image: postgres_exporter:v0.4.7
+      armImage: postgres_exporter:v0.10.1
+  gitsensor:
+    registry: ""
+    image: "git-sensor:8545feb5-200-22005"
+    imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
     persistence:
@@ -79,8 +107,10 @@ components:
     dbconfig:
       secretName: postgresql-postgresql
       keyName: postgresql-password
-  lens: 
-    image: "quay.io/devtron/lens:70577aaa-333-21179"
+# Values for lens
+  lens:
+    registry: ""
+    image: "lens:70577aaa-333-21179"
     imagePullPolicy: IfNotPresent
     configs:
       GIT_SENSOR_PROTOCOL: GRPC
@@ -93,21 +123,27 @@ components:
     dbconfig:
       secretName: postgresql-postgresql
       keyName: postgresql-password
+# Change below values for nats
   nats:
+    registry: ""
     image: nats:2.9.3-alpine
-    imagePullPolicy: IfNotPresent
     reloader:
-      image: quay.io/devtron/nats-server-config-reloader:0.6.2
+      image: nats-server-config-reloader:0.6.2
       imagePullPolicy: IfNotPresent
     metrics:
-      image: quay.io/devtron/prometheus-nats-exporter:0.9.0
+      image: prometheus-nats-exporter:0.9.0
       imagePullPolicy: IfNotPresent
+    natsBox:
+      image: nats-box
     serviceMonitor:
       enabled: false
     persistence:
       storage: 5Gi
   migrator:
-    image: "quay.io/devtron/migrator:v4.16.2"
+    registry: ""
+    image: "migrator:v4.16.2"
+    kubectlImage: "kubectl:latest"
+    duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0
     envVars:
       devtron:
         DB_NAME: "orchestrator"
@@ -117,21 +153,54 @@ components:
         DB_NAME: "git_sensor"
       lens: 
         DB_NAME: "lens"
-
+
+  chartSync:
+    registry: ""
+    image: chart-sync:d0dcc590-373-21074
+
+# values for argocd integration
 argo-cd:
   global:
     image:
+      # -- If defined, a repository applied to all Argo CD deployments
       repository: quay.io/argoproj/argocd
+      # -- Overrides the global Argo CD image tag whose default is the chart appVersion
       tag: "v2.5.2"
+      # -- If defined, a imagePullPolicy applied to all Argo CD deployments
       imagePullPolicy: IfNotPresent
-      
+# Change below values for workflow controller
 workflowController:
-  image: "quay.io/argoproj/workflow-controller:v3.4.3"
-  executorImage: "quay.io/argoproj/argoexec:v3.4.3"
-
+  registry: "quay.io/argoproj"
+  image: "workflow-controller:v3.4.3"
+  executorImage: "argoexec:v3.4.3"
+  IMDSv1Image: "workflow-controller:v3.0.7"
+  IMDSv1ExecutorImage: "argoexec:v3.0.7"
 security:
   imageScanner:
-    image: "quay.io/devtron/image-scanner:bdbcef05-334-21577"
-
+    image: "image-scanner:c0416bc2-334-22111"
+  clair:
+    image:
+      repository: clair
+      tag: 4.3.6
+# Values for notifier integration
 notifier:
-  image: "quay.io/devtron/notifier:e4ffc71a-372-20776"
+  image: "notifier:924a17f6-372-22110"
+minio:
+  image: "minio:RELEASE.2021-02-14T04-01-33Z"
+  mbImage: "minio-mc:RELEASE.2021-02-14T04-28-06Z"
+  gatewayImage: "minio:RELEASE.2020-12-03T05-49-24Z"
+
+# Values for grafana integration
+monitoring:
+  grafana:
+    registry: ""
+    image: "grafana:7.3.1"
+    busyboxImage: "busybox:1.31.1"
+    batsImage: "bats:v1.4.1"
+    imagePullPolicy: IfNotPresent
+    grafanaOrgJob:
+      curlImage: k8s-utils:tutum-curl
+    grafanaDashboards:
+      image: "k8s-sidecar:1.1.0"
+      curlImage: "curl:7.73.0"
+      imagePullPolicy: IfNotPresent
diff --git a/charts/devtron/templates/_helpers.tpl b/charts/devtron/templates/_helpers.tpl
@@ -18,3 +18,36 @@ it randomly.
 {{- randAlphaNum $len -}}
 {{- end -}}
 {{- end }}
+
+
+{{/*
+Return full image
+{{ include "common.image" ( dict "component" .Values.path.to.the.component "global" .Values.global .extraImage .extraImageTag .extraImageDigest ) }}
+*/}}
+{{- define "common.image" -}}
+{{- $registryName := .component.registry | default .global.containerRegistry -}}
+{{- $imageName := .extraImage | default .component.image -}}
+{{- $imageTag := .extraImageTag | default .component.tag -}}
+{{- $imageDigest := .extraImageDigest | default .component.digest -}}
+{{- if $registryName }}
+    {{- if and $imageTag $imageDigest }}
+        {{- printf "%s/%s@%s" $registryName $imageName $imageDigest -}}
+    {{- else if $imageTag }}
+        {{- printf "%s/%s:%s" $registryName $imageName $imageTag -}}
+    {{- else if $imageDigest }}
+        {{- printf "%s/%s@%s" $registryName $imageName $imageDigest -}}
+    {{- else }}
+        {{- printf "%s/%s" $registryName $imageName -}}
+    {{- end }}
+{{- else -}}
+    {{- if and $imageTag $imageDigest }}
+        {{- printf "%s@%s" $imageName $imageDigest -}}
+    {{- else if $imageTag }}
+        {{- printf "%s:%s" $imageName $imageTag -}}
+    {{- else if $imageDigest }}
+        {{- printf "%s@%s" $imageName $imageDigest -}}
+    {{- else }}
+        {{- printf "%s" $imageName -}}
+    {{- end }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/devtron/templates/app-sync-job.yaml b/charts/devtron/templates/app-sync-job.yaml
@@ -13,7 +13,7 @@ spec:
       serviceAccountName: devtron
       initContainers:
       - name: migration-wait
-        image: "quay.io/devtron/kubectl:latest"
+        image: {{ include "common.image" (dict "component" $.Values.components.migrator "global" $.Values.global "extraImage" $.Values.components.migrator.kubectlImage ) }}
         command: ['sh', '-c', 'while [ ! $(kubectl -n devtroncd get $(kubectl -n devtroncd get job -l job=postgresql-migrate-devtron -o name) -o jsonpath="{.status.succeeded}")  ]; do sleep 10; done']
         {{- if .Values.components.migrator }}
         {{- if .Values.components.migrator.appSync }}
@@ -31,7 +31,7 @@ spec:
       {{- end }}
       containers:
       - name: chart-sync
-        image: quay.io/devtron/chart-sync:d0dcc590-373-21074
+        image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }}
         {{- if and $.Values.global $.Values.global.containerSecurityContext }}
         securityContext:
 {{- toYaml $.Values.global.containerSecurityContext | nindent 10 }}
@@ -80,7 +80,7 @@ spec:
           {{- end }}
           containers:
           - name: chart-sync
-            image: quay.io/devtron/chart-sync:d0dcc590-373-21074
+            image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }}
             {{- if and $.Values.global $.Values.global.containerSecurityContext }}
             securityContext:
 {{- toYaml $.Values.global.containerSecurityContext | nindent 14 }}

diff --git a/charts/devtron/templates/dashboard.yaml b/charts/devtron/templates/dashboard.yaml
@@ -79,7 +79,7 @@ spec:
       {{- end }}
       containers:
         - name: dashboard
-          image: {{ .image }}
+          image: {{ include "common.image" (dict "component" $.Values.components.dashboard "global" $.Values.global) }}
           imagePullPolicy: {{ .imagePullPolicy }}
           {{- if and $.Values.global $.Values.global.containerSecurityContext }}
           securityContext: