fixup! remove konnectivity

We cannot remove the loadbalancer that early since the terrafrom is migrated first, but the cluster still has konnectivity installed.
edgelesssys · Nov 15, 2023 · 2e620a1 · 2e620a1
1 parent 0d4d3c3
commit 2e620a1
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/terraform/infrastructure/aws/main.tf b/terraform/infrastructure/aws/main.tf
@@ -26,6 +26,7 @@ locals {
     { name = "kubernetes", port = "6443", health_check = "HTTPS" },
     { name = "bootstrapper", port = "9000", health_check = "TCP" },
     { name = "verify", port = "30081", health_check = "TCP" },
+    { name = "konnectivity", port = "8132", health_check = "TCP" },
     { name = "recovery", port = "9999", health_check = "TCP" },
     { name = "join", port = "30090", health_check = "TCP" },
     var.debug ? [{ name = "debugd", port = "4000", health_check = "TCP" }] : [],
@@ -221,6 +222,11 @@ module "jump_host" {
 }
 
 # TODO(31u3r): Remove once 2.12 is released
+moved {
+  from = module.load_balancer_target_konnectivity
+  to   = module.load_balancer_targets["konnectivity"]
+}
+
 moved {
   from = module.load_balancer_target_verify
   to   = module.load_balancer_targets["verify"]

diff --git a/terraform/infrastructure/azure/main.tf b/terraform/infrastructure/azure/main.tf
@@ -32,6 +32,7 @@ locals {
     { name = "kubernetes", port = "6443", health_check_protocol = "Https", path = "/readyz", priority = 100 },
     { name = "bootstrapper", port = "9000", health_check_protocol = "Tcp", path = null, priority = 101 },
     { name = "verify", port = "30081", health_check_protocol = "Tcp", path = null, priority = 102 },
+    { name = "konnectivity", port = "8132", health_check_protocol = "Tcp", path = null, priority = 103 },
     { name = "recovery", port = "9999", health_check_protocol = "Tcp", path = null, priority = 104 },
     { name = "join", port = "30090", health_check_protocol = "Tcp", path = null, priority = 105 },
     var.debug ? [{ name = "debugd", port = "4000", health_check_protocol = "Tcp", path = null, priority = 106 }] : [],

diff --git a/terraform/infrastructure/gcp/main.tf b/terraform/infrastructure/gcp/main.tf
@@ -46,6 +46,7 @@ locals {
     { name = "kubernetes", port = "6443", health_check = "HTTPS" },
     { name = "bootstrapper", port = "9000", health_check = "TCP" },
     { name = "verify", port = "30081", health_check = "TCP" },
+    { name = "konnectivity", port = "8132", health_check = "TCP" },
     { name = "recovery", port = "9999", health_check = "TCP" },
     { name = "join", port = "30090", health_check = "TCP" },
     var.debug ? [{ name = "debugd", port = "4000", health_check = "TCP" }] : [],
@@ -258,6 +259,11 @@ moved {
   to   = module.loadbalancer_public["verify"]
 }
 
+moved {
+  from = module.loadbalancer_konnectivity
+  to   = module.loadbalancer_public["konnectivity"]
+}
+
 moved {
   from = module.loadbalancer_recovery
   to   = module.loadbalancer_public["recovery"]

diff --git a/terraform/infrastructure/openstack/main.tf b/terraform/infrastructure/openstack/main.tf
@@ -28,6 +28,7 @@ locals {
   ports_node_range_end   = "32767"
   ports_kubernetes       = "6443"
   ports_bootstrapper     = "9000"
+  ports_konnectivity     = "8132"
   ports_verify           = "30081"
   ports_recovery         = "9999"
   ports_debugd           = "4000"
@@ -143,6 +144,7 @@ resource "openstack_compute_secgroup_v2" "vpc_secgroup" {
     for_each = flatten([
       local.ports_kubernetes,
       local.ports_bootstrapper,
+      local.ports_konnectivity,
       local.ports_verify,
       local.ports_recovery,
       var.debug ? [local.ports_debugd] : [],
@@ -246,6 +248,24 @@ moved {
 #   port            = local.ports_verify
 # }
 
+# module "loadbalancer_konnectivity" {
+#   source          = "./modules/loadbalancer"
+#   name            = "${local.name}-konnectivity"
+#   member_ips      = module.instance_group_control_plane.ips
+#   loadbalancer_id = openstack_lb_loadbalancer_v2.loadbalancer.id
+#   subnet_id       = openstack_networking_subnet_v2.vpc_subnetwork.id
+#   port            = local.ports_konnectivity
+# }
+
+# module "loadbalancer_konnectivity" {
+#   source          = "./modules/loadbalancer"
+#   name            = "${local.name}-konnectivity"
+#   member_ips      = module.instance_group_control_plane.ips
+#   loadbalancer_id = openstack_lb_loadbalancer_v2.loadbalancer.id
+#   subnet_id       = openstack_networking_subnet_v2.vpc_subnetwork.id
+#   port            = local.ports_konnectivity
+# }
+
 # module "loadbalancer_recovery" {
 #   source          = "./modules/loadbalancer"
 #   name            = "${local.name}-recovery"