Merge pull request #5895 from devtron-labs/oss-main-sync-24-sep

chore: OSS main branch sync

.github/CODEOWNERS

@@ -1,10 +1,6 @@
 #ALL
 * @vikramdevtron @kripanshdevtron @nishant-d @prakarsh-dt
 
-#DOCS
-docs/ @ashokdevtron @uxarya-d @prakarsh-dt
-.gitbook.yaml @uxarya-d @prakarsh-dt
-
 #Helm Charts
 charts/devtron/ @prakarsh-dt @pawan-mehta-dt @nishant-d
 scripts/devtron-reference-helm-charts @prakarsh-dt @pawan-mehta-dt @nishant-d

.github/workflows/update-release-notes.yml

@@ -7,6 +7,7 @@ on:
       - closed
     branches:
       - main
+      - develop
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

CHANGELOG/release-notes-v0.7.2.md

@@ -0,0 +1,127 @@
+## v0.7.2
+
+## Bugs
+- fix: error in enable change ci  (#5358)
+- fix: ci patch rbac fixes (#5461)
+- fix: bitbucket commit race condition for concurrent requests (#5505)
+- fix: handle nil check image scanning (#5497)
+- fix: error in switching ci to external ci (#5500)
+- fix: autoscale error handling (#5481)
+- fix: ci material update fixes for linked ci pipelines (#5523)
+- fix: Unable to get HPA manifest for no-gitops deployment (#5522)
+- fix: Deployment stuck in starting for no-gitops based pipelines (#5526)
+- fix: panic handling for deleted app in app group and env group filters (#5541)
+- fix: security time fix when scanning is passed (#5549)
+- fix: app group query optimisations (#5558)
+- fix: version and fixed_version in image scan result table (#5552)
+- fix: add if not exists in migration script for avoiding any errors while rerunning scripts (#5579)
+- fix: Resource Browser Shortnames are not applying dynamically (#5573)
+- fix: tls enabled flag not getting passed (#5609)
+- fix: reverting acd token fetch logic (#5614)
+- fix: query optimisations for app group cd listing and ci pipeline blockage state (#5641)
+- fix: dependabot security updates (#5608)
+- fix: default PipelineType given (#5668)
+- fix: validation in CiJob for external Artifact (#5669)
+- fix: Nats Panic Error in Orchestrator  (#5670)
+- fix: SSH & Proxy Cluster flows broken (#5675)
+- fix: Restart in orchestrator just after release (#5671)
+- fix: Sql query optimisation for application group app status listing (#5672)
+- fix: handling for HPA (autoscaling) (#5666)
+- fix: refrain from checkin autoscalingCheckBeforeTrigger for virt clus (#5696)
+- fix: Decode secret fix on add update oss (#5695)
+- fix: saving pco concurrency case handled (#5688)
+- fix: script for pipelineStageStepVariable, making input value and default_value text from varchar255 (#5701)
+- fix: Issue in EA Mode Cluster - error: pg: multiple rows in result set. (#5708)
+- fix: SkipCiBuildCachePushPull code incorporated with minor refac in handle runtime params validation (#5712)
+- fix: migration syn (#5718)
+- fix: ci patch rbac for branch update (#5759)
+- fix: Bitnami chart repo tls issue (#5740)
+- fix: check rbac on env if envName is present (#5765)
+- fix: scan tool active check removed (#5771)
+- fix: panic handlings and argocd app delete stuck in partial stage (#5770)
+- fix: unimplemented cluster cron service (#5781)
+- fix: sql injection fixes (#5783)
+- fix: sql injection fixes (#5801)
+- fix: upgraded to /argo-cd/v2 v2.9.21 (#5758)
+- fix: Ea rbac issues and not working on airgapped (#5813)
+- fix: scan list in global security page sql injection fix (#5808)
+- fix: app details page breaking (#5823)
+- fix: plugin ip variables value getting changed (#5844)
+- fix: ignore kubelink errors in server startup (#5852) (#5854)
+- fix: user rbac flows (#5804)
+- fix: pg multiple rows in EA mode (#5869)
+- fix: app overview panic for helm app (#5863)
+- fix: app detail page breaking (#5873)
+- fix: copy container image plugin issue (#5876)
+- fix: create GitOps configuration issue (#5883)
+## Enhancements
+- feat: support for handling hibernation and un-hibernation for keda enabled (#5431)
+- feat: Async ArgoCd App refresh operation (#5448)
+- feat: deployment config migration (#5368)
+- feat: Skipping falg based CMCS for Ci Job  (#5536)
+- feat: expose git commit data as env vars for ci stage (#5534)
+- feat: Defining applications as part of release track (#5489)
+- feat: gitlab webhook support (#5420)
+- feat: Enhance the buildx to use cache for multi arch builds (#5307)
+- feat: bug fix for picking wrong values in docker arguments (#5565)
+- feat: enable external argocd listing (#5585)
+- feat: plugin versioning feature (#5352)
+- feat: service account in chart sync (#5584)
+- feat: panic in sync pod cron and terminal not opening fix (#5603)
+- feat: tls support for git and gitops (#5305)
+- feat: system network controller sql script (#5637)
+- feat: skip argowf logs from ci logs (#5646)
+- feat: gitops support for oci repositories (#5577)
+- feat: ext argo app rbac and missing common features and flux app listing and details with rbac (#5528)
+- feat: expose git ops metrics (#5582)
+- feat: Generate config and secret hash for application mounting external k8s secrets (#5626)
+- feat: Env description handling (#5744)
+- feat: Added basic auth support for servicemonitor (#5761)
+- feat: Docker pull env driven (#5767)
+- feat: plugin creation support (#5630)
+- feat: Added multiple features support in servicemonitor (#5789)
+## Documentation
+- doc: Added FAQ no. 28 + GoLang-migrate Link + Code Block Fix (#5502)
+- docs: Drafted Software Distribution Hub (#5459)
+- doc: Created Image Label + Comments Doc (#5314)
+- doc: FAQ added for Bitnami Charts (#5545)
+- doc: Added Keycloak SSO Doc (#5571)
+- doc: Code scan plugin docs (#5562)
+- docs: jenkins-plugin (#5542)
+- doc: Copacetic plugin docs (#5564)
+- doc: Pull images from container repository (#5563)
+- doc: Collated Doc Fixes for July (#5591)
+- doc: Drafted Schema Driven DT (#5533)
+- doc: fixes in Copacetic plugin doc (#5622)
+- doc: Edit Deployment Chart Schema (#5735)
+- doc: Redirection of old entry in gitbook.yaml (#5738)
+- docs: added Documentation for Air-Gapped Installation (#5360)
+- doc: Update prerequisites of code-scan (#5625)
+- doc: Cosign plugin doc (#5665)
+- doc: CraneCopy plugin doc (#5658)
+- doc: Devtron CD Trigger Plugin doc (#5747)
+- doc: DockerSlim plugin doc (#5660)
+- doc: Devtron Job Trigger Plugin doc (#5742)
+- doc: Vulnerability Scanning Plugin doc (#5722)
+- docs: Jira plugins doc (Validator + Updater) (#5709)
+- docs: added commands enable ingress during helm installation (#5794)
+- doc: Revamped + Restructured Ingress Setup Doc (#5798)
+- docs: modifying route in ingress doc (#5799)
+- docs: modified the anchorlink in ingress.md (#5800)
+- doc: ArgoCD + FluxCD App Listing (#5636)
+- doc: Added Special CEL Expr in Filter Condition doc (#5850)
+## Others
+- misc: removal of azure-devops-issue-sync.yml (#5592)
+- misc: added action for discrod webhook (#5615)
+- misc: Revert "misc: added action for discrod webhook" (#5619)
+- chore: Plugin script fix oss (#5661)
+- misc: Release candidate v0.16.0 (#5687)
+- chore: migration number changes (#5692)
+- chore: ea fixes for helm app (#5713)
+- misc: Main sync rc - branch update (#5753)
+- chore: Revert "feat: plugin creation support" (#5778)
+- chore: cron status update refactoring (#5790)
+- misc: sync with common-lib changes with release candidate 18 (#5830)
+- chore: Custom tag for copy container image plugin (#5760) (#5841)
+- chore: migration number fix (#5840)
+- misc: Update CODEOWNERS (#5885)

api/appStore/InstalledAppRestHandler.go

@@ -148,6 +148,13 @@ func (handler *InstalledAppRestHandlerImpl) FetchAppOverview(w http.ResponseWrit
 	token := r.Header.Get("token")
 	handler.Logger.Infow("request payload, FindAppOverview", "installedAppId", installedAppId)
 	installedApp, err := handler.installedAppService.GetInstalledAppById(installedAppId)
+	if err != nil && err != pg.ErrNoRows {
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	} else if err == pg.ErrNoRows || installedApp == nil {
+		common.WriteJsonResp(w, errors.New("helm app doses not exist"), nil, http.StatusNotFound)
+		return
+	}
 	appOverview, err := handler.appCrudOperationService.GetAppMetaInfo(installedApp.AppId, installedAppId, installedApp.EnvironmentId)
 	if err != nil {
 		handler.Logger.Errorw("service err, FetchAppOverview", "err", err, "appId", installedApp.AppId, "installedAppId", installedAppId)

charts/devtron/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 0.7.1
+appVersion: 0.7.2
 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.73
+version: 0.22.74
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:

charts/devtron/devtron-bom.yaml

@@ -8,13 +8,9 @@ global:
     runAsUser: 1000
     runAsNonRoot: true
   containerRegistry: "quay.io/devtron"
-  # The below values can be specified both at global as well as component level
-  nodeSelector: {}
-  tolerations: []
-  imagePullSecrets: []
 extraManifests: []
 installer:
-  release: "v0.7.1"
+  release: "v0.7.2"
   registry: ""
   image: "inception"
   tag: "473deaa4-185-21582"
@@ -30,21 +26,25 @@ components:
         ENABLE_CI_JOB: "true"
         GLOBAL_API_TIMEOUT: "60000"
         TRIGGER_API_TIMEOUT: "60000"
-        ENABLE_EXTERNAL_ARGO_CD: "false"
+        ENABLE_EXTERNAL_ARGO_CD: "true"
         SERVICE_WORKER_TIMEOUT: "1"
         API_BATCH_SIZE: "30"
+        FEATURE_EXTERNAL_FLUX_CD_ENABLE: "true"
+        FEATURE_STEP_WISE_LOGS_ENABLE: "true"
+        FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true"
+        ENABLE_RESOURCE_SCAN: "true"
     registry: ""
-    image: "dashboard:5f95d187-690-23841"
+    image: "dashboard:215319c7-690-25536"
     imagePullPolicy: IfNotPresent
   devtron:
     registry: ""
-    image: "hyperion:291c4c75-280-23860"
-    cicdImage: "devtron:291c4c75-434-23853"
+    image: "hyperion:3f68456b-280-25566"
+    cicdImage: "devtron:3f68456b-434-25567"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
   ciRunner:
     registry: ""
-    image: "ci-runner:48aca9f4-138-23844"
+    image: "ci-runner:fd5702db-138-25483"
   argocdDexServer:
     registry: ""
     image: "dex:v2.30.2"
@@ -53,7 +53,7 @@ components:
       authenticator: "authenticator:e414faff-393-13273"
   kubelink:
     registry: ""
-    image: "kubelink:0dee6306-564-23843"
+    image: "kubelink:6ef0fbbe-564-25533"
     imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
@@ -71,7 +71,7 @@ components:
       keyName: postgresql-password
   kubewatch:
     registry: ""
-    image: "kubewatch:850b40d5-419-23840"
+    image: "kubewatch:7c8611f4-419-25531"
     imagePullPolicy: IfNotPresent
     configs:
       devtroncd_NAMESPACE: "devtron-ci"
@@ -91,7 +91,7 @@ components:
       armImage: postgres_exporter:v0.10.1
   gitsensor:
     registry: ""
-    image: "git-sensor:86e13283-200-23847"
+    image: "git-sensor:5b9cf0ec-200-25481"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
@@ -109,7 +109,7 @@ components:
   # Values for lens
   lens:
     registry: ""
-    image: "lens:56211042-333-23839"
+    image: "lens:9db8a2fb-333-25482"
     imagePullPolicy: IfNotPresent
     configs:
       GIT_SENSOR_PROTOCOL: GRPC
@@ -154,7 +154,7 @@ components:
         DB_NAME: "lens"
   chartSync:
     registry: ""
-    image: chart-sync:5a1d0301-150-23845
+    image: chart-sync:13ffae06-150-25515
 # values for argocd integration
 argo-cd:
   global:
@@ -174,14 +174,14 @@ workflowController:
   IMDSv1ExecutorImage: "argoexec:v3.0.7"
 security:
   imageScanner:
-    image: "image-scanner:137872c2-141-23848"
+    image: "image-scanner:348201f8-141-25486"
   clair:
     image:
       repository: clair
       tag: 4.3.6
 # Values for notifier integration
 notifier:
-  image: "notifier:9639b1ab-372-23850"
+  image: "notifier:06392394-372-25535"
 minio:
   image: "minio:RELEASE.2021-02-14T04-01-33Z"
   mbImage: "minio-mc:RELEASE.2021-02-14T04-28-06Z"
@@ -200,3 +200,27 @@ monitoring:
       image: "k8s-sidecar:1.1.0"
       curlImage: "curl:7.73.0"
       imagePullPolicy: IfNotPresent
+devtronEnterprise:
+  enabled: false
+  casbin:
+    registry: ""
+    image: "casbin:efc28fb2-6de0e914-462-25420"
+    imagePullPolicy: IfNotPresent
+    configs:
+      PG_ADDR: postgresql-postgresql.devtroncd
+      PG_DATABASE: casbin
+      PG_PORT: "5432"
+      PG_USER: postgres
+    dbconfig:
+      secretName: postgresql-postgresql
+      keyName: postgresql-password
+    resources: {}
+  scoop:
+    enabled: false
+    registry: ""
+    image: "scoop:296d351d-629-24001"
+    imagePullPolicy: IfNotPresent
+    resources: {}
+    configs:
+      CLUSTER_ID: "1"
+      ORCHESTRATOR_URL: http://devtron-service.devtroncd.svc.cluster.local/orchestrator

charts/devtron/templates/_helpers.tpl

@@ -19,13 +19,19 @@ it randomly.
 {{- end -}}
 {{- end }}
 
+{{- define "imagePullSecret" }}
+{{- with .Values.imagePullSecret.credentials }}
+{{- printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"auth\":\"%s\"}}}" .registry .username .password (printf "%s:%s" .username .password | b64enc) | b64enc }}
+{{- end }}
+{{- end }}
+
 {{/*
 Expand the node selectors, tolerations, and image pull secrets for a Kubernetes resource.
 Usage:
-{{ include "common.nodeSelector" (dict "nodeSelector" .Values.path.to.nodeSelector "tolerations" .Values.path.to.tolerations "imagePullSecrets" .Values.path.to.imagePullSecrets "global" .Values.global ) }}
+{{ include "common.schedulerConfig" (dict "nodeSelector" .Values.path.to.nodeSelector "tolerations" .Values.path.to.tolerations "imagePullSecrets" .Values.path.to.imagePullSecrets "global" .Values.global ) }}
 */}}
 
-{{- define "common.nodeSelector" -}}
+{{- define "common.schedulerConfig" -}}
   {{- if .nodeSelector }}
 nodeSelector:
 {{ toYaml .nodeSelector | indent 2 }}

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

@@ -11,7 +11,7 @@ spec:
   template:
     spec:
       serviceAccountName: devtron
-      {{ include "common.nodeSelector" (dict "nodeSelector" $.Values.components.chartSync.nodeSelector "tolerations" $.Values.components.chartSync.tolerations "imagePullSecrets" $.Values.components.chartSync.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.components.chartSync.nodeSelector "tolerations" $.Values.components.chartSync.tolerations "imagePullSecrets" $.Values.components.chartSync.imagePullSecrets "global" $.Values.global) | indent 6 }}
       initContainers:
       - name: migration-wait
         image: {{ include "common.image" (dict "component" $.Values.components.migrator "global" $.Values.global "extraImage" $.Values.components.migrator.kubectlImage ) }}
@@ -75,7 +75,8 @@ spec:
     spec:
       template:
         spec:
-          {{ include "common.nodeSelector" (dict "nodeSelector" $.Values.components.chartSync.nodeSelector "tolerations" $.Values.components.chartSync.tolerations "imagePullSecrets" $.Values.components.chartSync.imagePullSecrets "global" $.Values.global) | indent 10 }}
+          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 }}
           securityContext:
 {{- toYaml $.Values.global.podSecurityContext | nindent 12 }}