From 74be557c4de9b49e10d9d02aabc1165ed7e274ee Mon Sep 17 00:00:00 2001
From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.>
Date: Wed, 14 Jan 2026 18:23:50 +0000
Subject: [PATCH 1/2] fix(iac): Fix k3s with floating ip

---
 .../openstack-kubernetes-infra/cloud-init-k3s-server.yaml      | 3 ++-
 .../terraform/modules/openstack-kubernetes-infra/compute.tf    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/deployment/terraform/modules/openstack-kubernetes-infra/cloud-init-k3s-server.yaml b/deployment/terraform/modules/openstack-kubernetes-infra/cloud-init-k3s-server.yaml
index 8d87e26..33838c3 100644
--- a/deployment/terraform/modules/openstack-kubernetes-infra/cloud-init-k3s-server.yaml
+++ b/deployment/terraform/modules/openstack-kubernetes-infra/cloud-init-k3s-server.yaml
@@ -40,12 +40,13 @@ runcmd:
   - |
     TF_K3S_TLS_SAN=${TF_K3S_TLS_SAN}
     TF_K3S_NODE_EXTERNAL_IP=${TF_K3S_NODE_EXTERNAL_IP}
+    TF_K3S_INTERNAL_IP=${TF_K3S_INTERNAL_IP}
     INSTALL_K3S_EXEC="server"
     if [ -n "$TF_K3S_TLS_SAN" ]; then
       INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC --tls-san $TF_K3S_TLS_SAN"
     fi
     if [ -n "$TF_K3S_NODE_EXTERNAL_IP" ]; then
-      INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC --node-external-ip $TF_K3S_NODE_EXTERNAL_IP"
+      INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC --node-external-ip $TF_K3S_NODE_EXTERNAL_IP --advertise-address $TF_K3S_INTERNAL_IP"
     fi
     sudo curl -sfL https://get.k3s.io | K3S_TOKEN="${TF_K3S_TOKEN}" INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC" sh -
   - echo "Completed Installing K3S"
diff --git a/deployment/terraform/modules/openstack-kubernetes-infra/compute.tf b/deployment/terraform/modules/openstack-kubernetes-infra/compute.tf
index 869e888..2eb2121 100644
--- a/deployment/terraform/modules/openstack-kubernetes-infra/compute.tf
+++ b/deployment/terraform/modules/openstack-kubernetes-infra/compute.tf
@@ -145,6 +145,7 @@ data "cloudinit_config" "init_docker_controller" {
         TF_K3S_TOKEN            = random_password.k3s_token.result
         TF_K3S_TLS_SAN          = local.controller_host_has_floating_ip ? local.controller_host.floating_ip.address : ""
         TF_K3S_NODE_EXTERNAL_IP = local.controller_host_has_floating_ip ? local.controller_host.floating_ip.address : ""
+        TF_K3S_INTERNAL_IP      = local.controller_host_instance.internal_ip_address
       }
     )
   }

From 7bb62a972b630be4cb7114ee31a27b3117554ce0 Mon Sep 17 00:00:00 2001
From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.>
Date: Wed, 14 Jan 2026 18:35:42 +0000
Subject: [PATCH 2/2] fix(iac): Fix k3s with floating ip

---
 .../openstack-kubernetes-infra/cloud-init-k3s-server.yaml     | 4 ++--
 .../terraform/modules/openstack-kubernetes-infra/compute.tf   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/deployment/terraform/modules/openstack-kubernetes-infra/cloud-init-k3s-server.yaml b/deployment/terraform/modules/openstack-kubernetes-infra/cloud-init-k3s-server.yaml
index 33838c3..e7a8de8 100644
--- a/deployment/terraform/modules/openstack-kubernetes-infra/cloud-init-k3s-server.yaml
+++ b/deployment/terraform/modules/openstack-kubernetes-infra/cloud-init-k3s-server.yaml
@@ -40,13 +40,13 @@ runcmd:
   - |
     TF_K3S_TLS_SAN=${TF_K3S_TLS_SAN}
     TF_K3S_NODE_EXTERNAL_IP=${TF_K3S_NODE_EXTERNAL_IP}
-    TF_K3S_INTERNAL_IP=${TF_K3S_INTERNAL_IP}
     INSTALL_K3S_EXEC="server"
     if [ -n "$TF_K3S_TLS_SAN" ]; then
       INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC --tls-san $TF_K3S_TLS_SAN"
     fi
     if [ -n "$TF_K3S_NODE_EXTERNAL_IP" ]; then
-      INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC --node-external-ip $TF_K3S_NODE_EXTERNAL_IP --advertise-address $TF_K3S_INTERNAL_IP"
+      INTERNAL_IP=$(ip route get 8.8.8.8 | awk '{print $7; exit}')
+      INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC --node-external-ip $TF_K3S_NODE_EXTERNAL_IP --advertise-address $INTERNAL_IP"
     fi
     sudo curl -sfL https://get.k3s.io | K3S_TOKEN="${TF_K3S_TOKEN}" INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC" sh -
   - echo "Completed Installing K3S"
diff --git a/deployment/terraform/modules/openstack-kubernetes-infra/compute.tf b/deployment/terraform/modules/openstack-kubernetes-infra/compute.tf
index 2eb2121..869e888 100644
--- a/deployment/terraform/modules/openstack-kubernetes-infra/compute.tf
+++ b/deployment/terraform/modules/openstack-kubernetes-infra/compute.tf
@@ -145,7 +145,6 @@ data "cloudinit_config" "init_docker_controller" {
         TF_K3S_TOKEN            = random_password.k3s_token.result
         TF_K3S_TLS_SAN          = local.controller_host_has_floating_ip ? local.controller_host.floating_ip.address : ""
         TF_K3S_NODE_EXTERNAL_IP = local.controller_host_has_floating_ip ? local.controller_host.floating_ip.address : ""
-        TF_K3S_INTERNAL_IP      = local.controller_host_instance.internal_ip_address
       }
     )
   }