Merge pull request #6542 from devtron-labs/main-sync-develop-28apr

sync: Main sync develop

Author: vikramdevtron

CHANGELOG/release-notes-v1.5.0.md

@@ -0,0 +1,19 @@
+## v1.5.0
+
+## Enhancements
+- feat: Config Approval bypass v1 (for cm, cs and deployment template) (#6493)
+- feat: Licensing changes (#6474)
+## Bugs
+- fix: Added support for IAM role S3 blob client (#6521)
+- fix: Making tx independent of git sensor call (#6519)
+- fix: Sql query memory issue (#6516)
+- fix: Grafana data-source get API (#6503)
+- fix: Made triggeredBy for CI & CD uniform (#6489)
+- fix: HPA permission denied error (#6485)
+- fix: Force abort for pre/post cd  (#6475)
+- fix: Optimisation in workflow status api (#6473)
+- fix: Let user delete the container reg if the ref app was deleted (#6464)
+## Others
+- misc: Update the descriptions of env variables (#6499)
+- misc: Patch api for user attribute (#6490)
+- chore: Nil implementations fixed for user attribute in telemetry (#6497)

charts/devtron/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 1.4.0
+appVersion: 1.5.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.88
+version: 0.22.90
 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: "v1.4.0"
+  release: "v1.5.0"
   registry: ""
   image: "inception"
   tag: "473deaa4-185-21582"
@@ -33,14 +33,15 @@ components:
         FEATURE_STEP_WISE_LOGS_ENABLE: "true"
         FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true"
         ENABLE_RESOURCE_SCAN: "true"
-        FEATURE_CODE_MIRROR_ENABLE: "false"
+        FEATURE_CODE_MIRROR_ENABLE: "true"
     registry: ""
-    image: "dashboard:a400ce3c-690-31030"
+    image: "dashboard:0fc42ac3-690-32105"
     imagePullPolicy: IfNotPresent
+    healthPort: 8080
   devtron:
     registry: ""
-    image: "hyperion:846c2d90-280-31082"
-    cicdImage: "devtron:846c2d90-434-31081"
+    image: "hyperion:e2daf69a-280-32104"
+    cicdImage: "devtron:e2daf69a-434-32096"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     podSecurityContext:
@@ -51,9 +52,10 @@ components:
       allowPrivilegeEscalation: false
       runAsNonRoot: true
       runAsUser: 1001
+    healthPort: 8080
   ciRunner:
     registry: ""
-    image: "ci-runner:d79b15c6-138-31014"
+    image: "ci-runner:c49b4aa5-138-32101"
   argocdDexServer:
     registry: ""
     image: "dex:v2.30.2"
@@ -62,7 +64,7 @@ components:
       authenticator: "authenticator:e414faff-393-13273"
   kubelink:
     registry: ""
-    image: "kubelink:ccd98a22-564-31008"
+    image: "kubelink:c49b4aa5-564-32098"
     imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
@@ -86,10 +88,12 @@ components:
       allowPrivilegeEscalation: false
       runAsNonRoot: true
       runAsUser: 1001
+    healthPort: 50052
   kubewatch:
     registry: ""
-    image: "kubewatch:34abb17d-419-31007"
+    image: "kubewatch:c49b4aa5-419-32097"
     imagePullPolicy: IfNotPresent
+    healthPort: 8080
     configs:
       devtroncd_NAMESPACE: "devtron-ci"
       USE_CUSTOM_HTTP_TRANSPORT: "true"
@@ -108,16 +112,14 @@ components:
       keyName: postgresql-password
   postgres:
     registry: ""
-    image: "postgres:11.9.0-debian-10-r26"
-    armImage: "postgres:11.9"
+    image: "postgres:14.9"
     initImage: "minideb:latest"
     imagePullPolicy: "IfNotPresent"
     metrics:
-      image: postgres_exporter:v0.4.7
-      armImage: postgres_exporter:v0.10.1
+      image: postgres_exporter:v0.10.1
   gitsensor:
     registry: ""
-    image: "git-sensor:2b4b8363-200-31009"
+    image: "git-sensor:c49b4aa5-200-32099"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
@@ -132,10 +134,11 @@ components:
     dbconfig:
       secretName: postgresql-postgresql
       keyName: postgresql-password
+    healthPort: 8080
   # Values for lens
   lens:
     registry: ""
-    image: "lens:34abb17d-333-31011"
+    image: "lens:c49b4aa5-333-32100"
     imagePullPolicy: IfNotPresent
     configs:
       GIT_SENSOR_PROTOCOL: GRPC
@@ -148,6 +151,7 @@ components:
     dbconfig:
       secretName: postgresql-postgresql
       keyName: postgresql-password
+    healthPort: 8080
   # Change below values for nats
   nats:
     registry: ""
@@ -181,7 +185,7 @@ components:
         DB_NAME: "lens"
   chartSync:
     registry: ""
-    image: chart-sync:34abb17d-836-31017
+    image: chart-sync:c49b4aa5-836-32103
     schedule: "0 19 * * *"
     podSecurityContext:
       fsGroup: 1001
@@ -211,7 +215,8 @@ workflowController:
   IMDSv1ExecutorImage: "argoexec:v3.0.7"
 security:
   imageScanner:
-    image: "image-scanner:34abb17d-141-31016"
+    image: "image-scanner:c49b4aa5-141-32102"
+    healthPort: 8080
     configs:
       TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db
       TRIVY_JAVA_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-java-db
@@ -221,7 +226,8 @@ security:
       tag: 4.3.6
 # Values for notifier integration
 notifier:
-  image: "notifier:c2173311-372-31015"
+  image: "notifier:56798239-372-32072"
+  healthPort: 3000
 minio:
   image: "minio:RELEASE.2021-02-14T04-01-33Z"
   mbImage: "minio-mc:RELEASE.2021-02-14T04-28-06Z"
@@ -263,6 +269,7 @@ devtronEnterprise:
       allowPrivilegeEscalation: false
       runAsNonRoot: true
       runAsUser: 1001
+    healthPort: 8080
   scoop:
     enabled: false
     registry: ""

charts/devtron/templates/NOTES.txt

@@ -1,3 +1,11 @@
+{{- if .Release.IsUpgrade }}
+    {{- $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" }}
+    {{- end }}
+{{- end }}
+
 Please wait for ~1 minute before running any of the following commands.
 
 1. Run the following command to get the password for the default admin user:

charts/devtron/templates/argocd-secret.yaml

@@ -1,3 +1,4 @@
+{{- $customOverrides :=  index $.Values.components.devtron.customOverrides }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -22,6 +23,7 @@ metadata:
 data:
   timeout.hard.reconciliation: "0"
   timeout.reconciliation: 60s
+  {{- if ne $customOverrides.IS_AIR_GAP_ENVIRONMENT "true" }}
   repositories: |-
     - name: devtron
       type: helm
@@ -56,6 +58,7 @@ data:
     - name: kedacore
       type: helm
       url:  https://kedacore.github.io/charts
+  {{- end }}
   resource.customizations: >
     kubernetes-client.io/ExternalSecret:
       health.lua: |

charts/devtron/templates/casbin.yaml

@@ -55,7 +55,7 @@ spec:
             failureThreshold: 3
             httpGet:
               path: /health
-              port: 8080
+              port: {{ $.Values.devtronEnterprise.casbin.healthPort}}
             initialDelaySeconds: 20
             periodSeconds: 10
             successThreshold: 1
@@ -64,7 +64,7 @@ spec:
             failureThreshold: 3
             httpGet:
               path: /health
-              port: 8080
+              port: {{ $.Values.devtronEnterprise.casbin.healthPort}}
             initialDelaySeconds: 20
             periodSeconds: 10
             successThreshold: 1

charts/devtron/templates/dashboard.yaml

@@ -90,6 +90,26 @@ spec:
           securityContext:
 {{- toYaml $.Values.global.containerSecurityContext | nindent 12 }}
           {{- end }}
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /
+              port: {{ $.Values.components.dashboard.healthPort}}
+              scheme: HTTP
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /
+              port: {{ $.Values.components.dashboard.healthPort}}
+              scheme: HTTP
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
           ports:
             - name: app
               containerPort: 8080

charts/devtron/templates/devtron.yaml

@@ -34,6 +34,7 @@ data:
   CI_WORKFLOW_EXECUTOR_TYPE: SYSTEM
   DEVTRON_INSTALLATION_TYPE: enterprise
   DEVTRON_VERSION_IDENTIFIER_IN_HELM_VALUES: "devtron.installer.release"
+  DEVTRON_MANAGED_LICENSING_ENABLED: "false"
   DEVTRON_BOM_URL: https://raw.githubusercontent.com/devtron-labs/charts/refs/tags/devtron-enterprise-%s/charts/devtron-enterprise/devtron-bom.yaml
   {{- end }}
 {{- if $.Values.installer.modules }}
@@ -206,6 +207,7 @@ data:
       {{- $modules = append $modules "argo-cd" }}
     {{- end }}
   {{- end }}
+  POSTGRES_MIGRATED: "14"
   INSTALLED_MODULES: {{ if $modules }}{{ printf "'%s'" (join "," $modules) }}{{ else }}""{{ end }}
   DEFAULT_CI_IMAGE: {{ include "common.image" (dict "component" $.Values.components.ciRunner "global" $.Values.global ) }}
 ---
@@ -278,6 +280,26 @@ spec:
                   - -c
                   - ' curl -X POST -H "Content-Type: application/json" -d ''{"eventType":
                   "SIG_TERM"}'' localhost:8080/orchestrator/telemetry/summary'
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /health
+              port: {{ $.Values.components.devtron.healthPort}}
+              scheme: HTTP
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /health
+              port: {{ $.Values.components.devtron.healthPort}}
+              scheme: HTTP
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
           ports:
             - name: devtron
               containerPort: 8080

charts/devtron/templates/gitsensor.yaml

@@ -112,6 +112,26 @@ spec:
           volumeMounts:
             - name: git-volume
               mountPath: /git-base/
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /health
+              port: {{ $.Values.components.gitsensor.healthPort}}
+              scheme: HTTP
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /health
+              port: {{ $.Values.components.gitsensor.healthPort}}
+              scheme: HTTP
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
           env:
             - name: DEVTRON_APP_NAME
               value: git-sensor

charts/devtron/templates/kubelink.yaml

@@ -85,6 +85,26 @@ spec:
                   name: {{ .dbconfig.secretName }}
                   key: {{ .dbconfig.keyName }}
             {{- end }}
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /health
+              port: {{ $.Values.components.kubelink.healthPort}}
+              scheme: HTTP
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /health
+              port: {{ $.Values.components.kubelink.healthPort}}
+              scheme: HTTP
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
           envFrom:
           - configMapRef:
               name: kubelink-cm