feat: added Finops module yamls

charts/devtron/Chart.yaml

@@ -15,6 +15,10 @@ version: 0.22.98
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:
+- name: cloudnative-pg
+  version: 0.26.0
+  repository: https://cloudnative-pg.io/charts
+  condition: devtronEnterprise.finops.enabled
 - name: argo-cd
   version: "7.7.15"
   repository: https://argoproj.github.io/argo-helm

charts/devtron/devtron-bom.yaml

@@ -241,6 +241,14 @@ monitoring:
       imagePullPolicy: IfNotPresent
 devtronEnterprise:
   enabled: false
+  finops:
+    enabled: false
+    costSync:
+      image: ""
+      schedule: "* 2 * * *"
+      timeZone: UTC
+    timescale:
+      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
@@ -268,6 +270,7 @@ data:
   DEX_SECRET: {{ $DEX_SECRET }}
   DEX_JWTKEY: {{ $DEX_JWTKEY }}
   DEX_CSTOREKEY: {{ $DEX_CSTOREKEY }}
+  TIMESCALE_PASSWORD: {{ $TIMESCALE_PASSWORD }}
 {{- end }}
 {{- end }}
 type: Opaque
@@ -401,5 +404,39 @@ metadata:
   namespace: devtroncd
   annotations:
     "helm.sh/hook": pre-install
+
+---
+{{- if .Values.devtronEnterprise.finops.enabled}}
+apiVersion: v1
+kind: Secret
+data:
+  username: {{ "postgres" | b64enc  }}
+  password: {{ $TIMESCALE_PASSWORD }} 
+metadata:
+  name: timescaledb-cluster-pg15-superuser
+  namespace: devtroncd
+type: kubernetes.io/basic-auth 
+---
+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-cluster-pg15-rw.devtroncd
+  TIMESCALE_DATABASE: finops
+  TIMESCALE_HOST: timescaledb-cluster-pg15-rw.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 }}
 {{- end }}

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

@@ -0,0 +1,48 @@
+{{- if .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:
+      serviceAccountName: devtron-default-sa
+      activeDeadlineSeconds: 3600
+      template:
+        metadata:
+          labels:
+            app: cost-sync-job
+        spec:
+          {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.devtronEnterprise.finops.nodeSelector "tolerations" $.Values.devtronEnterprise.finops.tolerations "imagePullSecrets" $.Values.devtronEnterprise.finops.imagePullSecrets "global" $.Values.global) | indent 4 }}
+          {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.devtronEnterprise.finops.podSecurityContext "global" $.Values.global) | indent 10 }}         
+          restartPolicy: OnFailure
+          containers:
+            - envFrom:
+                - configMapRef: 
+                    name: devtron-common-cm
+                - configMapRef: 
+                    name: cost-sync-cm
+                - secretRef:
+                    name: devtron-secret
+              image: {{ $.Values.devtronEnterprise.finops.costSync.image }}
+              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

@@ -22,6 +22,9 @@ data:
   GATEKEEPER_URL: "https://license.devtron.ai/dashboard"
 {{- end }}
 {{- if .config }}
+  FEATURE_STORAGE_ENABLE: "true"
+  FEATURE_RESOURCE_WATCHER_ENABLE: "true"
+  FEATURE_SOFTWARE_DISTRIBUTION_HUB_ENABLE: "true"
   GA_ENABLED: {{ .config.analytics | default "false" | quote }}
   HOTJAR_ENABLED: {{ .config.hotjar | default "false" | quote }}
   SENTRY_ENABLED: {{ .config.sentry | default "false" | quote }}

charts/devtron/templates/devtron-scc.yaml

@@ -34,7 +34,11 @@ users:
 - system:serviceaccount:devtron-cd:cd-runner
 - system:serviceaccount:devtroncd:chart-sync
 - system:serviceaccount:devtroncd:devtron-default-sa
+- system:serviceaccount:devtroncd:devtron-cloudnative-pg
+- system:serviceaccount:devtroncd:timescaledb-cluster-pg15
 volumes:
 - '*'
 {{- end }}
 {{- end }}
+
+

charts/devtron/templates/devtron.yaml

@@ -10,6 +10,9 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 data:
+  TIMESCALE_ADDR: timescaledb-cluster-pg15-r.devtroncd
+  TIMESCALE_DATABASE: finops
+  TIMESCALE_USER: postgres
   DEVTRON_HELM_RELEASE_NAME: {{ $.Release.Name }}
   DEVTRON_HELM_RELEASE_NAMESPACE: {{ $.Release.Namespace }}
   FEATURE_MIGRATE_ARGOCD_APPLICATION_ENABLE: "true"

charts/devtron/templates/timescale-db.yaml

@@ -0,0 +1,66 @@
+{{- if .Values.devtronEnterprise.finops.enabled }}
+apiVersion: postgresql.cnpg.io/v1
+kind: ImageCatalog
+metadata:
+  name: cloudnative-pg-timescaledb-pg15
+  namespace: devtroncd
+spec:
+  images:
+    - image: timescale/timescaledb-ha:pg15-ts2.18-all
+      major: 15
+---      
+apiVersion: v1
+data:
+  init-schema.sql: |
+    CREATE EXTENSION IF NOT EXISTS timescaledb;
+kind: ConfigMap
+metadata:
+  name: init-schema
+  namespace: devtroncd
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: Cluster
+metadata:
+  name: timescaledb-cluster-pg15
+  namespace: devtroncd
+  labels:
+    app: timescale-db
+spec:
+  affinity:
+  {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.devtronEnterprise.finops.nodeSelector "tolerations" $.Values.devtronEnterprise.finops.tolerations "imagePullSecrets" $.Values.devtronEnterprise.finops.imagePullSecrets "global" $.Values.global) | indent 4 }}
+  bootstrap:
+    initdb:
+      database: finops
+      owner: postgres
+      postInitApplicationSQLRefs:
+        configMapRefs:
+          - key: init-schema.sql
+            name: init-schema
+      secret:
+        name: timescaledb-cluster-pg15-superuser
+  enableSuperuserAccess: true
+  imageCatalogRef:
+    apiGroup: postgresql.cnpg.io
+    kind: ImageCatalog
+    major: 15
+    name: cloudnative-pg-timescaledb-pg15
+  instances: 1
+  postgresGID: 1000
+  postgresUID: 1000
+  postgresql:
+    parameters:
+      max_wal_senders: "3"
+      max_wal_size: 1GB
+      wal_level: replica
+    pg_hba:
+      - host all all all scram-sha-256
+    shared_preload_libraries:
+      - timescaledb
+  {{- if $.Values.devtronEnterprise.finops.timescale.resources }}
+  resources:
+  {{- toYaml $.Values.devtronEnterprise.finops.timescale.resources | nindent 4 }}
+  {{- end }}
+  storage:
+    size: {{ $.Values.devtronEnterprise.finops.timescale.volumeSize }}
+    storageClass: {{ $.Values.global.storageClass }}
+{{- end }}

charts/devtron/values.yaml

@@ -30,9 +30,9 @@ global:
   #     effect: "NoSchedule"
   # imagePullSecrets:
   #   - name: your-image-pull-secret
-  nodeSelector: {}
-  tolerations: []
-  imagePullSecrets: []
+  # nodeSelector: {}
+  # tolerations: []
+  # imagePullSecrets: []
   # Set the storage class to be used for PVCs (would use default sc if not specified)
   storageClass: ""
   # Add Proxy Configs to be propagated to all the Devtron Microservices.
@@ -178,6 +178,7 @@ components:
     imagePullPolicy: IfNotPresent
     healthPort: 8080
     configs:
+      VELERO_INFORMER: "false"
       devtroncd_NAMESPACE: "devtron-ci"
       USE_CUSTOM_HTTP_TRANSPORT: "true"
       CLUSTER_ARGO_CD_TYPE: "ALL_CLUSTER"
@@ -479,9 +480,18 @@ monitoring:
       resources: {}
     persistence:
       storage: "2Gi"
+
 # Change these values for Devtron-Enterprise 
 devtronEnterprise:
   enabled: false
+  finops:
+    enabled: false
+    costSync:
+      image: ""
+      schedule: "* 2 * * *"
+      timeZone: UTC
+    timescale:
+      volumeSize: 5Gi
   casbin:
     registry: ""
     image: "casbin:f6ff5f74-064b67e5-462-30822"