From dbcc86d72519e9370aff43fbad47d959d20e130b Mon Sep 17 00:00:00 2001 From: dena Date: Tue, 3 Dec 2024 11:35:29 +0100 Subject: [PATCH 1/4] add chart versions for argocd --- k8s/argocd/local/app-of-apps.values.yaml | 3 +++ k8s/argocd/production/app-of-apps.values.yaml | 3 +++ k8s/argocd/staging/app-of-apps.values.yaml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/k8s/argocd/local/app-of-apps.values.yaml b/k8s/argocd/local/app-of-apps.values.yaml index a08436ad..eef833be 100644 --- a/k8s/argocd/local/app-of-apps.values.yaml +++ b/k8s/argocd/local/app-of-apps.values.yaml @@ -1,2 +1,5 @@ chartVersions: + wbaasUi: 0.4.0 + wbaasApi: 0.32.1 + redis: 17.3.8 redis2: 19.6.4 diff --git a/k8s/argocd/production/app-of-apps.values.yaml b/k8s/argocd/production/app-of-apps.values.yaml index a08436ad..eef833be 100644 --- a/k8s/argocd/production/app-of-apps.values.yaml +++ b/k8s/argocd/production/app-of-apps.values.yaml @@ -1,2 +1,5 @@ chartVersions: + wbaasUi: 0.4.0 + wbaasApi: 0.32.1 + redis: 17.3.8 redis2: 19.6.4 diff --git a/k8s/argocd/staging/app-of-apps.values.yaml b/k8s/argocd/staging/app-of-apps.values.yaml index a08436ad..eef833be 100644 --- a/k8s/argocd/staging/app-of-apps.values.yaml +++ b/k8s/argocd/staging/app-of-apps.values.yaml @@ -1,2 +1,5 @@ chartVersions: + wbaasUi: 0.4.0 + wbaasApi: 0.32.1 + redis: 17.3.8 redis2: 19.6.4 From f341ffb1018170c0251a9d9fb9855abf2bcd4164 Mon Sep 17 00:00:00 2001 From: dena Date: Tue, 3 Dec 2024 11:35:43 +0100 Subject: [PATCH 2/4] add app-of-apps chart version --- k8s/helmfile/env/production/argocd-config.values.yaml.gotmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/helmfile/env/production/argocd-config.values.yaml.gotmpl b/k8s/helmfile/env/production/argocd-config.values.yaml.gotmpl index d3e91590..ba68f167 100644 --- a/k8s/helmfile/env/production/argocd-config.values.yaml.gotmpl +++ b/k8s/helmfile/env/production/argocd-config.values.yaml.gotmpl @@ -1,2 +1,2 @@ environment: production - +appOfAppsVersion: 1.1.0 From 76800f10e117fc584902ce0833d76582dcf242dd Mon Sep 17 00:00:00 2001 From: dena Date: Tue, 10 Dec 2024 09:14:15 +0100 Subject: [PATCH 3/4] use argocd-config chart 1.1.0 --- k8s/helmfile/helmfile.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml index d9ecd057..70f1353e 100644 --- a/k8s/helmfile/helmfile.yaml +++ b/k8s/helmfile/helmfile.yaml @@ -109,7 +109,7 @@ releases: - name: argocd-config namespace: argocd chart: wbstack/argocd-config - version: 1.0.10 + version: 1.1.0 <<: *default_release - name: redirects From 71a55c29304bf46bd5894a9fc80b3f11076d38a9 Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 12 Dec 2024 12:15:28 +0100 Subject: [PATCH 4/4] no production --- k8s/helmfile/helmfile.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml index 70f1353e..7679634e 100644 --- a/k8s/helmfile/helmfile.yaml +++ b/k8s/helmfile/helmfile.yaml @@ -109,7 +109,7 @@ releases: - name: argocd-config namespace: argocd chart: wbstack/argocd-config - version: 1.1.0 + version: '{{ if eq .Environment.Name "production" }} 1.0.10 {{ else }} 0.1.0 {{ end }}' <<: *default_release - name: redirects