From 7c7d1fca8d79a278cb8db1cbe2db25269ebfcf7b Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Sat, 4 Nov 2023 23:04:43 +0100
Subject: [PATCH] Use older version of Argo CD

---
 terraform/hetzner.tf                                        | 1 +
 terraform/modules/k8s-cluster/manager-node.tf               | 1 +
 .../modules/k8s-cluster/templates/scripts/cluster-setup.sh  | 4 ++--
 terraform/modules/k8s-cluster/variables.tf                  | 6 ++++++
 terraform/modules/k8s-cluster/worker-node.tf                | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/terraform/hetzner.tf b/terraform/hetzner.tf
index 9f4daa2..851e8fb 100644
--- a/terraform/hetzner.tf
+++ b/terraform/hetzner.tf
@@ -213,6 +213,7 @@ resource "hcloud_server" "server_k8s_test" {
     argocd_ha_values : base64encode(file("${path.module}/modules/k8s-cluster/templates/helm/argocd-values-ha.yaml"))
     cluster_setup : base64encode(templatefile("${path.module}/modules/k8s-cluster/templates/scripts/cluster-setup.sh", {
       argocd_environment : "test"
+      argocd_version : "5.34.3"
       high_availability : false
     }))
   })
diff --git a/terraform/modules/k8s-cluster/manager-node.tf b/terraform/modules/k8s-cluster/manager-node.tf
index 3ec827c..104abe3 100644
--- a/terraform/modules/k8s-cluster/manager-node.tf
+++ b/terraform/modules/k8s-cluster/manager-node.tf
@@ -115,6 +115,7 @@ resource "hcloud_server" "manager" {
     argocd_ha_values : base64encode(file("${path.module}/templates/helm/argocd-values-ha.yaml"))
     cluster_setup : base64encode(templatefile("${path.module}/templates/scripts/cluster-setup.sh", {
       argocd_environment : var.argocd_environment
+      argocd_version : var.argocd_chart_version
       high_availability : var.number_nodes > 2
     }))
   })
diff --git a/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh b/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh
index 642a871..9060c27 100644
--- a/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh
+++ b/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh
@@ -7,7 +7,7 @@ done
 /snap/bin/microk8s.helm3 repo add 2martens https://repo.2martens.de/charts/
 /snap/bin/microk8s.helm3 install setup 2martens/cluster_setup --values /run/tmpfiles.d/cluster-setup-values.yaml
 %{ if high_availability ~}
-/snap/bin/microk8s.helm3 install argo-cd 2martens/argocd --create-namespace -n argocd --set environment=${argocd_environment} --values /run/tmpfiles.d/argocd-values-ha.yaml
+/snap/bin/microk8s.helm3 install argo-cd 2martens/argocd --create-namespace -n argocd --version ${argocd_version} --set environment=${argocd_environment} --values /run/tmpfiles.d/argocd-values-ha.yaml
 %{ else ~}
-/snap/bin/microk8s.helm3 install argo-cd 2martens/argocd --create-namespace -n argocd --set environment=${argocd_environment}
+/snap/bin/microk8s.helm3 install argo-cd 2martens/argocd --create-namespace -n argocd --version ${argocd_version} --set environment=${argocd_environment}
 %{ endif ~}
\ No newline at end of file
diff --git a/terraform/modules/k8s-cluster/variables.tf b/terraform/modules/k8s-cluster/variables.tf
index 03180cc..5370770 100644
--- a/terraform/modules/k8s-cluster/variables.tf
+++ b/terraform/modules/k8s-cluster/variables.tf
@@ -86,6 +86,12 @@ variable "argocd_environment" {
   default     = "test"
 }
 
+variable "argocd_chart_version" {
+  description = "The Argo CD chart version to use."
+  type        = string
+  default     = "5.34.3"
+}
+
 variable "number_nodes" {
   description = "Number of manager nodes in the cluster."
   type        = number
diff --git a/terraform/modules/k8s-cluster/worker-node.tf b/terraform/modules/k8s-cluster/worker-node.tf
index f01b880..0045dd7 100644
--- a/terraform/modules/k8s-cluster/worker-node.tf
+++ b/terraform/modules/k8s-cluster/worker-node.tf
@@ -94,6 +94,7 @@ resource "hcloud_server" "worker" {
     argocd_ha_values : base64encode(file("${path.module}/templates/helm/argocd-values-ha.yaml"))
     cluster_setup : base64encode(templatefile("${path.module}/templates/scripts/cluster-setup.sh", {
       argocd_environment : var.argocd_environment
+      argocd_version : var.argocd_chart_version
       high_availability : var.number_nodes > 2
     }))
   })