2martens/terraform
1
0
Fork 0
mirror of https://github.com/2martens/terraform.git synced 2026-10-17 14:36:50 +02:00
Code Issues Activity

Removed argocd_version and obsolete variables passed for the workers

Browse Source
This commit is contained in:
2martens
2023-11-06 08:07:39 +01:00
parent 990f479bd2
commit 4465165da0
4 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
terraform/modules/k8s-cluster/manager-node.tf
-1
View File
@@ -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
}))
terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh
+1 -1
View File
@@ -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}
terraform/modules/k8s-cluster/variables.tf
-6
View File
@@ -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
terraform/modules/k8s-cluster/worker-node.tf
-11
View File
@@ -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 {