Merge pull request #3483 from tnqn/validate-ip-family

Add ipFamily validation
kubernetes-sigs · Feb 22, 2024 · 2fb3f42 · 2fb3f42
2 parents d59e2ce + 396586f
commit 2fb3f42
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pkg/internal/apis/config/validate.go b/pkg/internal/apis/config/validate.go
@@ -52,6 +52,11 @@ func (c *Cluster) Validate() error {
 		}
 	}
 
+	// ipFamily should be ipv4, ipv6, or dual
+	if c.Networking.IPFamily != IPv4Family && c.Networking.IPFamily != IPv6Family && c.Networking.IPFamily != DualStackFamily {
+		errs = append(errs, errors.Errorf("invalid ipFamily: %s", c.Networking.IPFamily))
+	}
+
 	// podSubnet should be a valid CIDR
 	if err := validateSubnets(c.Networking.PodSubnet, c.Networking.IPFamily); err != nil {
 		errs = append(errs, errors.Errorf("invalid pod subnet %v", err))

diff --git a/pkg/internal/apis/config/validate_test.go b/pkg/internal/apis/config/validate_test.go
@@ -97,6 +97,16 @@ func TestClusterValidate(t *testing.T) {
 			}(),
 			ExpectErrors: 1,
 		},
+		{
+			Name: "bogus ipFamily",
+			Cluster: func() Cluster {
+				c := Cluster{}
+				SetDefaultsCluster(&c)
+				c.Networking.IPFamily = "ds"
+				return c
+			}(),
+			ExpectErrors: 1,
+		},
 		{
 			Name: "bogus serviceSubnet",
 			Cluster: func() Cluster {