From 7c6f724f52643a52a2ecdb18f43d4fa764719c76 Mon Sep 17 00:00:00 2001
From: dena <91744937+deer-wmde@users.noreply.github.com>
Date: Thu, 12 Dec 2024 16:15:07 +0100
Subject: [PATCH] Revert "local/staging: use argocd-config 1.1.0 (#1908)"
 (#1909)

This reverts commit 296bbec0d2ebb864b510de2a83afce4f9aab3474.
---
 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 ---
 k8s/helmfile/env/production/argocd-config.values.yaml.gotmpl | 2 +-
 k8s/helmfile/helmfile.yaml                                   | 2 +-
 5 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/k8s/argocd/local/app-of-apps.values.yaml b/k8s/argocd/local/app-of-apps.values.yaml
index eef833be5..a08436adb 100644
--- a/k8s/argocd/local/app-of-apps.values.yaml
+++ b/k8s/argocd/local/app-of-apps.values.yaml
@@ -1,5 +1,2 @@
 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 eef833be5..a08436adb 100644
--- a/k8s/argocd/production/app-of-apps.values.yaml
+++ b/k8s/argocd/production/app-of-apps.values.yaml
@@ -1,5 +1,2 @@
 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 eef833be5..a08436adb 100644
--- a/k8s/argocd/staging/app-of-apps.values.yaml
+++ b/k8s/argocd/staging/app-of-apps.values.yaml
@@ -1,5 +1,2 @@
 chartVersions:
-  wbaasUi: 0.4.0
-  wbaasApi: 0.32.1
-  redis: 17.3.8
   redis2: 19.6.4
diff --git a/k8s/helmfile/env/production/argocd-config.values.yaml.gotmpl b/k8s/helmfile/env/production/argocd-config.values.yaml.gotmpl
index ba68f1671..d3e915908 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
+
diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml
index 7f7bb0744..1ebd95d15 100644
--- a/k8s/helmfile/helmfile.yaml
+++ b/k8s/helmfile/helmfile.yaml
@@ -101,7 +101,7 @@ releases:
   - name: argocd-config
     namespace: argocd
     chart: wbstack/argocd-config
-    version: '{{ if eq .Environment.Name "production" }} 1.0.10 {{ else }} 1.1.0 {{ end }}'
+    version: 1.0.10
     <<: *default_release
 
   - name: redirects