fix upstream cluster URL output when tunnels are not in use

git-ival · git-ival · commit 411ca2211527 · 2025-05-31T19:29:50.000Z
diff --git a/tofu/modules/generic/k3s/outputs.tf b/tofu/modules/generic/k3s/outputs.tf
@@ -25,11 +25,11 @@ output "config" {
         http_port  = 80
         https_port = 443
       }
-      tunnel = { // resolvable from the host running OpenTofu when create_tunnels == true
+      tunnel = var.create_tunnels ? { // resolvable from the host running OpenTofu when create_tunnels == true
         name       = "${var.name}.local.gd"
         http_port  = var.tunnel_app_http_port
         https_port = var.tunnel_app_https_port
-      }
+      } : {}
     }
 
     node_access_commands = merge({
diff --git a/tofu/modules/generic/rke2/outputs.tf b/tofu/modules/generic/rke2/outputs.tf
@@ -25,11 +25,11 @@ output "config" {
         http_port  = 80
         https_port = 443
       }
-      tunnel = { // resolvable from the host running OpenTofu when create_tunnels == true
+      tunnel = var.create_tunnels ? { // resolvable from the host running OpenTofu when create_tunnels == true
         name       = "${var.name}.local.gd"
         http_port  = var.tunnel_app_http_port
         https_port = var.tunnel_app_https_port
-      }
+      } : {}
     }
 
     node_access_commands = merge({

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@ output "config" {`
`25`	`25`	`http_port = 80`
`26`	`26`	`https_port = 443`
`27`	`27`	`}`
`28`		`- tunnel = { // resolvable from the host running OpenTofu when create_tunnels == true`
	`28`	`+ tunnel = var.create_tunnels ? { // resolvable from the host running OpenTofu when create_tunnels == true`
`29`	`29`	`name = "${var.name}.local.gd"`
`30`	`30`	`http_port = var.tunnel_app_http_port`
`31`	`31`	`https_port = var.tunnel_app_https_port`
`32`		`- }`
	`32`	`+ } : {}`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`node_access_commands = merge({`