From 0ceff128c5e853fed6f29a4e13531972c69b4b7d Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Mon, 27 Sep 2021 22:06:50 +0200
Subject: [PATCH] chore(argo-cd): Add chart tests for HA

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argo-cd/.helmignore                   |  1 +
 charts/argo-cd/Chart.yaml                    |  4 ++--
 charts/argo-cd/ci/default-values.yaml        |  1 +
 charts/argo-cd/ci/ha-autoscaling-values.yaml | 16 ++++++++++++++++
 charts/argo-cd/ci/ha-static-values.yaml      | 15 +++++++++++++++
 5 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 charts/argo-cd/ci/default-values.yaml
 create mode 100644 charts/argo-cd/ci/ha-autoscaling-values.yaml
 create mode 100644 charts/argo-cd/ci/ha-static-values.yaml

diff --git a/charts/argo-cd/.helmignore b/charts/argo-cd/.helmignore
index 94c89570..ebf177fc 100644
--- a/charts/argo-cd/.helmignore
+++ b/charts/argo-cd/.helmignore
@@ -1,2 +1,3 @@
 /*.tgz
 output
+ci/
diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 693a3e16..157ba164 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.1.3
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.25.2
+version: 3.25.3
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -21,4 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Reorganize some files in repo, move applications.yaml and projects.yaml into argocd-configs."
+    - "[Added]: Chart testing for HA setups"
diff --git a/charts/argo-cd/ci/default-values.yaml b/charts/argo-cd/ci/default-values.yaml
new file mode 100644
index 00000000..507f1e54
--- /dev/null
+++ b/charts/argo-cd/ci/default-values.yaml
@@ -0,0 +1 @@
+# Test with default values
diff --git a/charts/argo-cd/ci/ha-autoscaling-values.yaml b/charts/argo-cd/ci/ha-autoscaling-values.yaml
new file mode 100644
index 00000000..b9a9e535
--- /dev/null
+++ b/charts/argo-cd/ci/ha-autoscaling-values.yaml
@@ -0,0 +1,16 @@
+# Test High Availability with autoscaling
+redis-ha:
+  enabled: true
+
+controller:
+  enableStatefulSet: true
+
+server:
+  autoscaling:
+    enabled: true
+    minReplicas: 2
+
+repoServer:
+  autoscaling:
+    enabled: true
+    minReplicas: 2
diff --git a/charts/argo-cd/ci/ha-static-values.yaml b/charts/argo-cd/ci/ha-static-values.yaml
new file mode 100644
index 00000000..7acda8d1
--- /dev/null
+++ b/charts/argo-cd/ci/ha-static-values.yaml
@@ -0,0 +1,15 @@
+# Test High Availability without autoscaling
+redis-ha:
+  enabled: true
+
+controller:
+  enableStatefulSet: true
+
+server:
+  replicas: 2
+  env:
+    - name: ARGOCD_API_SERVER_REPLICAS
+      value: '2'
+
+repoServer:
+  replicas: 2