Fix the VIP URL generation for IPv6

When configuring Kubernetes with multiple nodes, EIB requires an IP address to be used as a target for load balancing purposes. However, it assumes this address to be in an IPv4 format, resulting in a broken mangling when IPv6 is used instead. Correct this problem by letting netip package do the handling of IP addresses, hiding version specific issues. This also allows for easier and additional input validation with minimal effort. Signed-off-by: Marco Chiappero <[email protected]>
suse-edge · Aug 5, 2024 · 8cabdff · 8cabdff
1 parent 5bfaf6b
commit 8cabdff
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -14,6 +14,22 @@
 
 ---
 
+# v1.1.0-rc2
+
+## General
+
+## API
+
+### Image Definition Changes
+
+### Image Configuration Directory Changes
+
+## Bug Fixes
+
+* [#512](https://github.com/suse-edge/edge-image-builder/issues/512) - EIB assumes apiVIP to be IPv4 only when creating the target URL
+
+---
+
 # v1.1.0-rc1
 
 ## General

diff --git a/docs/building-images.md b/docs/building-images.md
@@ -258,8 +258,8 @@ kubernetes:
 * `version` - Required; Specifies the version of a particular K3s or RKE2 release (e.g.`v1.28.8+k3s1` or `v1.28.8+rke2r1`)
 * `network` - Required for multi-node clusters, optional for single-node clusters; Defines the network configuration 
 for bootstrapping a cluster.
-  * `apiVIP` - Required for multi-node clusters, optional for single-node clusters; Specifies the IP address which
-  will serve as the cluster LoadBalancer, backed by MetalLB.
+  * `apiVIP` - Required for multi-node clusters, optional for single-node clusters; Specifies the IPv4 or IPv6 address
+  which will serve as the cluster LoadBalancer, backed by MetalLB.
   * `apiHost` - Optional; Specifies the domain address for accessing the cluster.
 * `nodes` - Required for multi-node clusters; Defines a list of all nodes that form the cluster.
   * `hostname` - Required; Indicates the fully qualified domain name (FQDN) to identify the particular node on which

diff --git a/pkg/kubernetes/cluster.go b/pkg/kubernetes/cluster.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"io/fs"
+	"net/netip"
 	"os"
 	"path/filepath"
 	"strings"
@@ -202,7 +203,9 @@ func setClusterAPIAddress(config map[string]any, apiAddress string, port uint16)
 		return
 	}
 
-	config[serverKey] = fmt.Sprintf("https://%s:%d", apiAddress, port)
+	ip, _ := netip.ParseAddr(apiAddress)
+
+	config[serverKey] = fmt.Sprintf("https://%s", netip.AddrPortFrom(ip, port).String())
 }
 
 func setSELinux(config map[string]any) {

diff --git a/pkg/kubernetes/cluster_test.go b/pkg/kubernetes/cluster_test.go
@@ -281,6 +281,9 @@ func TestSetClusterAPIAddress(t *testing.T) {
 
 	setClusterAPIAddress(config, "192.168.122.50", 9345)
 	assert.Equal(t, "https://192.168.122.50:9345", config["server"])
+
+	setClusterAPIAddress(config, "FEC0:1:2:3::50", 9345)
+	assert.Equal(t, "https://[fec0:1:2:3::50]:9345", config["server"])
 }
 
 func TestAppendClusterTLSSAN(t *testing.T) {