Merge branch 'main' into statefulchart-fix

Author: neha130

CHANGELOG/release-notes-v1.8.2.md

@@ -0,0 +1,12 @@
+## v1.8.2
+
+## Enhancements
+- feat: linked ci should have artifacts of parent ci (#6836)
+## Bugs
+- fix: clear cached reference charts for Deployment chart versions 4.18.0, 4.19.0, 1.0.0, and 1.1.0 (#6841)
+- fix: Custom chart with dependencies are not working in Devtron Applications (#6834)
+- fix: Terraform plugin fix in v1.0.1 (#6830)
+## Others
+- misc: Api specs and validations added (#6807)
+
+

charts/devtron/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 1.8.1
+appVersion: 1.8.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.97
+version: 0.22.98
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:

charts/devtron/devtron-bom.yaml

@@ -15,7 +15,7 @@ global:
     PG_DATABASE: orchestrator
 extraManifests: []
 installer:
-  release: "v1.8.1"
+  release: "v1.8.2"
   registry: ""
   image: "inception"
   tag: "473deaa4-185-21582"
@@ -41,13 +41,13 @@ components:
         FEATURE_CODE_MIRROR_ENABLE: "true"
         FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE: "true"
     registry: ""
-    image: "dashboard:6618ce43-690-36167"
+    image: "dashboard:b00aa204-690-36533"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
   devtron:
     registry: ""
-    image: "hyperion:1ae65fbb-280-36074"
-    cicdImage: "devtron:1ae65fbb-434-36069"
+    image: "hyperion:261df88d-280-36531"
+    cicdImage: "devtron:261df88d-434-36530"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     podSecurityContext:
@@ -117,7 +117,7 @@ components:
       image: postgres_exporter:v0.10.1
   gitsensor:
     registry: ""
-    image: "git-sensor:880420ac-200-36032"
+    image: "git-sensor:b82f5fdb-200-36532"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false

charts/devtron/values.yaml

@@ -42,7 +42,7 @@ nfs:
 extraManifests: []
 installer:
   repo: "devtron-labs/devtron"
-  release: "v1.8.1"
+  release: "v1.8.2"
   registry: ""
   image: inception
   tag: 473deaa4-185-21582
@@ -97,13 +97,13 @@ components:
         FEATURE_CODE_MIRROR_ENABLE: "true"
         FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE: "true"
     registry: ""
-    image: "dashboard:6618ce43-690-36167"
+    image: "dashboard:b00aa204-690-36533"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
   devtron:
     registry: ""
-    image: "hyperion:1ae65fbb-280-36074"
-    cicdImage: "devtron:1ae65fbb-434-36069"
+    image: "hyperion:261df88d-280-36531"
+    cicdImage: "devtron:261df88d-434-36530"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     healthPort: 8080
@@ -200,7 +200,7 @@ components:
       volumeSize: "20Gi"
   gitsensor:
     registry: ""
-    image: "git-sensor:880420ac-200-36032"
+    image: "git-sensor:b82f5fdb-200-36532"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false

devtron-images.txt.source

@@ -11,13 +11,13 @@ quay.io/devtron/chart-sync:880420ac-836-36037
 quay.io/devtron/ci-runner:880420ac-138-36030
 quay.io/devtron/clair:4.3.6
 quay.io/devtron/curl:7.73.0
-quay.io/devtron/dashboard:6618ce43-690-36167
+quay.io/devtron/dashboard:b00aa204-690-36533
 quay.io/devtron/devtron-utils:dup-chart-repo-v1.1.0
-quay.io/devtron/devtron:1ae65fbb-434-36069
+quay.io/devtron/devtron:261df88d-434-36530
 quay.io/devtron/dex:v2.30.2
-quay.io/devtron/git-sensor:880420ac-200-36032
+quay.io/devtron/git-sensor:b82f5fdb-200-36532
 quay.io/devtron/grafana:7.3.1
-quay.io/devtron/hyperion:1ae65fbb-280-36074
+quay.io/devtron/hyperion:261df88d-280-36531
 quay.io/devtron/image-scanner:f21e02cb-141-34534
 quay.io/devtron/inception:473deaa4-185-21582
 quay.io/devtron/k8s-sidecar:1.1.0

env_gen.json

@@ -187,6 +187,7 @@
  | ECR_REPO_NAME_PREFIX | string |test/ | Prefix for ECR repo to be created in does not exist |  | false |
  | ENABLE_ASYNC_ARGO_CD_INSTALL_DEVTRON_CHART | bool |false | To enable async installation of gitops application |  | false |
  | ENABLE_ASYNC_INSTALL_DEVTRON_CHART | bool |false | To enable async installation of no-gitops application |  | false |
+ | ENABLE_LINKED_CI_ARTIFACT_COPY | bool |false | Enable copying artifacts from parent CI pipeline to linked CI pipeline during creation |  | false |
  | EPHEMERAL_SERVER_VERSION_REGEX | string |v[1-9]\.\b(2[3-9]\|[3-9][0-9])\b.* | ephemeral containers support version regex that is compared with k8sServerVersion |  | false |
  | EVENT_URL | string |http://localhost:3000/notify | Notifier service url |  | false |
  | EXECUTE_WIRE_NIL_CHECKER | bool |false | checks for any nil pointer in wire.go |  | false |
@@ -225,6 +226,7 @@
  | LENS_URL | string |http://lens-milandevtron-service:80 | Lens micro-service URL |  | false |
  | LIMIT_CI_CPU | string |0.5 |  |  | false |
  | LIMIT_CI_MEM | string |3G |  |  | false |
+ | LINKED_CI_ARTIFACT_COPY_LIMIT | int |10 | Maximum number of artifacts to copy from parent CI pipeline to linked CI pipeline |  | false |
  | LOGGER_DEV_MODE | bool |false | Enables a different logger theme. |  | false |
  | LOG_LEVEL | int |-1 |  |  | false |
  | MAX_SESSION_PER_USER | int |5 | max no of cluster terminal pods can be created by an user |  | false |

env_gen.md

@@ -124,6 +124,7 @@ type CiArtifactRepository interface {
 	GetArtifactsByCDPipelineAndRunnerType(cdPipelineId int, runnerType bean.WorkflowType) ([]CiArtifact, error)
 	SaveAll(artifacts []*CiArtifact) ([]*CiArtifact, error)
 	GetArtifactsByCiPipelineId(ciPipelineId int) ([]CiArtifact, error)
+	GetLatestArtifactsByCiPipelineId(ciPipelineId, limit int) ([]CiArtifact, error)
 	GetArtifactsByCiPipelineIds(ciPipelineIds []int) ([]CiArtifact, error)
 	FinDByParentCiArtifactAndCiId(parentCiArtifact int, ciPipelineIds []int) ([]*CiArtifact, error)
 	GetLatest(cdPipelineId int) (int, error)
@@ -680,6 +681,19 @@ func (impl CiArtifactRepositoryImpl) GetArtifactsByCiPipelineId(ciPipelineId int
 	return artifacts, err
 }
 
+func (impl CiArtifactRepositoryImpl) GetLatestArtifactsByCiPipelineId(ciPipelineId, limit int) ([]CiArtifact, error) {
+	var artifacts []CiArtifact
+	err := impl.dbConnection.
+		Model(&artifacts).
+		Column("ci_artifact.*").
+		Join("INNER JOIN ci_pipeline cp on cp.id=ci_artifact.pipeline_id").
+		Where("ci_artifact.pipeline_id = ?", ciPipelineId).
+		Where("cp.deleted = ?", false).
+		Order("ci_artifact.id DESC").Limit(limit).
+		Select()
+	return artifacts, err
+}
+
 func (impl CiArtifactRepositoryImpl) GetArtifactsByCiPipelineIds(ciPipelineIds []int) ([]CiArtifact, error) {
 	var artifacts []CiArtifact
 	if len(ciPipelineIds) == 0 {

internal/sql/repository/CiArtifactRepository.go

@@ -4,4 +4,4 @@ metadata:
   name: installer-devtron
   namespace: devtroncd
 spec:
-  url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.8.1/manifests/installation-script
+  url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.8.2/manifests/installation-script

manifests/install/devtron-installer.yaml

@@ -1,4 +1,4 @@
-LTAG="v1.8.1";
+LTAG="v1.8.2";
 REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
 shebang = `#!/bin/bash
 `;