From ff69d2c1d29e3f78e7c0f39b6ecdffb85c2d48cf Mon Sep 17 00:00:00 2001 From: nishant Date: Tue, 9 Mar 2021 16:16:21 +0530 Subject: [PATCH 1/2] installer image and default value update --- charts/devtron/Chart.yaml | 2 +- charts/devtron/crds/crd-devtron.yaml | 6 +++++- charts/devtron/templates/install.yaml | 2 +- charts/devtron/values.yaml | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml index a714b11c..71817e65 100644 --- a/charts/devtron/Chart.yaml +++ b/charts/devtron/Chart.yaml @@ -8,7 +8,7 @@ keywords: - K8s - Deployment engine: gotpl -version: 0.10.2 +version: 0.10.3 sources: - https://github.com/devtron-labs/charts maintainers: diff --git a/charts/devtron/crds/crd-devtron.yaml b/charts/devtron/crds/crd-devtron.yaml index d7c2bf87..5fb64d08 100644 --- a/charts/devtron/crds/crd-devtron.yaml +++ b/charts/devtron/crds/crd-devtron.yaml @@ -32,6 +32,8 @@ spec: spec: description: InstallerSpec defines the desired state of Installer properties: + reSync: + type: boolean url: description: URL of the BOM version to be installed type: string @@ -132,6 +134,8 @@ spec: type: object kind: type: string + message: + type: string name: type: string namespace: @@ -167,4 +171,4 @@ status: kind: "" plural: "" conditions: [] - storedVersions: [] \ No newline at end of file + storedVersions: [] diff --git a/charts/devtron/templates/install.yaml b/charts/devtron/templates/install.yaml index b5b414a4..ec96616e 100644 --- a/charts/devtron/templates/install.yaml +++ b/charts/devtron/templates/install.yaml @@ -79,7 +79,7 @@ spec: spec: containers: - - image: quay.io/devtron/inception:33dcb4a3-130-2359 + image: quay.io/devtron/inception:d7236e39-185-3534 imagePullPolicy: IfNotPresent name: inception ports: diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml index 728474b9..630d9474 100644 --- a/charts/devtron/values.yaml +++ b/charts/devtron/values.yaml @@ -14,6 +14,11 @@ secrets: configs: BLOB_STORAGE_PROVIDER: "MINIO" #AZURE|AWS|MINIO + DEFAULT_CACHE_BUCKET: "devtron-ci-cache" + DEFAULT_CACHE_BUCKET_REGION: "change-me" + DEFAULT_BUILD_LOGS_BUCKET: "devtron-ci-log" + EXTERNAL_SECRET_AMAZON_REGION: "" + PROMETHEUS_URL: "http://change-me/prometheus" # Amazon AWS S3 bucket and region for storing Build-cache for faster build process. Mandatory if BLOB_STORAGE_PROVIDER is AWS. #DEFAULT_CACHE_BUCKET: "us-east-1" #Do not include s3:// #DEFAULT_CACHE_BUCKET_REGION: "change-me" From 8b65e9af884f3ed82d211b823470c4a707a9e3c8 Mon Sep 17 00:00:00 2001 From: nishant Date: Tue, 9 Mar 2021 16:39:01 +0530 Subject: [PATCH 2/2] resync on chart upgrade --- charts/devtron/templates/devtron-installer.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/devtron/templates/devtron-installer.yaml b/charts/devtron/templates/devtron-installer.yaml index 32646383..8826dfb1 100644 --- a/charts/devtron/templates/devtron-installer.yaml +++ b/charts/devtron/templates/devtron-installer.yaml @@ -5,3 +5,4 @@ metadata: namespace: devtroncd spec: url: https://raw.githubusercontent.com/{{ .Values.installer.repo }}/{{ .Values.installer.release }}/installation-script + reSync: true