Merge pull request #250 from devtron-labs/sync-2024-11-06-163535-37eec3c

Sync changes from sync-2024-11-06-163535-37eec3c

charts/devtron/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 0.7.3
+appVersion: 0.7.4
 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.75
+version: 0.22.76
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:

charts/devtron/devtron-bom.yaml

@@ -10,7 +10,7 @@ global:
   containerRegistry: "quay.io/devtron"
 extraManifests: []
 installer:
-  release: "v0.7.3"
+  release: "v0.7.4"
   registry: ""
   image: "inception"
   tag: "473deaa4-185-21582"
@@ -34,12 +34,12 @@ components:
         FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true"
         ENABLE_RESOURCE_SCAN: "true"
     registry: ""
-    image: "dashboard:215319c7-690-25536"
+    image: "dashboard:5be7fbeb-690-26830"
     imagePullPolicy: IfNotPresent
   devtron:
     registry: ""
-    image: "hyperion:e17c52eb-280-25812"
-    cicdImage: "devtron:e17c52eb-434-25813"
+    image: "hyperion:4288e910-280-26829"
+    cicdImage: "devtron:4288e910-434-26828"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
   ciRunner:
@@ -53,7 +53,7 @@ components:
       authenticator: "authenticator:e414faff-393-13273"
   kubelink:
     registry: ""
-    image: "kubelink:6ef0fbbe-564-25533"
+    image: "kubelink:73ce53e5-564-26855"
     imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
@@ -71,7 +71,7 @@ components:
       keyName: postgresql-password
   kubewatch:
     registry: ""
-    image: "kubewatch:7c8611f4-419-25531"
+    image: "kubewatch:b4888f54-419-26859"
     imagePullPolicy: IfNotPresent
     configs:
       devtroncd_NAMESPACE: "devtron-ci"
@@ -91,7 +91,7 @@ components:
       armImage: postgres_exporter:v0.10.1
   gitsensor:
     registry: ""
-    image: "git-sensor:5b9cf0ec-200-25481"
+    image: "git-sensor:73ce53e5-200-26860"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
@@ -109,7 +109,7 @@ components:
   # Values for lens
   lens:
     registry: ""
-    image: "lens:9db8a2fb-333-25482"
+    image: "lens:b4888f54-333-26837"
     imagePullPolicy: IfNotPresent
     configs:
       GIT_SENSOR_PROTOCOL: GRPC
@@ -154,7 +154,9 @@ components:
         DB_NAME: "lens"
   chartSync:
     registry: ""
-    image: chart-sync:13ffae06-150-25515
+    image: chart-sync:73ce53e5-836-26871
+    schedule: "0 19 * * *"
+    extraConfigs: {}
 # values for argocd integration
 argo-cd:
   global:
@@ -174,14 +176,14 @@ workflowController:
   IMDSv1ExecutorImage: "argoexec:v3.0.7"
 security:
   imageScanner:
-    image: "image-scanner:348201f8-141-25486"
+    image: "image-scanner:d5458e1a-141-26846"
   clair:
     image:
       repository: clair
       tag: 4.3.6
 # Values for notifier integration
 notifier:
-  image: "notifier:06392394-372-25535"
+  image: "notifier:133c887d-372-26845"
 minio:
   image: "minio:RELEASE.2021-02-14T04-01-33Z"
   mbImage: "minio-mc:RELEASE.2021-02-14T04-28-06Z"

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

@@ -70,11 +70,12 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 spec:
-  schedule: "0 19 * * *"
+  schedule: {{ $.Values.components.chartSync.schedule | quote }}
   jobTemplate:
     spec:
       template:
         spec:
+          activeDeadlineSeconds: 15000
           serviceAccountName: chart-sync
           {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.components.chartSync.nodeSelector "tolerations" $.Values.components.chartSync.tolerations "imagePullSecrets" $.Values.components.chartSync.imagePullSecrets "global" $.Values.global) | indent 10 }}
           {{- if and $.Values.global $.Values.global.podSecurityContext }}
@@ -98,6 +99,8 @@ spec:
             envFrom:
             - secretRef:
                 name: devtron-secret
+            - configMapRef: 
+                name: app-sync-cm
             {{- if .Values.components.migrator }}
             {{- if .Values.components.migrator.appSync }}
             {{- if .Values.components.migrator.appSync.resources }}
@@ -108,3 +111,16 @@ spec:
             {{- end }}
           restartPolicy: Never
       backoffLimit: 4
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: app-sync-cm
+  labels:
+    app: app-sync-cronjob
+    release: devtron
+data:
+{{- if $.Values.components.chartSync.extraConfigs }}
+{{ toYaml $.Values.components.chartSync.extraConfigs | indent 2 }}
+{{- end }}
+---

charts/devtron/templates/devtron.yaml

@@ -122,6 +122,7 @@ data:
   FEATURE_RESTART_WORKLOAD_WORKER_POOL_SIZE: "5"
   USE_GIT_CLI: "false"
   PROPAGATE_EXTRA_LABELS: "false"
+  USE_DEPLOYMENT_CONFIG_DATA: "false"
 {{- if $.Values.configs }}
 {{- if or ($.Values.minio.enabled) ($.Values.configs.BLOB_STORAGE_PROVIDER) }}
   BLOB_STORAGE_ENABLED: "true"

charts/devtron/templates/grafana.yaml

@@ -12,7 +12,7 @@ kind: Job
 metadata:
   name: grafana-org-job
 spec:
-  ttlSecondsAfterFinished: 100
+  ttlSecondsAfterFinished: 1000
   template:
     spec:
       {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.monitoring.grafana.nodeSelector "tolerations" $.Values.monitoring.grafana.tolerations "imagePullSecrets" $.Values.monitoring.grafana.imagePullSecrets "global" $.Values.global) | indent 6 }}

charts/devtron/templates/migrator.yaml

@@ -373,15 +373,19 @@ spec:
 
 {{- end }}
 ---
+{{- if $.Capabilities.APIVersions.Has "batch/v1/Job" }}
 apiVersion: batch/v1
+{{- else }}
+apiVersion: batch/v1beta1
+{{- end }}
 #this job is added for creating new database(clairv4).
 #This database is needed for clair upgrade (v2 to v4), since old database does not support migration for new clair.
 #Without this job, database can be created for new users, but not for existing users.
 kind: Job
 metadata:
   name: postgresql-miscellaneous
 spec:
-  ttlSecondsAfterFinished: 100
+  ttlSecondsAfterFinished: 1000
   template:
     spec:
       {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.components.migrator.nodeSelector "tolerations" $.Values.components.migrator.tolerations "imagePullSecrets" $.Values.components.migrator.imagePullSecrets "global" $.Values.global) | indent 6 }}

charts/devtron/templates/minio.yaml

@@ -322,7 +322,7 @@ metadata:
     release: {{ $.Release.Name }}
     heritage: Helm
 spec:
-  ttlSecondsAfterFinished: 100
+  ttlSecondsAfterFinished: 1000
   template:
     metadata:
       labels:

charts/devtron/values.yaml

@@ -24,7 +24,7 @@ global:
 extraManifests: []
 installer:
   repo: "devtron-labs/devtron"
-  release: "v0.7.3"
+  release: "v0.7.4"
   registry: ""
   image: inception
   tag: 473deaa4-185-21582
@@ -77,12 +77,12 @@ components:
         FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true"
         ENABLE_RESOURCE_SCAN: "true"
     registry: ""
-    image: "dashboard:215319c7-690-25536"
+    image: "dashboard:5be7fbeb-690-26830"
     imagePullPolicy: IfNotPresent
   devtron:
     registry: ""
-    image: "hyperion:e17c52eb-280-25812"
-    cicdImage: "devtron:e17c52eb-434-25813"
+    image: "hyperion:4288e910-280-26829"
+    cicdImage: "devtron:4288e910-434-26828"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     serviceMonitor:
@@ -117,7 +117,7 @@ components:
       authenticator: "authenticator:e414faff-393-13273"
   kubelink:
     registry: ""
-    image: "kubelink:6ef0fbbe-564-25533"
+    image: "kubelink:73ce53e5-564-26855"
     imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
@@ -135,7 +135,7 @@ components:
       keyName: postgresql-password
   kubewatch:
     registry: ""
-    image: "kubewatch:7c8611f4-419-25531"
+    image: "kubewatch:b4888f54-419-26859"
     imagePullPolicy: IfNotPresent
     configs:
       devtroncd_NAMESPACE: "devtron-ci"
@@ -157,7 +157,7 @@ components:
       volumeSize: "20Gi"
   gitsensor:
     registry: ""
-    image: "git-sensor:5b9cf0ec-200-25481"
+    image: "git-sensor:73ce53e5-200-26860"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
@@ -175,7 +175,7 @@ components:
   # Values for lens
   lens:
     registry: ""
-    image: "lens:9db8a2fb-333-25482"
+    image: "lens:b4888f54-333-26837"
     imagePullPolicy: IfNotPresent
     secrets: {}
     resources: {}
@@ -222,7 +222,9 @@ components:
         DB_NAME: "lens"
   chartSync:
     registry: ""
-    image: chart-sync:13ffae06-150-25515
+    image: chart-sync:73ce53e5-836-26871
+    schedule: "0 19 * * *"
+    extraConfigs: {}
 # values for argocd integration
 argo-cd:
   enabled: false
@@ -245,10 +247,6 @@ argo-cd:
       statusProcessors: "50"
       # -- define the application controller `--operation-processors`
       operationProcessors: "25"
-      # -- define the application controller `--app-hard-resync`
-      appHardResyncPeriod: "0"
-      # -- define the application controller `--app-resync`
-      appResyncPeriod: "180"
       # -- define the application controller `--self-heal-timeout-seconds`
       selfHealTimeout: "5"
       # -- define the application controller `--repo-server-timeout-seconds`
@@ -370,7 +368,7 @@ argo-cd:
 security:
   enabled: false
   imageScanner:
-    image: "image-scanner:348201f8-141-25486"
+    image: "image-scanner:d5458e1a-141-26846"
   # Values for trivy
   trivy:
     enabled: false
@@ -385,7 +383,7 @@ security:
 notifier:
   enabled: false
   imagePullPolicy: IfNotPresent
-  image: "notifier:06392394-372-25535"
+  image: "notifier:133c887d-372-26845"
   configs:
     CD_ENVIRONMENT: PROD
     DB: orchestrator