diff --git a/terraform/modules/k8s-cluster/manager-node.tf b/terraform/modules/k8s-cluster/manager-node.tf index b2bfef1..10b40b0 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" { 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 diff --git a/terraform/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl b/terraform/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl index c05b046..0181f10 100644 --- a/terraform/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl +++ b/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 diff --git a/terraform/modules/k8s-cluster/templates/helm/argocd-values.yaml b/terraform/modules/k8s-cluster/templates/helm/argocd-values.yaml new file mode 100644 index 0000000..e69de29 diff --git a/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh b/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh index f409ebf..86ae096 100644 --- a/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh +++ b/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}