Sync changes from https://github.com/devtron-labs/devtron.git for release 2.0.0

charts/devtron/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 1.8.2
+appVersion: 2.0.0
 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.98
+version: 0.22.99
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:

charts/devtron/devtron-bom.yaml

@@ -15,7 +15,7 @@ global:
     PG_DATABASE: orchestrator
 extraManifests: []
 installer:
-  release: "v1.8.2"
+  release: "v2.0.0"
   registry: ""
   image: "inception"
   tag: "473deaa4-185-21582"
@@ -41,13 +41,13 @@ components:
         FEATURE_CODE_MIRROR_ENABLE: "true"
         FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE: "true"
     registry: ""
-    image: "dashboard:b00aa204-690-36533"
+    image: "dashboard:b48d0910-690-38228"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
   devtron:
     registry: ""
-    image: "hyperion:261df88d-280-36531"
-    cicdImage: "devtron:261df88d-434-36530"
+    image: "hyperion:f0c18f20-280-38148"
+    cicdImage: "devtron:f0c18f20-434-38146"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     podSecurityContext:
@@ -61,7 +61,7 @@ components:
     healthPort: 8080
   ciRunner:
     registry: ""
-    image: "ci-runner:880420ac-138-36030"
+    image: "ci-runner:6b408df4-138-38163"
   argocdDexServer:
     registry: ""
     image: "dex:v2.30.2"
@@ -70,7 +70,7 @@ components:
       authenticator: "authenticator:e414faff-393-13273"
   kubelink:
     registry: ""
-    image: "kubelink:880420ac-564-36036"
+    image: "kubelink:6b408df4-564-38159"
     imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
@@ -93,10 +93,11 @@ components:
     healthPort: 50052
   kubewatch:
     registry: ""
-    image: "kubewatch:880420ac-419-36026"
+    image: "kubewatch:6b408df4-419-38172"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
     configs:
+      VELERO_INFORMER: "false"
       devtroncd_NAMESPACE: "devtron-ci"
       USE_CUSTOM_HTTP_TRANSPORT: "true"
       CI_INFORMER: "true"
@@ -117,7 +118,7 @@ components:
       image: postgres_exporter:v0.10.1
   gitsensor:
     registry: ""
-    image: "git-sensor:b82f5fdb-200-36532"
+    image: "git-sensor:6b408df4-200-38174"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
@@ -135,7 +136,7 @@ components:
   # Values for lens
   lens:
     registry: ""
-    image: "lens:880420ac-333-36029"
+    image: "lens:6b408df4-333-38167"
     imagePullPolicy: IfNotPresent
     configs:
       GIT_SENSOR_PROTOCOL: GRPC
@@ -170,7 +171,7 @@ components:
     entMigratorImage: "devtron-utils:geni-v1.1.4"
   chartSync:
     registry: ""
-    image: chart-sync:880420ac-836-36037
+    image: chart-sync:6b408df4-836-38155
     schedule: "0 19 * * *"
     podSecurityContext:
       fsGroup: 1001
@@ -208,7 +209,7 @@ workflowController:
   IMDSv1ExecutorImage: "argoexec:v3.0.7"
 security:
   imageScanner:
-    image: "image-scanner:f21e02cb-141-34534"
+    image: "image-scanner:6b408df4-141-38158"
     healthPort: 8080
     configs:
       TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db
@@ -219,7 +220,7 @@ security:
       tag: 4.3.6
 # Values for notifier integration
 notifier:
-  image: "notifier:00f17215-372-36041"
+  image: "notifier:5c4b5b3a-372-38153"
   healthPort: 3000
 minio:
   image: "minio:RELEASE.2021-02-14T04-01-33Z"
@@ -241,6 +242,15 @@ monitoring:
       imagePullPolicy: IfNotPresent
 devtronEnterprise:
   enabled: false
+  finops:
+    enabled: false
+    costSync:
+      image: "cost-sync:46ed7c67-1159-38183"
+      schedule: "0 * * * *"
+      timeZone: UTC
+    timescale:
+      image: "timescaledb-ha:pg18"
+      volumeSize: 5Gi
   casbin:
     registry: ""
     image: "casbin:f6ff5f74-064b67e5-462-30822"

charts/devtron/templates/NOTES.txt

@@ -2,7 +2,7 @@
     {{- $liveCm := lookup "v1" "ConfigMap" "devtroncd" "devtron-custom-cm" }}
     {{- $currentValue := pluck "POSTGRES_MIGRATED" $liveCm.data | first | default "" }}
     {{- if ne $currentValue "14" }}
-      {{- fail "Upgrade Failed Please ensure that you have completed the pre-requisites mentioned in https://docs.devtron.ai/upgrade/devtron-upgrade-1.5.0" }}
+      {{- fail "Upgrade Failed Please ensure that you have completed the pre-requisites mentioned in https://docs.devtron.ai/docs/devtron/v1.7/setup/upgrade/devtron-upgrade-1.5.0" }}
     {{- end }}
 {{- end }}
 

charts/devtron/templates/_helpers.tpl

@@ -115,4 +115,4 @@ securityContext:
 securityContext:
 {{ toYaml .global.containerSecurityContext | indent 2 }}
   {{- end }}
-{{- end }}
+{{- end }}

charts/devtron/templates/configmap-secret.yaml

@@ -8,6 +8,8 @@
 {{- $DEX_CSTOREKEY := include "getOrGeneratePass" (dict "Namespace" "devtroncd" "Kind" "Secret" "Name" "devtron-secret" "Key" "DEX_CSTOREKEY") }}
 {{- $postgresPwd := include "getOrGeneratePass" (dict "Namespace" "devtroncd" "Kind" "Secret" "Name" "postgresql-postgresql" "Key" "postgresql-password") }}
 {{- $WEBHOOK_TOKEN := include "getOrGeneratePass" (dict "Namespace" "devtroncd" "Kind" "Secret" "Name" "devtron-secret" "Key" "WEBHOOK_TOKEN") }}
+{{- $TIMESCALE_PASSWORD := include "getOrGeneratePass" (dict "Namespace" "devtroncd" "Kind" "Secret" "Name" "timescaledb-cluster-pg15-superuser" "Key" "password") }}
+
 {{- if $.Values.installer.modules }}
 {{- if has "cicd" $.Values.installer.modules }}
 apiVersion: v1
@@ -230,8 +232,13 @@ kind: Secret
 data:
 {{- if and $.Values.global.externalPostgres $.Values.global.externalPostgres.enabled }}
   DB_PASSWORD: {{ $.Values.global.externalPostgres.PG_PASSWORD | b64enc }}
+  PG_PASSWORD: {{ $.Values.global.externalPostgres.PG_PASSWORD | b64enc }}
 {{- else }}
   DB_PASSWORD: {{ $postgresPwd }}
+  PG_PASSWORD: {{ $postgresPwd }}
+{{- end }}
+{{- if $.Values.devtronEnterprise.finops.enabled }}
+  TIMESCALE_PASSWORD: {{ $TIMESCALE_PASSWORD }}
 {{- end }}
 metadata:
   name: postgresql-migrator
@@ -240,7 +247,7 @@ metadata:
     chart: postgresql-8.6.4
     release: "devtron"
   annotations:
-    "helm.sh/hook": pre-install
+    "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "-4"
     "helm.sh/resource-policy": keep
 type: Opaque
@@ -282,6 +289,9 @@ metadata:
     "helm.sh/hook": pre-install, pre-upgrade
 data:
   ORCH_TOKEN: {{ $ORCH_TOKEN }}
+  {{- if .Values.devtronEnterprise.finops.enabled}}
+  TIMESCALE_PASSWORD: {{ $TIMESCALE_PASSWORD }}
+  {{- end}}
   {{- if $.Values.installer.modules }}
   {{- if has "cicd" $.Values.installer.modules }}
   {{- if and ($.Values.minio.enabled) (not $.Values.configs.BLOB_STORAGE_PROVIDER) }}
@@ -402,4 +412,38 @@ metadata:
   annotations:
     "helm.sh/hook": pre-install
 {{- end }}
+{{- if $.Values.devtronEnterprise.finops.enabled }}    
+---
+apiVersion: v1
+kind: Secret
+data:
+  POSTGRES_USER: {{ "postgres" | b64enc  }}
+  POSTGRES_PASSWORD: {{ $TIMESCALE_PASSWORD }}
+  POSTGRES_DB: {{ "finops" | b64enc  }} 
+metadata:
+  name: timescaledb-secret
+  namespace: devtroncd
+type: Opaque 
+---
+apiVersion: v1
+data:
+  JOB_INTERVAL_MINUTES: "60"
+  LOG_LEVEL: info
+  MAX_INTERVALS_PER_RUN: "6"
+  PG_ADDR: {{ $.Values.global.dbConfig.PG_ADDR }}
+  PG_DATABASE: {{ $.Values.global.dbConfig.PG_DATABASE }}
+  PG_USER: {{ $.Values.global.dbConfig.PG_USER }}
+  PROMETHEUS_DELAY_MINUTES: "5"
+  TIMESCALE_ADDR:  timescaledb-service.devtroncd
+  TIMESCALE_DATABASE: finops
+  TIMESCALE_HOST:  timescaledb-service.devtroncd
+  TIMESCALE_NAME: finops
+  TIMESCALE_PORT: "5432"
+  TIMESCALE_SSL_MODE: disable
+  TIMESCALE_USER: postgres
+kind: ConfigMap
+metadata:
+  name: cost-sync-cm
+  namespace: devtroncd  
+{{- end }}
 {{- end }}

charts/devtron/templates/cost-sync-job.yaml

@@ -0,0 +1,48 @@
+{{- if and $.Values.devtronEnterprise.enabled  $.Values.devtronEnterprise.finops.enabled }}
+{{- if $.Capabilities.APIVersions.Has "batch/v1/Job" }}
+apiVersion: batch/v1
+{{- else }}
+apiVersion: batch/v1beta1
+{{- end }}
+kind: CronJob
+metadata:
+  name: cost-sync-job
+  namespace: devtroncd
+spec:
+  concurrencyPolicy: Allow
+  failedJobsHistoryLimit: 1
+  jobTemplate:
+    spec:
+      activeDeadlineSeconds: 3600
+      template:
+        metadata:
+          labels:
+            app: cost-sync-job
+        spec:
+          serviceAccountName: devtron-default-sa
+          {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.devtronEnterprise.finops.nodeSelector "tolerations" $.Values.devtronEnterprise.finops.tolerations "imagePullSecrets" $.Values.devtronEnterprise.finops.imagePullSecrets "global" $.Values.global) | indent 10 }}
+          {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.devtronEnterprise.finops.podSecurityContext "global" $.Values.global) | indent 10 }}         
+          restartPolicy: OnFailure
+          containers:
+            - envFrom:
+                - configMapRef: 
+                    name: cost-sync-cm
+                - secretRef:
+                    name: postgresql-migrator
+                - configMapRef: 
+                    name: devtron-common-cm
+              image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.finops.costSync "global" $.Values.global ) }}
+              imagePullPolicy: IfNotPresent
+              name: cost-sync-job
+              ports:
+                - containerPort: 8080
+                  name: app
+                  protocol: TCP
+              resources: {}
+          terminationGracePeriodSeconds: 30
+  schedule: {{ $.Values.devtronEnterprise.finops.costSync.schedule | quote }}
+  startingDeadlineSeconds: 100
+  successfulJobsHistoryLimit: 3
+  suspend: false
+  timeZone: {{ $.Values.devtronEnterprise.finops.costSync.timeZone }}
+{{- end }}

charts/devtron/templates/dashboard.yaml

@@ -20,6 +20,9 @@ metadata:
 data:
 {{- if $.Values.devtronEnterprise.enabled }}
   GATEKEEPER_URL: "https://license.devtron.ai/dashboard"
+  FEATURE_STORAGE_ENABLE: "true"
+  FEATURE_RESOURCE_WATCHER_ENABLE: "true"
+  FEATURE_SOFTWARE_DISTRIBUTION_HUB_ENABLE: "true"
 {{- end }}
 {{- if .config }}
   GA_ENABLED: {{ .config.analytics | default "false" | quote }}

charts/devtron/templates/devtron-scc.yaml

@@ -37,4 +37,4 @@ users:
 volumes:
 - '*'
 {{- end }}
-{{- end }}
+{{- end }}

charts/devtron/templates/devtron.yaml

@@ -25,6 +25,9 @@ data:
   SCOOP_CLUSTER_CONFIG: '{"1":{"serviceName":"scoop-service","passKey":"qhihdidhwid","namespace":"devtroncd","port":"80"}}'
   {{- end }}
   {{- if $.Values.devtronEnterprise.enabled }}
+  TIMESCALE_ADDR: timescaledb-service.devtroncd
+  TIMESCALE_DATABASE: finops
+  TIMESCALE_USER: postgres
   CASBIN_CLIENT_URL: casbin-service.devtroncd:9000
   CD_WORKFLOW_EXECUTOR_TYPE: SYSTEM
   CI_WORKFLOW_EXECUTOR_TYPE: SYSTEM