From b38c5f72df4f088c5c22707a6d68613f1525f146 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 5 Nov 2023 12:08:29 +0100 Subject: [PATCH] Remove obsolete resources --- terraform/hetzner.tf | 102 ------------------ terraform/ingress-apps.tf | 8 -- terraform/modules/k8s-cluster/manager-node.tf | 2 +- 3 files changed, 1 insertion(+), 111 deletions(-) diff --git a/terraform/hetzner.tf b/terraform/hetzner.tf index 02c5316..882b9cb 100644 --- a/terraform/hetzner.tf +++ b/terraform/hetzner.tf @@ -71,11 +71,6 @@ resource "hcloud_firewall" "basic-firewall" { } } -resource "hcloud_firewall_attachment" "basic-firewall_attachment" { - firewall_id = hcloud_firewall.basic-firewall.id - server_ids = [hcloud_server.server_devops.id, hcloud_server.server_k8s_test.id] -} - resource "hcloud_firewall" "k8s-firewall" { name = "k8s-firewall" rule { @@ -90,11 +85,6 @@ resource "hcloud_firewall" "k8s-firewall" { } } -resource "hcloud_firewall_attachment" "k8s-firewall_attachment" { - firewall_id = hcloud_firewall.k8s-firewall.id - server_ids = [hcloud_server.server_k8s_test.id] -} - // servers resource "hcloud_primary_ip" "primary_ipv4_devops" { name = "primary_ipv4_devops" @@ -142,98 +132,6 @@ resource "hcloud_server" "server_devops" { } } -resource "hcloud_primary_ip" "primary_ipv4_k8s_test" { - name = "primary_ipv4_applications" - datacenter = data.hcloud_datacenter.falkenstein.name - type = "ipv4" - assignee_type = "server" - auto_delete = false -} - -resource "hcloud_primary_ip" "primary_ipv6_k8s_test" { - name = "primary_ipv6_applications" - datacenter = data.hcloud_datacenter.falkenstein.name - type = "ipv6" - assignee_type = "server" - auto_delete = false -} - -resource "hcloud_server" "server_k8s_test" { - name = "applications" - image = "ubuntu-22.04" - allow_deprecated_images = false - server_type = "cax21" - location = data.hcloud_location.falkenstein.name - public_net { - ipv4_enabled = true - ipv4 = hcloud_primary_ip.primary_ipv4_k8s_test.id - ipv6_enabled = true - ipv6 = hcloud_primary_ip.primary_ipv6_k8s_test.id - } - ignore_remote_firewall_ids = false - keep_disk = false - placement_group_id = data.hcloud_placement_group.default.id - labels = { - "kubernetes" : "yes" - } - firewall_ids = [hcloud_firewall.basic-firewall.id, hcloud_firewall.k8s-firewall.id] - ssh_keys = [data.hcloud_ssh_key.macos.id] - user_data = templatefile("${path.module}/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl", { - admin_public_ssh_key : format("%s %s", data.hcloud_ssh_key.macos.public_key, data.hcloud_ssh_key.macos.name) - admin_user : "2martensAdmin" - terraform_public_ssh_key : var.terraform_public_ssh_key - main_node : true - microk8s_config : base64encode(templatefile("${path.module}/modules/k8s-cluster/templates/snap/microk8s-config-manager.tftpl", { - node_ip : "10.0.0.2" - api_server_domain : "" - api_server_ip : hcloud_primary_ip.primary_ipv4_k8s_test.ip_address - main_node : true - main_node_ip : "10.0.0.2" - cluster_token : "" - })) - snapcraft : base64encode(file("${path.module}/modules/k8s-cluster/templates/snap/snapcraft.yaml")) - packages_setup : base64encode(templatefile("${path.module}/modules/k8s-cluster/templates/scripts/install-packages.sh", { - refresh_day : "fri" - refresh_hour : format("%02d", 0) - })) - firewall_setup : base64encode(templatefile("${path.module}/modules/k8s-cluster/templates/scripts/firewall-setup.sh", { - node_ip : "10.0.0.2" - })) - ssh_setup : base64encode(templatefile("${path.module}/modules/k8s-cluster/templates/scripts/ssh-setup.sh", { - admin_user : "2martensAdmin" - })) - microk8s_setup : base64encode(templatefile("${path.module}/modules/k8s-cluster/templates/scripts/microk8s-setup.sh", { - microk8s_channel : "1.28-strict/stable" - main_node : true - manager_node : true - })) - cluster_setup_values : base64encode(templatefile("${path.module}/modules/k8s-cluster/templates/helm/cluster-setup-values.yaml", { - client_id : var.vault_client_id - client_secret : var.vault_client_secret - })) - argocd_ha_values : base64encode(file("${path.module}/modules/k8s-cluster/templates/helm/argocd-values-ha.yaml")) - cluster_setup : base64encode(templatefile("${path.module}/modules/k8s-cluster/templates/scripts/cluster-setup.sh", { - argocd_environment : "test" - argocd_version : "0.1.2" - high_availability : false - admin_user : "2martensAdmin" - })) - }) - shutdown_before_deletion = true - - network { - network_id = hcloud_network.kubernetes-network.id - ip = "10.0.0.2" - alias_ips = [] - } - - lifecycle { - ignore_changes = [ssh_keys, user_data] - } - - depends_on = [hcloud_network_subnet.k8s-network-subnet] -} - module "drone_domain" { source = "./modules/domain" domain = local.domain diff --git a/terraform/ingress-apps.tf b/terraform/ingress-apps.tf index 26f5217..903bbd8 100644 --- a/terraform/ingress-apps.tf +++ b/terraform/ingress-apps.tf @@ -1,11 +1,3 @@ -module "argocd_domain" { - source = "./modules/domain" - domain = local.domain - subdomain = "argocd" - ipv4 = "49.13.77.70" - ipv6 = "2a01:4f8:c012:4d25::1" -} - module "api_domain" { source = "./modules/domain" domain = local.domain diff --git a/terraform/modules/k8s-cluster/manager-node.tf b/terraform/modules/k8s-cluster/manager-node.tf index 2766f48..086d189 100644 --- a/terraform/modules/k8s-cluster/manager-node.tf +++ b/terraform/modules/k8s-cluster/manager-node.tf @@ -129,7 +129,7 @@ resource "hcloud_server" "manager" { } lifecycle { - ignore_changes = [ssh_keys] + ignore_changes = [ssh_keys, user_data] } }