Merge pull request #1034 from kube-hetzner/fix/lb-upgrade

Fix/lb upgrade
kube-hetzner · Oct 17, 2023 · 4405857 · 4405857 · eeriksen · Oct 23, 2023
2 parents 5cc05e4 + 3eaae1c
commit 4405857
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/init.tf b/init.tf
@@ -1,6 +1,6 @@
 resource "hcloud_load_balancer" "cluster" {
   count = local.has_external_load_balancer ? 0 : 1
-  name  = var.cluster_name
+  name  = local.load_balancer_name
 
   load_balancer_type = var.load_balancer_type
   location           = var.load_balancer_location

diff --git a/locals.tf b/locals.tf
@@ -158,6 +158,7 @@ locals {
   using_klipper_lb = var.enable_klipper_metal_lb || local.is_single_node_cluster
 
   has_external_load_balancer = local.using_klipper_lb || local.ingress_controller == "none"
+  load_balancer_name         = "${var.cluster_name}-${var.ingress_controller}"
 
   ingress_replica_count     = (var.ingress_replica_count > 0) ? var.ingress_replica_count : (local.agent_count > 2) ? 3 : (local.agent_count == 2) ? 2 : 1
   ingress_max_replica_count = (var.ingress_max_replica_count > local.ingress_replica_count) ? var.ingress_max_replica_count : local.ingress_replica_count
@@ -455,7 +456,7 @@ controller:
 %{if !local.using_klipper_lb~}
   service:
     annotations:
-      "load-balancer.hetzner.cloud/name": "${var.cluster_name}"
+      "load-balancer.hetzner.cloud/name": "${local.load_balancer_name}"
       "load-balancer.hetzner.cloud/use-private-ip": "true"
       "load-balancer.hetzner.cloud/disable-private-ingress": "true"
       "load-balancer.hetzner.cloud/disable-public-network": "${var.load_balancer_disable_public_network}"
@@ -482,7 +483,7 @@ service:
   type: LoadBalancer
 %{if !local.using_klipper_lb~}
   annotations:
-    "load-balancer.hetzner.cloud/name": "${var.cluster_name}"
+    "load-balancer.hetzner.cloud/name": "${local.load_balancer_name}"
     "load-balancer.hetzner.cloud/use-private-ip": "true"
     "load-balancer.hetzner.cloud/disable-private-ingress": "true"
     "load-balancer.hetzner.cloud/disable-public-network": "${var.load_balancer_disable_public_network}"