[enhancement] Ability to start using devtron with devtron2.0 first in any mode (#1735)

* Updated chart version

* Updated values.yaml

* Added supported for cicd module image

* Changes for modules and devtron2.0 upgrades

* Updated new changes

* Allowed common installation for all cases

* fixed indentation

* Updated image vars in devtron.yaml

* Updated devtron cicdImage in devtron-bom

* Removed conditons from cm and secrets

* Updated devtron installation image conditions

* Added minReadySeconds for devtron and dex

* Update devtron.yaml

* Update dex.yaml

* Update Chart.yaml

Co-authored-by: Prakarsh <[email protected]>

Author: dheeth

charts/devtron/devtron-bom.yaml

@@ -8,6 +8,7 @@ components:
     image: "quay.io/devtron/dashboard:c8b8d431-240-8868"
   devtron:
     image: "quay.io/devtron/hyperion:3d41b121-280-8899"
+    cicdImage: "quay.io/devtron/devtron:3d41b121-324-8898"
   argocdDexServer:
     image: "quay.io/dexidp/dex:v2.25.0"
   kubelink:

charts/devtron/templates/argocd-secret.yaml

@@ -1,4 +1,3 @@
-{{- if not .Values.installer.modules }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -48,5 +47,4 @@ data:
       url:  https://kubernetes-sigs.github.io/metrics-server
     - name: autoscaler
       type: helm
-      url:  https://kubernetes.github.io/autoscaler
-{{- end }}
+      url:  https://kubernetes.github.io/autoscaler

charts/devtron/templates/devtron.yaml

@@ -1,4 +1,3 @@
-{{- if not .Values.installer.modules }}
 {{- with .Values.components.devtron }}
 ---
 apiVersion: v1
@@ -35,7 +34,12 @@ spec:
       app: devtron
       release: devtron
   replicas: 1
+  {{- if $.Release.IsUpgrade }}
+  minReadySeconds: 700
+  progressDeadlineSeconds: 800
+  {{- else }}
   minReadySeconds: 60
+  {{- end }}
   template:
     metadata:
       labels:
@@ -47,7 +51,17 @@ spec:
       serviceAccountName: devtron
       containers:
         - name: devtron
-          image: {{ .image }}
+          {{- if $.Values.installer.modules }}
+          {{ range $.Values.installer.modules }}
+          {{- if and (eq . "cicd") ($.Release.IsUpgrade) }}
+          image: {{ $.Values.components.devtron.cicdImage }}
+          {{- else }}
+          image: {{ $.Values.components.devtron.image }}
+          {{- end }}
+          {{- end }}
+          {{- else }}
+          image: {{ $.Values.components.devtron.image }}
+          {{- end }}
           imagePullPolicy: {{ .imagePullPolicy }}
           ports:
             - name: devtron
@@ -90,4 +104,3 @@ spec:
       app: devtron
 {{- end }}
 {{- end }}
-{{- end }}

charts/devtron/templates/dex.yaml

@@ -1,4 +1,3 @@
-{{- if not .Values.installer.modules }}
 {{- with .Values.components.argocdDexServer }}
 apiVersion: v1
 kind: Service
@@ -41,6 +40,12 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: argocd-dex-server
+  {{- if $.Release.IsUpgrade }}
+  minReadySeconds: 700
+  progressDeadlineSeconds: 800
+  {{- else }}
+  minReadySeconds: 60
+  {{- end }}
   template:
     metadata:
       labels:
@@ -57,7 +62,11 @@ spec:
             weight: 5
       containers:
       - command:
+        {{- if and $.Values.installer.modules $.Release.IsUpgrade }}
+        - /shared/argocd-util
+        {{- else }}
         - /shared/authenticator
+        {{- end }}
         - rundex
         image: {{ .image }}
         imagePullPolicy: {{ .imagePullPolicy }}
@@ -73,9 +82,17 @@ spec:
       - command:
         - cp
         - -n
+        {{- if and $.Values.installer.modules $.Release.IsUpgrade }}
+        - /usr/local/bin/argocd-util
+        {{- else }}
         - /authenticator
+        {{- end }}
         - /shared
-        image: quay.io/devtron/authenticator:415f5470-279-6520
+        {{- if and $.Values.installer.modules $.Release.IsUpgrade }}
+        image: {{ .cicdAuthenticator }}
+        {{- else }}
+        image: {{ .authenticator }}
+        {{- end }}
         imagePullPolicy: IfNotPresent
         name: copyutil
         volumeMounts:
@@ -139,4 +156,3 @@ subjects:
 - kind: ServiceAccount
   name: argocd-dex-server
 {{- end }}
-{{- end }}

charts/devtron/templates/migrator.yaml

@@ -1,4 +1,3 @@
-{{- if not .Values.installer.modules }}
 {{- with .Values.components.migrator }}
 ---
 apiVersion: batch/v1
@@ -89,4 +88,3 @@ spec:
   backoffLimit: 20
   activeDeadlineSeconds: 1500
 {{- end }}
-{{- end }}

charts/devtron/templates/postgresql.yaml

@@ -1,4 +1,3 @@
-{{- if not .Values.installer.modules }}
 {{- with .Values.components.postgres }}
 apiVersion: v1
 kind: Secret
@@ -66,7 +65,7 @@ data:
     create database casbin;
     create database git_sensor;
     create database lens;
-    create database clair;
+    create database clairv4;
 ---
 apiVersion: v1
 kind: Service
@@ -213,6 +212,8 @@ spec:
               value: "orchestrator"
             - name: POSTGRESQL_ENABLE_LDAP
               value: "no"
+            - name: POSTGRESQL_SHARED_PRELOAD_LIBRARIES
+              value: pgaudit, uuid-ossp
           ports:
             - name: tcp-postgresql
               containerPort: 5432
@@ -302,4 +303,3 @@ spec:
           requests:
             storage: {{ .persistence.volumeSize }}
 {{- end }}
-{{- end }}

charts/devtron/templates/rbac.yaml

@@ -1,4 +1,3 @@
-{{- if not .Values.installer.modules }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -42,5 +41,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: devtron
-    namespace: devtroncd
-{{- end }}
+    namespace: devtroncd

charts/devtron/values.yaml

@@ -48,6 +48,7 @@ components:
 
   devtron:
     image: "quay.io/devtron/hyperion:3d41b121-280-8899"
+    cicdImage: "quay.io/devtron/devtron:3d41b121-324-8898"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
@@ -72,8 +73,10 @@ components:
       #      - devtron.example.com
 
   argocdDexServer:
-    image: quay.io/dexidp/dex:v2.25.0
+    image: "quay.io/dexidp/dex:v2.25.0"
     imagePullPolicy: IfNotPresent
+    authenticator: "quay.io/devtron/authenticator:415f5470-279-6520"
+    cicdAuthenticator: "quay.io/argoproj/argocd:v1.8.1"
 
   kubelink:
     image: "quay.io/devtron/kubelink:d691bfbb-318-8695"