Merge pull request #6339 from devtron-labs/main-sync-rc28

vikramdevtron · web-flow · commit 5b3608e3cad0 · 2025-01-30T13:46:22.000+05:30
sync: Main sync rc28
diff --git a/CHANGELOG/release-notes-v1.2.0.md b/CHANGELOG/release-notes-v1.2.0.md
@@ -0,0 +1,35 @@
+## v1.2.0
+
+
+
+## Bugs
+- fix: Application listing panic handling (#6199)
+- fix: Copy image plugin panic handling (#6220)
+- fix: Remove gaps between image scanning V1 & V2  (#6213)
+- fix: Select Query errors in Postgres Pod Logs (#6238)
+- fix: Graceful shutdown handling and logs flush (#6239)
+- fix: Remove unused variable causing double register in prometheus (#6279)
+## Enhancements
+- feat: Ignore workflow cache config (#6218)
+- feat: Build infra support (#6151)
+- feat: Helm type pipeline app status (#6262)
+- feat: Added labels to manual sync job (#6269)
+## Others
+- chore: Changes in CD trigger plugin condition v1.3.0 (#6233)
+- misc: GetDockerRegistryIdForCiPipeline (#6231)
+- chore: Merging user service with connection manager (#6225)
+- chore: Argocd repository secret creation service refactoring (#6229)
+- chore: Added sql migraiton for searchable key (#6252)
+- misc: Adds the required env variables to set up devtron (#6254)
+- misc: Added schme json for cronjobs (#6260)
+- misc: Error handling when template is empty in ExtractVariables (#6261)
+- misc: Nil check in envOverride.chart (#6263)
+- misc: PG enable metrics (#6243)
+- chore: Patch infra merge (#6274)
+- chore: Argo common client (#6266)
+- chore: Optimised Dockerfile by removing extra layers (#6293)
+- chore: Updated ApplistingRestHandler oss/ent function (#6307)
+- chore: Added env generator changes (#6302)
+- chore: Deployment config methods add (#6297)
+- misc: Deployment, reference and statefulset updated versions (#6284)
+- chore: Scoped var oss/ent changes (#6319)
diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 1.1.0
+appVersion: 1.2.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.79
+version: 0.22.80
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:
diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
@@ -10,7 +10,7 @@ global:
   containerRegistry: "quay.io/devtron"
 extraManifests: []
 installer:
-  release: "v1.1.0"
+  release: "v1.2.0"
   registry: ""
   image: "inception"
   tag: "473deaa4-185-21582"
@@ -34,17 +34,17 @@ components:
         FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true"
         ENABLE_RESOURCE_SCAN: "true"
     registry: ""
-    image: "dashboard:a88790b2-690-27891"
+    image: "dashboard:4eb1a17a-690-28956"
     imagePullPolicy: IfNotPresent
   devtron:
     registry: ""
-    image: "hyperion:a109b8be-280-27896"
-    cicdImage: "devtron:a109b8be-434-27906"
+    image: "hyperion:564fe991-280-28985"
+    cicdImage: "devtron:564fe991-434-28986"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
   ciRunner:
     registry: ""
-    image: "ci-runner:54595cec-138-27894"
+    image: "ci-runner:0a3d5e84-138-28964"
   argocdDexServer:
     registry: ""
     image: "dex:v2.30.2"
@@ -53,7 +53,7 @@ components:
       authenticator: "authenticator:e414faff-393-13273"
   kubelink:
     registry: ""
-    image: "kubelink:6c0c7082-564-27862"
+    image: "kubelink:0a3d5e84-564-28948"
     imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
@@ -71,7 +71,7 @@ components:
       keyName: postgresql-password
   kubewatch:
     registry: ""
-    image: "kubewatch:33965457-419-27887"
+    image: "kubewatch:0a3d5e84-419-28949"
     imagePullPolicy: IfNotPresent
     configs:
       devtroncd_NAMESPACE: "devtron-ci"
@@ -91,7 +91,7 @@ components:
       armImage: postgres_exporter:v0.10.1
   gitsensor:
     registry: ""
-    image: "git-sensor:6c0c7082-200-27863"
+    image: "git-sensor:0a3d5e84-200-28960"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
@@ -109,7 +109,7 @@ components:
   # Values for lens
   lens:
     registry: ""
-    image: "lens:6c0c7082-333-27872"
+    image: "lens:0a3d5e84-333-28951"
     imagePullPolicy: IfNotPresent
     configs:
       GIT_SENSOR_PROTOCOL: GRPC
@@ -154,7 +154,7 @@ components:
         DB_NAME: "lens"
   chartSync:
     registry: ""
-    image: chart-sync:6c0c7082-836-27893
+    image: chart-sync:0a3d5e84-836-28979
     schedule: "0 19 * * *"
     extraConfigs: {}
 # values for argocd integration
@@ -176,14 +176,17 @@ workflowController:
   IMDSv1ExecutorImage: "argoexec:v3.0.7"
 security:
   imageScanner:
-    image: "image-scanner:33965457-141-27892"
+    image: "image-scanner:0a3d5e84-141-28953"
+    configs:
+      TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db
+      TRIVY_JAVA_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-java-db
   clair:
     image:
       repository: clair
       tag: 4.3.6
 # Values for notifier integration
 notifier:
-  image: "notifier:2f9166d1-372-27880"
+  image: "notifier:9aa5e510-372-28961"
 minio:
   image: "minio:RELEASE.2021-02-14T04-01-33Z"
   mbImage: "minio-mc:RELEASE.2021-02-14T04-28-06Z"
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
@@ -24,7 +24,7 @@ global:
 extraManifests: []
 installer:
   repo: "devtron-labs/devtron"
-  release: "v1.1.0"
+  release: "v1.2.0"
   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:a88790b2-690-27891"
+    image: "dashboard:4eb1a17a-690-28956"
     imagePullPolicy: IfNotPresent
   devtron:
     registry: ""
-    image: "hyperion:a109b8be-280-27896"
-    cicdImage: "devtron:a109b8be-434-27906"
+    image: "hyperion:564fe991-280-28985"
+    cicdImage: "devtron:564fe991-434-28986"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     serviceMonitor:
@@ -108,7 +108,7 @@ components:
       #      - devtron.example.com
   ciRunner:
     registry: ""
-    image: "ci-runner:54595cec-138-27894"
+    image: "ci-runner:0a3d5e84-138-28964"
   argocdDexServer:
     registry: ""
     image: "dex:v2.30.2"
@@ -117,7 +117,7 @@ components:
       authenticator: "authenticator:e414faff-393-13273"
   kubelink:
     registry: ""
-    image: "kubelink:6c0c7082-564-27862"
+    image: "kubelink:0a3d5e84-564-28948"
     imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
@@ -135,7 +135,7 @@ components:
       keyName: postgresql-password
   kubewatch:
     registry: ""
-    image: "kubewatch:33965457-419-27887"
+    image: "kubewatch:0a3d5e84-419-28949"
     imagePullPolicy: IfNotPresent
     configs:
       devtroncd_NAMESPACE: "devtron-ci"
@@ -157,7 +157,7 @@ components:
       volumeSize: "20Gi"
   gitsensor:
     registry: ""
-    image: "git-sensor:6c0c7082-200-27863"
+    image: "git-sensor:0a3d5e84-200-28960"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
@@ -175,7 +175,7 @@ components:
   # Values for lens
   lens:
     registry: ""
-    image: "lens:6c0c7082-333-27872"
+    image: "lens:0a3d5e84-333-28951"
     imagePullPolicy: IfNotPresent
     secrets: {}
     resources: {}
@@ -222,7 +222,7 @@ components:
         DB_NAME: "lens"
   chartSync:
     registry: ""
-    image: chart-sync:6c0c7082-836-27893
+    image: chart-sync:0a3d5e84-836-28979
     schedule: "0 19 * * *"
     extraConfigs: {}
 # values for argocd integration
@@ -368,7 +368,10 @@ argo-cd:
 security:
   enabled: false
   imageScanner:
-    image: "image-scanner:33965457-141-27892"
+    image: "image-scanner:0a3d5e84-141-28953"
+    configs:
+      TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db
+      TRIVY_JAVA_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-java-db
   # Values for trivy
   trivy:
     enabled: false
@@ -383,7 +386,7 @@ security:
 notifier:
   enabled: false
   imagePullPolicy: IfNotPresent
-  image: "notifier:2f9166d1-372-27880"
+  image: "notifier:9aa5e510-372-28961"
   configs:
     CD_ENVIRONMENT: PROD
     DB: orchestrator
diff --git a/go.mod b/go.mod
@@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 
 replace (
 	github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
-	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127130310-e7058d8ef18a
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127130310-e7058d8ef18a
+	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250130075053-69cdda98e3e2
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130075053-69cdda98e3e2
 	github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
 	k8s.io/api => k8s.io/api v0.29.7
diff --git a/go.sum b/go.sum
@@ -792,10 +792,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
 github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127130310-e7058d8ef18a h1:42+3Qe3rAgQB/xr+zV+KCPu4CvKSqRPK5ius7UqK9Wg=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127130310-e7058d8ef18a/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127130310-e7058d8ef18a h1:kYjt17HsuofAdiVNRgLplN8o+n4/87ja+l3YrP2S8e8=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127130310-e7058d8ef18a/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250130075053-69cdda98e3e2 h1:8QjRav7pCDb32Pz8HwbS1P8QQJ1QSDb3wJgAmNYkNeU=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250130075053-69cdda98e3e2/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130075053-69cdda98e3e2 h1:8VByFEk14t2z2DDaD/7pTgwSM7zFYEMqfthLWpt2M3w=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130075053-69cdda98e3e2/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
 github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80 h1:xwbTeijNTf4/j1v+tSfwVqwLVnReas/NqEKeQHvSTys=
diff --git a/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml
@@ -4,4 +4,4 @@ metadata:
   name: installer-devtron
   namespace: devtroncd
 spec:
-  url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.1.0/manifests/installation-script
+  url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.2.0/manifests/installation-script
diff --git a/manifests/installation-script b/manifests/installation-script
@@ -1,4 +1,4 @@
-LTAG="v1.1.0";
+LTAG="v1.2.0";
 REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
 
 log("executed devtron setup installation");
diff --git a/manifests/release.txt b/manifests/release.txt
@@ -1 +1 @@
-stable -1 v1.1.0
+stable -1 v1.2.0
diff --git a/manifests/version.txt b/manifests/version.txt
@@ -1 +1 @@
-v1.1.0
+v1.2.0
diff --git a/manifests/yamls/dashboard.yaml b/manifests/yamls/dashboard.yaml
@@ -235,7 +235,7 @@ spec:
             - name: envoy-config-volume
               mountPath: /etc/envoy-config/
         - name: dashboard
-          image: "quay.io/devtron/dashboard:a88790b2-690-27891"
+          image: "quay.io/devtron/dashboard:4eb1a17a-690-28956"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/manifests/yamls/devtron.yaml b/manifests/yamls/devtron.yaml
@@ -53,7 +53,7 @@ data:
   CD_NODE_TAINTS_VALUE: "ci"
   CD_ARTIFACT_LOCATION_FORMAT: "%d/%d.zip"
   DEFAULT_CD_NAMESPACE: "devtron-cd"
-  DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:54595cec-138-27894"
+  DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:0a3d5e84-138-28964"
   DEFAULT_CD_TIMEOUT: "3600"
   WF_CONTROLLER_INSTANCE_ID: "devtron-runner"
   CI_LOGS_KEY_PREFIX: "ci-artifacts"
@@ -89,7 +89,7 @@ data:
   ENFORCER_CACHE: "true"
   ENFORCER_CACHE_EXPIRATION_IN_SEC: "345600"
   ENFORCER_MAX_BATCH_SIZE: "1"
-  APP_SYNC_IMAGE: "quay.io/devtron/chart-sync:6c0c7082-836-27893"
+  APP_SYNC_IMAGE: "quay.io/devtron/chart-sync:0a3d5e84-836-28979"
   DEVTRON_SECRET_NAME: "devtron-secret"
   GIT_SENSOR_PROTOCOL: GRPC
   GIT_SENSOR_URL: git-sensor-service.devtroncd:90
@@ -169,7 +169,7 @@ spec:
         runAsUser: 1000
       containers:
         - name: devtron
-          image: "quay.io/devtron/devtron:a109b8be-434-27906"
+          image: "quay.io/devtron/devtron:564fe991-434-28986"
           securityContext:
             allowPrivilegeEscalation: false
             runAsUser: 1000
diff --git a/manifests/yamls/gitsensor.yaml b/manifests/yamls/gitsensor.yaml
@@ -67,7 +67,7 @@ spec:
           - /bin/sh
           - -c
           - mkdir -p /git-base/ssh-keys && chown -R devtron:devtron /git-base && chmod 777 /git-base/ssh-keys
-          image: "quay.io/devtron/git-sensor:6c0c7082-200-27863"
+          image: "quay.io/devtron/git-sensor:0a3d5e84-200-28960"
           imagePullPolicy: IfNotPresent
           name: chown-git-base
           resources: {}
@@ -80,7 +80,7 @@ spec:
             name: git-volume
       containers:
         - name: git-sensor
-          image: "quay.io/devtron/git-sensor:6c0c7082-200-27863"
+          image: "quay.io/devtron/git-sensor:0a3d5e84-200-28960"
           securityContext:
             allowPrivilegeEscalation: false
             runAsUser: 1000
diff --git a/manifests/yamls/image-scanner.yaml b/manifests/yamls/image-scanner.yaml
@@ -73,7 +73,7 @@ spec:
         runAsUser: 1000
       containers:
         - name: image-scanner
-          image: "quay.io/devtron/image-scanner:33965457-141-27892"
+          image: "quay.io/devtron/image-scanner:0a3d5e84-141-28953"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/manifests/yamls/kubelink.yaml b/manifests/yamls/kubelink.yaml
@@ -25,7 +25,7 @@ spec:
         runAsUser: 1000
       containers:
         - name: kubelink
-          image: "quay.io/devtron/kubelink:6c0c7082-564-27862"
+          image: "quay.io/devtron/kubelink:0a3d5e84-564-28948"
           securityContext:
             allowPrivilegeEscalation: false
             runAsUser: 1000
diff --git a/manifests/yamls/kubewatch.yaml b/manifests/yamls/kubewatch.yaml
@@ -164,7 +164,7 @@ spec:
         runAsUser: 1000
       containers:
       - name: kubewatch
-        image: "quay.io/devtron/kubewatch:33965457-419-27887"
+        image: "quay.io/devtron/kubewatch:0a3d5e84-419-28949"
         securityContext:
           allowPrivilegeEscalation: false
           runAsUser: 1000
diff --git a/manifests/yamls/lens.yaml b/manifests/yamls/lens.yaml
@@ -71,7 +71,7 @@ spec:
         runAsUser: 1000
       containers:
         - name: lens
-          image: "quay.io/devtron/lens:6c0c7082-333-27872"
+          image: "quay.io/devtron/lens:0a3d5e84-333-28951"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/manifests/yamls/notifier.yaml b/manifests/yamls/notifier.yaml
@@ -66,7 +66,7 @@ spec:
       restartPolicy: Always
       containers:
         - name: notifier
-          image: quay.io/devtron/notifier:2f9166d1-372-27880"
+          image: quay.io/devtron/notifier:9aa5e510-372-28961"
           imagePullPolicy: IfNotPresent
           ports:
             - name: app
diff --git a/pkg/auth/user/UserCommonService.go b/pkg/auth/user/UserCommonService.go
diff --git a/releasenotes.md b/releasenotes.md
diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/schema.json b/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/schema.json
diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/schema.json b/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/schema.json
diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/schema.json b/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/schema.json
diff --git a/vendor/modules.txt b/vendor/modules.txt
