Skip to content

Commit 250b4c7

Browse files
committed
remove local DNS as a dependency for k3s
1 parent ce82f59 commit 250b4c7

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

environments/skeleton/{{cookiecutter.environment}}/terraform/compute.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ module "compute" {
1616
key_pair = var.key_pair
1717
environment_root = var.environment_root
1818
k3s_token = var.k3s_token
19+
k3s_server = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
1920
security_group_ids = [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id]
2021
}

environments/skeleton/{{cookiecutter.environment}}/terraform/compute/nodes.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ resource "openstack_compute_instance_v2" "compute" {
4747
metadata = {
4848
environment_root = var.environment_root
4949
k3s_token = var.k3s_token
50-
k3s_server = "${var.cluster_name}-control"
50+
k3s_server = var.k3s_server
5151
k3s_node_type = "agent"
5252
}
5353

environments/skeleton/{{cookiecutter.environment}}/terraform/compute/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,8 @@ variable "k3s_token" {
7272
description = "Random cryptographically secure string for K3s token (must be set by ../compute.tf)"
7373
type = string
7474
}
75+
76+
variable "k3s_server" {
77+
description = "Name/address of k3s server"
78+
type = string
79+
}

environments/skeleton/{{cookiecutter.environment}}/terraform/nodes.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ resource "openstack_compute_instance_v2" "control" {
7777
metadata = {
7878
environment_root = var.environment_root
7979
k3s_token = var.k3s_token
80-
k3s_server = "${var.cluster_name}-control"
80+
k3s_server = "" # think this can go?
8181
k3s_node_type = "server"
8282
}
8383

@@ -128,7 +128,7 @@ resource "openstack_compute_instance_v2" "login" {
128128
metadata = {
129129
environment_root = var.environment_root
130130
k3s_token = var.k3s_token
131-
k3s_server = "${var.cluster_name}-control"
131+
k3s_server = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
132132
k3s_node_type = "agent"
133133
}
134134

0 commit comments

Comments
 (0)