Provide variables file for non-ha argo cd as well

terraform/modules/k8s-cluster/manager-node.tf

@@ -115,6 +115,7 @@ resource "hcloud_server" "manager" {
       allowed_namespaces : var.vault_allowed_namespaces
     }))
     argocd_ha_values : base64encode(file("${path.module}/templates/helm/argocd-values-ha.yaml"))
+    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

terraform/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl

@@ -61,6 +61,11 @@ write_files:
     path: /run/tmpfiles.d/argocd-values-ha.yaml
     encoding: base64
     defer: true
+  - owner: root:root
+    content: "${argocd_values}"
+    path: /run/tmpfiles.d/argocd-values.yaml
+    encoding: base64
+    defer: true
 %{ endif ~}
 runcmd:
   - install /run/tmpfiles.d/*.sh /usr/local/bin

terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh

@@ -16,6 +16,6 @@ chown -R ${admin_user}:${admin_user} /home/${admin_user}/.kube
 %{ if high_availability ~}
 /snap/bin/microk8s.helm3 install argo-cd argo/argo-cd --create-namespace -n argocd --values /run/tmpfiles.d/argocd-values-ha.yaml
 %{ else ~}
-/snap/bin/microk8s.helm3 install argo-cd argo/argo-cd --create-namespace -n argocd
+/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}