Merge pull request #3534 from pacevedom/USHIFT-3482-advertise-address

USHIFT-3482: Add ipv6 advertiseAddress handling

Author: openshift-merge-bot[bot]

etcd/vendor/github.com/openshift/microshift/pkg/config/config.go

@@ -282,7 +282,11 @@ func (c *Config) updateComputedValues() error {
 		// host network pods trying to reach apiserver, as the VIP 10.43.0.1:443 is
 		// not translated to 10.43.0.1:6443. It remains unchanged and therefore
 		// connects to the ingress router instead, triggering all sorts of errors.
-		nextSubnet, exceed := cidr.NextSubnet(svcNet, 32)
+		prefix := 32
+		if svcNet.IP.To4() == nil {
+			prefix = 128
+		}
+		nextSubnet, exceed := cidr.NextSubnet(svcNet, prefix)
 		if exceed {
 			return fmt.Errorf("unable to compute next subnet from service CIDR")
 		}

pkg/config/config.go

@@ -18,6 +18,7 @@ package node
 import (
 	"context"
 	"fmt"
+	"net"
 
 	"k8s.io/klog/v2"
 
@@ -87,7 +88,11 @@ func (n *NetworkConfiguration) addServiceIPLoopback() error {
 			return err
 		}
 	}
-	address, err := netlink.ParseAddr(fmt.Sprintf("%s/32", n.kasAdvertiseAddress))
+	prefix := 32
+	if net.ParseIP(n.kasAdvertiseAddress).To4() == nil {
+		prefix = 128
+	}
+	address, err := netlink.ParseAddr(fmt.Sprintf("%s/%d", n.kasAdvertiseAddress, prefix))
 	if err != nil {
 		return err
 	}
@@ -114,7 +119,11 @@ func (n *NetworkConfiguration) removeServiceIPLoopback() error {
 			return err
 		}
 	}
-	address, err := netlink.ParseAddr(fmt.Sprintf("%s/32", n.kasAdvertiseAddress))
+	prefix := 32
+	if net.ParseIP(n.kasAdvertiseAddress).To4() == nil {
+		prefix = 128
+	}
+	address, err := netlink.ParseAddr(fmt.Sprintf("%s/%d", n.kasAdvertiseAddress, prefix))
 	if err != nil {
 		return err
 	}