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

Reformatting

Browse Source
This commit is contained in:
2martens
2023-11-04 14:55:09 +01:00
parent 9bd74debf5
commit 47d10ed2c5
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
terraform/modules/k8s-cluster/manager-node.tf
+7 -3
View File
@@ -60,21 +60,26 @@ resource "hcloud_server" "manager" {
allow_deprecated_images = false allow_deprecated_images = false
server_type = var.server_type server_type = var.server_type
location = element(var.locations.*.name, count.index) location = element(var.locations.*.name, count.index)
public_net { public_net {
ipv4_enabled = var.create_loadbalancer ? false : true ipv4_enabled = var.create_loadbalancer ? false : true
ipv4 = var.create_loadbalancer ? null : hcloud_primary_ip.ipv4_manager_address[count.index].id ipv4 = var.create_loadbalancer ? null : hcloud_primary_ip.ipv4_manager_address[count.index].id
ipv6_enabled = true ipv6_enabled = true
ipv6 = hcloud_primary_ip.ipv6_manager_address[count.index].id ipv6 = hcloud_primary_ip.ipv6_manager_address[count.index].id
} }
ignore_remote_firewall_ids = false ignore_remote_firewall_ids = false
keep_disk = false keep_disk = false
placement_group_id = data.hcloud_placement_group.default.id placement_group_id = data.hcloud_placement_group.default.id
firewall_ids = [var.basic_firewall_id, var.k8s_firewall_id]
ssh_keys = [var.admin_ssh_key.id]
shutdown_before_deletion = true
labels = { labels = {
"kubernetes" : "yes", "kubernetes" : "yes",
"manager" : "yes" "manager" : "yes"
} }
firewall_ids = [var.basic_firewall_id, var.k8s_firewall_id]
ssh_keys = [var.admin_ssh_key.id]
user_data = templatefile("${path.module}/templates/cloud-init-k8s.tftpl", { user_data = templatefile("${path.module}/templates/cloud-init-k8s.tftpl", {
node_ip : var.private_node_ips[count.index], node_ip : var.private_node_ips[count.index],
admin_public_ssh_key : format("%s %s", var.admin_ssh_key.public_key, var.admin_ssh_key.name), admin_public_ssh_key : format("%s %s", var.admin_ssh_key.public_key, var.admin_ssh_key.name),
@@ -86,7 +91,6 @@ resource "hcloud_server" "manager" {
api_server_domain : local.kube_api_server_domain api_server_domain : local.kube_api_server_domain
})) }))
}) })
shutdown_before_deletion = true
network { network {
network_id = var.network_id network_id = var.network_id
terraform/modules/k8s-cluster/worker-node.tf
+5 -3
View File
@@ -50,12 +50,15 @@ resource "hcloud_server" "worker" {
ignore_remote_firewall_ids = false ignore_remote_firewall_ids = false
keep_disk = false keep_disk = false
placement_group_id = data.hcloud_placement_group.default.id placement_group_id = data.hcloud_placement_group.default.id
firewall_ids = [var.basic_firewall_id, var.k8s_firewall_id]
ssh_keys = [var.admin_ssh_key.id]
shutdown_before_deletion = true
labels = { labels = {
"kubernetes" : "yes", "kubernetes" : "yes",
"worker" : "yes" "worker" : "yes"
} }
firewall_ids = [var.basic_firewall_id, var.k8s_firewall_id]
ssh_keys = [var.admin_ssh_key.id]
user_data = templatefile("${path.module}/templates/cloud-init-k8s.tftpl", { user_data = templatefile("${path.module}/templates/cloud-init-k8s.tftpl", {
node_ip : var.private_worker_node_ips[count.index], node_ip : var.private_worker_node_ips[count.index],
admin_public_ssh_key : format("%s %s", var.admin_ssh_key.public_key, var.admin_ssh_key.name), admin_public_ssh_key : format("%s %s", var.admin_ssh_key.public_key, var.admin_ssh_key.name),
@@ -67,7 +70,6 @@ resource "hcloud_server" "worker" {
api_server_domain : local.kube_api_server_domain api_server_domain : local.kube_api_server_domain
})) }))
}) })
shutdown_before_deletion = true
network { network {
network_id = var.network_id network_id = var.network_id