Add dual stack support

kubernetes-sigs · Aug 19, 2019 · 1cd41b3 · 1cd41b3
1 parent bc6ea0d
commit 1cd41b3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/pkg/apis/config/v1alpha3/default.go b/pkg/apis/config/v1alpha3/default.go
diff --git a/pkg/apis/config/v1alpha3/types.go b/pkg/apis/config/v1alpha3/types.go
@@ -120,6 +120,8 @@ const (
 	IPv4Family ClusterIPFamily = "ipv4"
 	// IPv6Family sets ClusterIPFamily to ipv6
 	IPv6Family ClusterIPFamily = "ipv6"
+	// DualStackFamily sets ClusterIPFamily to ipv4-ipv6
+	DualStackFamily ClusterIPFamily = "ipv4-ipv6"
 )
 
 // PatchJSON6902 represents an inline kustomize json 6902 patch

diff --git a/pkg/internal/apis/config/default.go b/pkg/internal/apis/config/default.go
diff --git a/pkg/internal/apis/config/types.go b/pkg/internal/apis/config/types.go
@@ -120,6 +120,8 @@ const (
 	IPv4Family ClusterIPFamily = "ipv4"
 	// IPv6Family sets ClusterIPFamily to ipv6
 	IPv6Family ClusterIPFamily = "ipv6"
+	// DualStackFamily sets ClusterIPFamily to ipv4-ipv6
+	DualStackFamily ClusterIPFamily = "ipv4-ipv6"
 )
 
 // PatchJSON6902 represents an inline kustomize json 6902 patch

diff --git a/pkg/internal/apis/config/validate.go b/pkg/internal/apis/config/validate.go
@@ -18,6 +18,7 @@ package config
 
 import (
 	"net"
+	"strings"
 
 	"github.com/pkg/errors"
 
@@ -39,12 +40,19 @@ func (c *Cluster) Validate() error {
 	}
 
 	// podSubnet should be a valid CIDR
-	if _, _, err := net.ParseCIDR(c.Networking.PodSubnet); err != nil {
-		errs = append(errs, errors.Wrapf(err, "invalid podSubnet"))
+	cidrs := strings.Split(c.Networking.PodSubnet, ",")
+	for _, cidr := range cidrs {
+		if _, _, err := net.ParseCIDR(cidr); err != nil {
+			errs = append(errs, errors.Wrapf(err, "invalid podSubnet"))
+		}
 	}
+
 	// serviceSubnet should be a valid CIDR
-	if _, _, err := net.ParseCIDR(c.Networking.ServiceSubnet); err != nil {
-		errs = append(errs, errors.Wrapf(err, "invalid serviceSubnet"))
+	cidrs = strings.Split(c.Networking.ServiceSubnet, ",")
+	for _, cidr := range cidrs {
+		if _, _, err := net.ParseCIDR(cidr); err != nil {
+			errs = append(errs, errors.Wrapf(err, "invalid serviceSubnet"))
+		}
 	}
 
 	// validate nodes