kjuulh/terraform-hcloud-kube-hetzner
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

not hardcode the ip allocation for agents

Browse Source
This commit is contained in:
jodhi 2022-02-24 22:49:36 +07:00
parent 7d301f2c6d
commit 58c630ba78
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agents.tf
View File

@ -12,7 +12,6 @@ module "agents" {
placement_group_id = hcloud_placement_group.k3s.id placement_group_id = hcloud_placement_group.k3s.id
location = var.location location = var.location
network_id = hcloud_network.k3s.id network_id = hcloud_network.k3s.id
ip = cidrhost(hcloud_network_subnet.k3s.ip_range, 513 + each.value.index)
server_type = each.value.server_type server_type = each.value.server_type
labels = { labels = {
@ -45,7 +44,7 @@ resource "null_resource" "agents" {
token = random_password.k3s_token.result token = random_password.k3s_token.result
kubelet-arg = "cloud-provider=external" kubelet-arg = "cloud-provider=external"
flannel-iface = "eth1" flannel-iface = "eth1"
node-ip = cidrhost(hcloud_network_subnet.k3s.ip_range, 513 + each.value.index) node-ip = module.agents[each.key].ipv4_address
node-label = var.automatically_upgrade_k3s ? ["k3s_upgrade=true"] : [] node-label = var.automatically_upgrade_k3s ? ["k3s_upgrade=true"] : []
}) })
destination = "/tmp/config.yaml" destination = "/tmp/config.yaml"

2
locals.tf
View File

@ -33,7 +33,7 @@ locals {
agent_nodepools = merge([ agent_nodepools = merge([
for nodepool_name, nodepool_obj in var.agent_nodepools : { for nodepool_name, nodepool_obj in var.agent_nodepools : {
for index in range(nodepool_obj.count) : for index in range(lookup(nodepool_obj, "count", var.agents_num)) :
format("%s-%s", nodepool_name, index) => { format("%s-%s", nodepool_name, index) => {
index : index, # just for the compatibility with previous structure index : index, # just for the compatibility with previous structure
server_type : nodepool_obj.server_type server_type : nodepool_obj.server_type

2
modules/host/main.tf
View File

@ -14,7 +14,7 @@ resource "hcloud_server" "server" {
network { network {
network_id = var.network_id network_id = var.network_id
ip = var.ip ip = try(var.ip, null)
} }
connection { connection {

1
modules/host/variables.tf
View File

@ -60,6 +60,7 @@ variable "network_id" {
} }
variable "ip" { variable "ip" {
default = null
description = "The IP" description = "The IP"
type = string type = string
nullable = true nullable = true

10
variables.tf
View File

@ -52,12 +52,14 @@ variable "servers_num" {
type = number type = number
} }
variable "agents_num" {
description = "Default agent server type"
type = number
}
variable "agent_nodepools" { variable "agent_nodepools" {
description = "Number of agent nodes." description = "Number of agent nodes."
type = map(object({ type = map(any)
server_type = string
count = number
}))
} }
variable "hetzner_ccm_version" { variable "hetzner_ccm_version" {