add HostSubnet.EgressCIDRs

Author: danwinship

pkg/network/apis/network/types.go

@@ -51,7 +51,8 @@ type HostSubnet struct {
 	HostIP string
 	Subnet string
 
-	EgressIPs []string
+	EgressIPs   []string
+	EgressCIDRs []string
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

pkg/network/apis/network/validation/validation.go

@@ -174,6 +174,12 @@ func ValidateHostSubnet(hs *networkapi.HostSubnet) field.ErrorList {
 		}
 	}
 
+	for i, egressCIDR := range hs.EgressCIDRs {
+		if _, err := validateCIDRv4(egressCIDR); err != nil {
+			allErrs = append(allErrs, field.Invalid(field.NewPath("egressCIDRs").Index(i), egressCIDR, err.Error()))
+		}
+	}
+
 	return allErrs
 }
 

pkg/network/apis/network/validation/validation_test.go

@@ -405,6 +405,39 @@ func TestValidateHostSubnet(t *testing.T) {
 			},
 			expectedErrors: 2,
 		},
+		{
+			name: "Good one with EgressCIDRs",
+			hs: &networkapi.HostSubnet{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "abc.def.com",
+				},
+				Host:   "abc.def.com",
+				HostIP: "10.20.30.40",
+				Subnet: "8.8.8.0/24",
+				EgressCIDRs: []string{
+					"192.168.1.99/32",
+					"192.168.2.0/24",
+				},
+			},
+			expectedErrors: 0,
+		},
+		{
+			name: "Malformed EgressCIDRs",
+			hs: &networkapi.HostSubnet{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "abc.def.com",
+				},
+				Host:   "abc.def.com",
+				HostIP: "10.20.30.40",
+				Subnet: "8.8.8.0/24",
+				EgressCIDRs: []string{
+					"192.168.1.99",
+					"bob/32",
+					"1234::5678/64",
+				},
+			},
+			expectedErrors: 3,
+		},
 		{
 			name: "IPv6 subnet",
 			hs: &networkapi.HostSubnet{