From 6105cac4e0ea47f272da6335987c343b99cc5258 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Mon, 29 Sep 2025 16:15:18 +0200
Subject: [PATCH] remove redis

---
 charts/argocd-apps/Chart.yaml                |  2 +-
 charts/argocd-apps/README.md                 |  3 +++
 charts/argocd-apps/templates/redis-2.yaml    | 27 --------------------
 charts/argocd-apps/templates/redis.yaml      | 27 --------------------
 charts/argocd-apps/values.yaml               |  3 ---
 charts/argocd-config/Chart.yaml              |  2 +-
 charts/argocd-config/README.md               |  3 +++
 charts/argocd-config/templates/projects.yaml |  1 -
 charts/argocd-config/values.yaml             |  2 +-
 9 files changed, 9 insertions(+), 61 deletions(-)
 delete mode 100644 charts/argocd-apps/templates/redis-2.yaml
 delete mode 100644 charts/argocd-apps/templates/redis.yaml

diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml
index 3b9ea1f..a8df58a 100644
--- a/charts/argocd-apps/Chart.yaml
+++ b/charts/argocd-apps/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-apps
 description: Chart to deploy WBaaS apps in an "app-of-apps" pattern via ArgoCD
 type: application
-version: 2.0.1
+version: 2.1.0
 appVersion: "1.0"
 maintainers:
   - name: WBstack
diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md
index 65722c2..a0b439f 100644
--- a/charts/argocd-apps/README.md
+++ b/charts/argocd-apps/README.md
@@ -3,6 +3,9 @@
 Deploys actual `Application` manifests for Argo CD. This chart gets treated as it's own `Application`, the app-of-apps, by the chart [argocd-config](../argocd-config/README.md).
 
 ## Changelog
+## 2.1.0
+- remove redis deployments
+
 ## 1.1.1
 - fix repo URL for wbaas-ui
 
diff --git a/charts/argocd-apps/templates/redis-2.yaml b/charts/argocd-apps/templates/redis-2.yaml
deleted file mode 100644
index 9d3826f..0000000
--- a/charts/argocd-apps/templates/redis-2.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: redis-2
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  destination:
-    namespace: default
-    server: {{ .Values.clusterUrl }}
-  project: {{ .Values.environment }}
-  sources:
-    - repoURL: {{ .Values.repoUrls.bitnami }}
-      targetRevision: {{ .Values.chartVersions.redis2 }}
-      chart: redis
-      helm:
-        valueFiles:
-          - $deployRepo/k8s/argocd/{{ .Values.environment }}/redis-2.values.yaml
-    - repoURL: {{ .Values.repoUrls.deploy }}
-      targetRevision: HEAD
-      ref: deployRepo
-
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: false
diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
deleted file mode 100644
index 6466cbe..0000000
--- a/charts/argocd-apps/templates/redis.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: redis
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  destination:
-    namespace: default
-    server: {{ .Values.clusterUrl }}
-  project: {{ .Values.environment }}
-  sources:
-    - repoURL: {{ .Values.repoUrls.bitnami }}
-      targetRevision: {{ .Values.chartVersions.redis }}
-      chart: redis
-      helm:
-        valueFiles:
-          - $deployRepo/k8s/argocd/{{ .Values.environment }}/redis.values.yaml
-    - repoURL: {{ .Values.repoUrls.deploy }}
-      targetRevision: HEAD
-      ref: deployRepo
-
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: false
diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml
index c8c0f93..9a763ab 100644
--- a/charts/argocd-apps/values.yaml
+++ b/charts/argocd-apps/values.yaml
@@ -1,13 +1,10 @@
 repoUrls:
   deploy: https://github.com/wmde/wbaas-deploy
   wbstack: https://wbstack.github.io/charts
-  bitnami: https://raw.githubusercontent.com/wbstack/bitnami-legacy/ed0cf51bf0d2f21a99dda8269b806d2a20648986/bitnami
 clusterUrl: https://kubernetes.default.svc
 environment: production
 
 chartVersions:
   wbaasUi: 0.4.0
   wbaasApi: 0.32.1
-  redis: 17.3.8
-  redis2: 19.6.4
 # "inherits" values from argocd-config chart
diff --git a/charts/argocd-config/Chart.yaml b/charts/argocd-config/Chart.yaml
index 5874af7..1e79f3e 100644
--- a/charts/argocd-config/Chart.yaml
+++ b/charts/argocd-config/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-config
 description: Chart to deploy ArgoCD configuration (including the argocd-apps chart)
 type: application
-version: 2.0.1
+version: 2.1.0
 appVersion: "1.0"
 maintainers:
   - name: WBstack
diff --git a/charts/argocd-config/README.md b/charts/argocd-config/README.md
index 3a42991..b59eb52 100644
--- a/charts/argocd-config/README.md
+++ b/charts/argocd-config/README.md
@@ -3,6 +3,9 @@
 Configures permissions Argo CD and deploys the "app-of-apps" (see ../argocd-apps/README.md)
 
 ## Changelog
+## 2.1.0
+- remove redis deployments
+
 ## 2.0.0
 - use Bitnami Archive URL
 
diff --git a/charts/argocd-config/templates/projects.yaml b/charts/argocd-config/templates/projects.yaml
index 0fc5465..c8368d7 100644
--- a/charts/argocd-config/templates/projects.yaml
+++ b/charts/argocd-config/templates/projects.yaml
@@ -17,7 +17,6 @@ spec:
   sourceRepos:
   - {{ .Values.repoUrls.deploy }}
   - {{ .Values.repoUrls.wbstack }}
-  - {{ .Values.repoUrls.bitnami }}
   clusterResourceWhitelist:
   - group: rbac.authorization.k8s.io
     kind: ClusterRole
diff --git a/charts/argocd-config/values.yaml b/charts/argocd-config/values.yaml
index 1e04579..600b18d 100644
--- a/charts/argocd-config/values.yaml
+++ b/charts/argocd-config/values.yaml
@@ -1,6 +1,6 @@
 environment: production
 
-appOfAppsVersion: 2.0.1
+appOfAppsVersion: 2.1.0
 
 repoUrls:
   deploy: https://github.com/wmde/wbaas-deploy