From 38df9786b12552166d1f86bdb888dfe19b9d11c9 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sat, 4 Nov 2023 19:21:45 +0100 Subject: [PATCH] Add cluster again --- terraform/main.tf | 82 +++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/terraform/main.tf b/terraform/main.tf index b3aad94..ce67fc9 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -22,44 +22,44 @@ locals { domain = "2martens.de" } -#module "test_cluster" { -# source = "./modules/k8s-cluster" -# -# admin_ssh_key = data.hcloud_ssh_key.macos -# admin_user = "2martensAdmin" -# admin_email = "admin@2martens.de" -# terraform_public_ssh_key = var.terraform_public_ssh_key -# terraform_private_ssh_key = var.terraform_private_ssh_key -# basic_firewall_id = hcloud_firewall.basic-firewall.id -# k8s_firewall_id = hcloud_firewall.k8s-firewall.id -# locations = [{ -# id = data.hcloud_location.falkenstein.id, -# name = data.hcloud_location.falkenstein.name, -# datacenter_name = data.hcloud_datacenter.falkenstein.name, -# network_zone = data.hcloud_location.falkenstein.network_zone -# }, { -# id = data.hcloud_location.nuremberg.id, -# name = data.hcloud_location.nuremberg.name, -# datacenter_name = data.hcloud_datacenter.nuremberg.name, -# network_zone = data.hcloud_location.nuremberg.network_zone -# }] -# domain = local.domain -# network_id = hcloud_network.kubernetes-network.id -# private_node_ips = [ -# cidrhost(hcloud_network_subnet.k8s-network-subnet.ip_range, 4), -# cidrhost(hcloud_network_subnet.k8s-network-subnet.ip_range, 5), -# cidrhost(hcloud_network_subnet.k8s-network-subnet.ip_range, 6) -# ] -# server_subnet_id = hcloud_network_subnet.k8s-network-subnet.id -# cluster_name = "test" -# argocd_environment = "test" -# number_nodes = 1 -# server_type = "cax21" -# image_name = "ubuntu-22.04" -# create_loadbalancer = false -# loadbalancer_ip = cidrhost(hcloud_network_subnet.k8s-network-subnet.ip_range, 3) -# vault_service_principal = { -# client_id : var.vault_client_id -# client_secret : var.vault_client_secret -# } -#} \ No newline at end of file +module "test_cluster" { + source = "./modules/k8s-cluster" + + admin_ssh_key = data.hcloud_ssh_key.macos + admin_user = "2martensAdmin" + admin_email = "admin@2martens.de" + terraform_public_ssh_key = var.terraform_public_ssh_key + terraform_private_ssh_key = var.terraform_private_ssh_key + basic_firewall_id = hcloud_firewall.basic-firewall.id + k8s_firewall_id = hcloud_firewall.k8s-firewall.id + locations = [{ + id = data.hcloud_location.falkenstein.id, + name = data.hcloud_location.falkenstein.name, + datacenter_name = data.hcloud_datacenter.falkenstein.name, + network_zone = data.hcloud_location.falkenstein.network_zone + }, { + id = data.hcloud_location.nuremberg.id, + name = data.hcloud_location.nuremberg.name, + datacenter_name = data.hcloud_datacenter.nuremberg.name, + network_zone = data.hcloud_location.nuremberg.network_zone + }] + domain = local.domain + network_id = hcloud_network.kubernetes-network.id + private_node_ips = [ + cidrhost(hcloud_network_subnet.k8s-network-subnet.ip_range, 4), + cidrhost(hcloud_network_subnet.k8s-network-subnet.ip_range, 5), + cidrhost(hcloud_network_subnet.k8s-network-subnet.ip_range, 6) + ] + server_subnet_id = hcloud_network_subnet.k8s-network-subnet.id + cluster_name = "test" + argocd_environment = "test" + number_nodes = 1 + server_type = "cax21" + image_name = "ubuntu-22.04" + create_loadbalancer = false + loadbalancer_ip = cidrhost(hcloud_network_subnet.k8s-network-subnet.ip_range, 3) + vault_service_principal = { + client_id : var.vault_client_id + client_secret : var.vault_client_secret + } +} \ No newline at end of file