From 8c51648699315fa90591397ccd5ba926b7178e70 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Fri, 30 Oct 2026 15:31:31 +0100
Subject: [PATCH 1/3] add valkey deployments

---
 charts/argocd-apps/Chart.yaml              |  2 +-
 charts/argocd-apps/templates/valkey-a.yaml | 25 ++++++++++++++++++++++
 charts/argocd-apps/templates/valkey-b.yaml | 25 ++++++++++++++++++++++
 charts/argocd-apps/values.yaml             |  2 ++
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 charts/argocd-apps/templates/valkey-a.yaml
 create mode 100644 charts/argocd-apps/templates/valkey-b.yaml

diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml
index 383f967..b8da59f 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.5.1
+version: 2.6.0
 appVersion: "1.0"
 maintainers:
   - name: WBstack
diff --git a/charts/argocd-apps/templates/valkey-a.yaml b/charts/argocd-apps/templates/valkey-a.yaml
new file mode 100644
index 0000000..6fbbfd7
--- /dev/null
+++ b/charts/argocd-apps/templates/valkey-a.yaml
@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: valkey-a
+  namespace: argocd
+spec:
+  destination:
+    namespace: default
+    server: {{ .Values.clusterUrl }}
+  project: {{ .Values.environment }}
+  sources:
+    - repoURL: https://github.com/wbstack/valkey-helm.git
+      targetRevision: {{ .Values.chartVersions.valkeyA }}
+      path: charts/valkey
+      helm:
+        valueFiles:
+          - $deployRepo/k8s/argocd/production/valkey-a.values.yaml
+          - $deployRepo/k8s/argocd/{{ .Values.environment }}/valkey-a.values.yaml
+    - repoURL: {{ .Values.repoUrls.deploy }}
+      targetRevision: HEAD
+      ref: deployRepo
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: false
diff --git a/charts/argocd-apps/templates/valkey-b.yaml b/charts/argocd-apps/templates/valkey-b.yaml
new file mode 100644
index 0000000..79ad36e
--- /dev/null
+++ b/charts/argocd-apps/templates/valkey-b.yaml
@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: valkey-b
+  namespace: argocd
+spec:
+  destination:
+    namespace: default
+    server: {{ .Values.clusterUrl }}
+  project: {{ .Values.environment }}
+  sources:
+    - repoURL: https://github.com/wbstack/valkey-helm.git
+      targetRevision: {{ .Values.chartVersions.valkeyB }}
+      path: charts/valkey
+      helm:
+        valueFiles:
+          - $deployRepo/k8s/argocd/production/valkey-b.values.yaml
+          - $deployRepo/k8s/argocd/{{ .Values.environment }}/valkey-b.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 35133e7..aaa1e68 100644
--- a/charts/argocd-apps/values.yaml
+++ b/charts/argocd-apps/values.yaml
@@ -8,4 +8,6 @@ chartVersions:
   wbaasUi: 0.4.0
   wbaasApi: 0.32.1
   trivyOperator: 0.32.1
+  valkeyA: valkey-0.12.1
+  valkeyB: valkey-0.12.1
 # "inherits" values from argocd-config chart

From b993a785f6bf89d37351ade798afa4b2f5b3bc7f Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Fri, 30 Oct 2026 15:32:20 +0100
Subject: [PATCH 2/3] changelog

---
 charts/argocd-apps/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md
index 95b3081..8a62574 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.6.0
+- adds two valkey deployments: a & b
+
 ## 2.5.1
 - fix trivy operator value file references
 

From e7f330874bdd58404d695fad7e9447f59ac4bfc7 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Fri, 30 Oct 2026 15:45:34 +0100
Subject: [PATCH 3/3] changelog

---
 charts/argocd-apps/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md
index 8a62574..b938978 100644
--- a/charts/argocd-apps/README.md
+++ b/charts/argocd-apps/README.md
@@ -4,7 +4,7 @@ Deploys actual `Application` manifests for Argo CD. This chart gets treated as i
 
 ## Changelog
 ## 2.6.0
-- adds two valkey deployments: a & b
+- add two valkey deployments a & b
 
 ## 2.5.1
 - fix trivy operator value file references