diff --git a/terraform/ansible.tf b/terraform/ansible.tf index 245e6f3..59b77e8 100644 --- a/terraform/ansible.tf +++ b/terraform/ansible.tf @@ -1,5 +1,5 @@ output "ansible_inventory" { - value = templatefile("${path.module}/inventory.tftpl", { + value = templatefile("${path.module}/templates/inventory.tftpl", { devops = hcloud_server.server_devops.ipv4_address, k8s_servers = [hcloud_server.server_k8s_test.ipv4_address] }) } \ No newline at end of file diff --git a/terraform/hetzner.tf b/terraform/hetzner.tf index 6929b0f..c64e7d9 100644 --- a/terraform/hetzner.tf +++ b/terraform/hetzner.tf @@ -154,7 +154,7 @@ resource "hcloud_server" "server_devops" { } firewall_ids = [hcloud_firewall.basic-firewall.id] ssh_keys = [data.hcloud_ssh_key.macos.id] - user_data = file("cloud-init.yaml") + user_data = file("${path.module}/templates/cloud-init.tftpl") shutdown_before_deletion = true lifecycle { @@ -196,9 +196,12 @@ resource "hcloud_server" "server_k8s_test" { 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 = file("cloud-init.yaml") + 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}/templates/cloud-init-k8s.tftpl", { + node_ip : "10.0.0.2", + cluster_token : "DkZaYY5JUAptUtq4HbXVb2x4HHD3HP7U" + }) shutdown_before_deletion = true network { diff --git a/terraform/cloud-init-k8s.yaml b/terraform/templates/cloud-init-k8s.tftpl similarity index 90% rename from terraform/cloud-init-k8s.yaml rename to terraform/templates/cloud-init-k8s.tftpl index 4c1d901..d51b8ae 100644 --- a/terraform/cloud-init-k8s.yaml +++ b/terraform/templates/cloud-init-k8s.tftpl @@ -31,5 +31,7 @@ runcmd: - apt install /tmp/hc-utils_0.0.4-1_all.deb - mkdir -p /var/snap/microk8s/common/ - curl https://repo.2martens.de/files/microk8s-config.yaml -o /var/snap/microk8s/common/.microk8s.yaml + - sed -i -e '/\$NODE_IP/s//${node_ip}/' /var/snap/microk8s/common/.microk8s.yaml + - sed -i -e '/\$CLUSTER_TOKEN/s//${cluster_token}/' /var/snap/microk8s/common/.microk8s.yaml - snap install microk8s --channel 1.28-strict/stable - reboot \ No newline at end of file diff --git a/terraform/cloud-init.yaml b/terraform/templates/cloud-init.tftpl similarity index 100% rename from terraform/cloud-init.yaml rename to terraform/templates/cloud-init.tftpl diff --git a/terraform/inventory.tftpl b/terraform/templates/inventory.tftpl similarity index 100% rename from terraform/inventory.tftpl rename to terraform/templates/inventory.tftpl