From 4465165da0fbe8ac25894cabe9269dbbe23bbe62 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Mon, 6 Nov 2023 08:07:39 +0100
Subject: [PATCH] Removed argocd_version and obsolete variables passed for the
 workers

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

diff --git a/terraform/modules/k8s-cluster/manager-node.tf b/terraform/modules/k8s-cluster/manager-node.tf
index 10b40b0..81c601b 100644
--- a/terraform/modules/k8s-cluster/manager-node.tf
+++ b/terraform/modules/k8s-cluster/manager-node.tf
@@ -118,7 +118,6 @@ resource "hcloud_server" "manager" {
     argocd_values : base64encode(file("${path.module}/templates/helm/argocd-values.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
       admin_user : var.admin_user
     }))
diff --git a/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh b/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh
index 1a18394..d28f306 100644
--- a/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh
+++ b/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh
@@ -16,4 +16,4 @@ chown -R ${admin_user}:${admin_user} /home/${admin_user}/.kube
 %{ else ~}
 /snap/bin/microk8s.helm3 install argo-cd argo/argo-cd --create-namespace -n argocd --values /run/tmpfiles.d/argocd-values.yaml
 %{ endif ~}
-/snap/bin/microk8s.helm3 install argocd-config 2martens/argocd-configuration -n argocd --version ${argocd_version} --set environment=${argocd_environment}
+/snap/bin/microk8s.helm3 install argocd-config 2martens/argocd-configuration -n argocd --set environment=${argocd_environment}
diff --git a/terraform/modules/k8s-cluster/variables.tf b/terraform/modules/k8s-cluster/variables.tf
index 0802a57..605d3f9 100644
--- a/terraform/modules/k8s-cluster/variables.tf
+++ b/terraform/modules/k8s-cluster/variables.tf
@@ -86,12 +86,6 @@ variable "argocd_environment" {
   default     = "test"
 }
 
-variable "argocd_chart_version" {
-  description = "The Argo CD chart version to use."
-  type        = string
-  default     = "0.1.2"
-}
-
 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 fe6b9a4..bbb8e81 100644
--- a/terraform/modules/k8s-cluster/worker-node.tf
+++ b/terraform/modules/k8s-cluster/worker-node.tf
@@ -88,17 +88,6 @@ resource "hcloud_server" "worker" {
       main_node : false
       manager_node : false
     }))
-    cluster_setup_values : base64encode(templatefile("${path.module}/templates/helm/cluster-setup-values.yaml", {
-      client_id : var.vault_service_principal.client_id
-      client_secret : var.vault_service_principal.client_secret
-    }))
-    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
-      admin_user : var.admin_user
-    }))
   })
 
   network {