ingress: Add Ingress to v1 API and update backend to defaultBackend

ingress: use new serviceBackend split

ingress: remove all v1beta1 restrictions on creation

This change removes creation and update restrictions enforced by
k8s 1.18 for not allowing resource backends.

Paths are no longer
required to be valid regex and a PathType is now user-specified
and no longer defaulted.

Also remove all TODOs in staging/net/v1 types

Signed-off-by: Christopher M. Luciano <cmluciano@us.ibm.com>

pkg/apis/networking/validation/validation_test.go

@@ -896,9 +896,15 @@ func TestValidateNetworkPolicyUpdate(t *testing.T) {
 }
 
 func TestValidateIngress(t *testing.T) {
+	serviceBackend := &networking.IngressServiceBackend{
+		Name: "defaultbackend",
+		Port: networking.ServiceBackendPort{
+			Name:   "",
+			Number: 80,
+		},
+	}
 	defaultBackend := networking.IngressBackend{
-		ServiceName: "default-backend",
-		ServicePort: intstr.FromInt(80),
+		Service: serviceBackend,
 	}
 	pathTypePrefix := networking.PathTypePrefix
 	pathTypeImplementationSpecific := networking.PathTypeImplementationSpecific
@@ -910,10 +916,7 @@ func TestValidateIngress(t *testing.T) {
 			Namespace: metav1.NamespaceDefault,
 		},
 		Spec: networking.IngressSpec{
-			Backend: &networking.IngressBackend{
-				ServiceName: "default-backend",
-				ServicePort: intstr.FromInt(80),
-			},
+			DefaultBackend: &defaultBackend,
 			Rules: []networking.IngressRule{
 				{
 					Host: "foo.bar.com",
@@ -961,7 +964,7 @@ func TestValidateIngress(t *testing.T) {
 		"backend (v1beta1) with no service": {
 			groupVersion: &networkingv1beta1.SchemeGroupVersion,
 			tweakIngress: func(ing *networking.Ingress) {
-				ing.Spec.Backend.ServiceName = ""
+				ing.Spec.DefaultBackend.Service.Name = ""
 			},
 			expectErrsOnFields: []string{
 				"spec.backend.serviceName",
@@ -1039,7 +1042,7 @@ func TestValidateIngress(t *testing.T) {
 								Path:     "/foo",
 								PathType: &pathTypeImplementationSpecific,
 								Backend: networking.IngressBackend{
-									ServiceName: "default-backend",
+									Service: serviceBackend,
 									Resource: &api.TypedLocalObjectReference{
 										APIGroup: utilpointer.StringPtr("example.com"),
 										Kind:     "foo",
@@ -1064,7 +1067,7 @@ func TestValidateIngress(t *testing.T) {
 								Path:     "/foo",
 								PathType: &pathTypeImplementationSpecific,
 								Backend: networking.IngressBackend{
-									ServicePort: intstr.FromInt(80),
+									Service: serviceBackend,
 									Resource: &api.TypedLocalObjectReference{
 										APIGroup: utilpointer.StringPtr("example.com"),
 										Kind:     "foo",
@@ -1083,8 +1086,8 @@ func TestValidateIngress(t *testing.T) {
 		"spec.backend resource and service name are not allowed together": {
 			groupVersion: &networkingv1beta1.SchemeGroupVersion,
 			tweakIngress: func(ing *networking.Ingress) {
-				ing.Spec.Backend = &networking.IngressBackend{
-					ServiceName: "default-backend",
+				ing.Spec.DefaultBackend = &networking.IngressBackend{
+					Service: serviceBackend,
 					Resource: &api.TypedLocalObjectReference{
 						APIGroup: utilpointer.StringPtr("example.com"),
 						Kind:     "foo",
@@ -1099,8 +1102,8 @@ func TestValidateIngress(t *testing.T) {
 		"spec.backend resource and service port are not allowed together": {
 			groupVersion: &networkingv1beta1.SchemeGroupVersion,
 			tweakIngress: func(ing *networking.Ingress) {
-				ing.Spec.Backend = &networking.IngressBackend{
-					ServicePort: intstr.FromInt(80),
+				ing.Spec.DefaultBackend = &networking.IngressBackend{
+					Service: serviceBackend,
 					Resource: &api.TypedLocalObjectReference{
 						APIGroup: utilpointer.StringPtr("example.com"),
 						Kind:     "foo",
@@ -1136,8 +1139,16 @@ func TestValidateIngress(t *testing.T) {
 }
 
 func TestValidateIngressRuleValue(t *testing.T) {
+	serviceBackend := networking.IngressServiceBackend{
+		Name: "defaultbackend",
+		Port: networking.ServiceBackendPort{
+			Name:   "",
+			Number: 80,
+		},
+	}
 	fldPath := field.NewPath("testing.http.paths[0].path")
 	testCases := map[string]struct {
+		groupVersion *schema.GroupVersion
 		pathType     networking.PathType
 		path         string
 		expectedErrs field.ErrorList
@@ -1233,16 +1244,17 @@ func TestValidateIngressRuleValue(t *testing.T) {
 							Path:     testCase.path,
 							PathType: &testCase.pathType,
 							Backend: networking.IngressBackend{
-								ServiceName: "default-backend",
-								ServicePort: intstr.FromInt(80),
+								Service: &serviceBackend,
 							},
 						},
 					},
 				},
 			}
-
-			errs := validateIngressRuleValue(irv, field.NewPath("testing"), IngressValidationOptions{})
-
+			gv := testCase.groupVersion
+			if gv == nil {
+				gv = &networkingv1.SchemeGroupVersion
+			}
+			errs := validateIngressRuleValue(irv, field.NewPath("testing"), IngressValidationOptions{}, *gv)
 			if len(errs) != len(testCase.expectedErrs) {
 				t.Fatalf("Expected %d errors, got %d (%+v)", len(testCase.expectedErrs), len(errs), errs)
 			}
@@ -1258,9 +1270,14 @@ func TestValidateIngressRuleValue(t *testing.T) {
 
 func TestValidateIngressCreate(t *testing.T) {
 	implementationPathType := networking.PathTypeImplementationSpecific
+	serviceBackend := &networking.IngressServiceBackend{
+		Name: "defaultbackend",
+		Port: networking.ServiceBackendPort{
+			Number: 80,
+		},
+	}
 	defaultBackend := networking.IngressBackend{
-		ServiceName: "default-backend",
-		ServicePort: intstr.FromInt(80),
+		Service: serviceBackend,
 	}
 	resourceBackend := &api.TypedLocalObjectReference{
 		APIGroup: utilpointer.StringPtr("example.com"),
@@ -1274,12 +1291,13 @@ func TestValidateIngressCreate(t *testing.T) {
 			ResourceVersion: "1234",
 		},
 		Spec: networking.IngressSpec{
-			Backend: &defaultBackend,
-			Rules:   []networking.IngressRule{},
+			DefaultBackend: &defaultBackend,
+			Rules:          []networking.IngressRule{},
 		},
 	}
 
 	testCases := map[string]struct {
+		groupVersion *schema.GroupVersion
 		tweakIngress func(ingress *networking.Ingress)
 		expectedErrs field.ErrorList
 	}{
@@ -1319,7 +1337,7 @@ func TestValidateIngressCreate(t *testing.T) {
 			},
 			expectedErrs: field.ErrorList{},
 		},
-		"invalid regex path": {
+		"invalid regex path allowed (v1)": {
 			tweakIngress: func(ingress *networking.Ingress) {
 				ingress.Spec.Rules = []networking.IngressRule{{
 					Host: "foo.bar.com",
@@ -1338,7 +1356,7 @@ func TestValidateIngressCreate(t *testing.T) {
 		},
 		"Spec.Backend.Resource field allowed on create": {
 			tweakIngress: func(ingress *networking.Ingress) {
-				ingress.Spec.Backend = &networking.IngressBackend{
+				ingress.Spec.DefaultBackend = &networking.IngressBackend{
 					Resource: resourceBackend}
 			},
 			expectedErrs: field.ErrorList{},
@@ -1367,8 +1385,11 @@ func TestValidateIngressCreate(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			newIngress := baseIngress.DeepCopy()
 			testCase.tweakIngress(newIngress)
-
-			errs := ValidateIngressCreate(newIngress, networkingv1beta1.SchemeGroupVersion)
+			gv := testCase.groupVersion
+			if gv == nil {
+				gv = &networkingv1.SchemeGroupVersion
+			}
+			errs := ValidateIngressCreate(newIngress, *gv)
 			if len(errs) != len(testCase.expectedErrs) {
 				t.Fatalf("Expected %d errors, got %d (%+v)", len(testCase.expectedErrs), len(errs), errs)
 			}
@@ -1384,9 +1405,14 @@ func TestValidateIngressCreate(t *testing.T) {
 
 func TestValidateIngressUpdate(t *testing.T) {
 	implementationPathType := networking.PathTypeImplementationSpecific
+	serviceBackend := &networking.IngressServiceBackend{
+		Name: "defaultbackend",
+		Port: networking.ServiceBackendPort{
+			Number: 80,
+		},
+	}
 	defaultBackend := networking.IngressBackend{
-		ServiceName: "default-backend",
-		ServicePort: intstr.FromInt(80),
+		Service: serviceBackend,
 	}
 	resourceBackend := &api.TypedLocalObjectReference{
 		APIGroup: utilpointer.StringPtr("example.com"),
@@ -1400,7 +1426,7 @@ func TestValidateIngressUpdate(t *testing.T) {
 			ResourceVersion: "1234",
 		},
 		Spec: networking.IngressSpec{
-			Backend: &defaultBackend,
+			DefaultBackend: &defaultBackend,
 		},
 	}
 
@@ -1545,26 +1571,26 @@ func TestValidateIngressUpdate(t *testing.T) {
 		},
 		"new Backend.Resource allowed on update": {
 			tweakIngresses: func(newIngress, oldIngress *networking.Ingress) {
-				oldIngress.Spec.Backend = &defaultBackend
-				newIngress.Spec.Backend = &networking.IngressBackend{
+				oldIngress.Spec.DefaultBackend = &defaultBackend
+				newIngress.Spec.DefaultBackend = &networking.IngressBackend{
 					Resource: resourceBackend}
 			},
 			expectedErrs: field.ErrorList{},
 		},
-		"old Backend.Resource allowed on update": {
+		"old DefaultBackend.Resource allowed on update": {
 			tweakIngresses: func(newIngress, oldIngress *networking.Ingress) {
-				oldIngress.Spec.Backend = &networking.IngressBackend{
+				oldIngress.Spec.DefaultBackend = &networking.IngressBackend{
 					Resource: resourceBackend}
-				newIngress.Spec.Backend = &networking.IngressBackend{
+				newIngress.Spec.DefaultBackend = &networking.IngressBackend{
 					Resource: resourceBackend}
 			},
 			expectedErrs: field.ErrorList{},
 		},
 		"changing spec.backend from resource -> no resource": {
 			tweakIngresses: func(newIngress, oldIngress *networking.Ingress) {
-				oldIngress.Spec.Backend = &networking.IngressBackend{
+				oldIngress.Spec.DefaultBackend = &networking.IngressBackend{
 					Resource: resourceBackend}
-				newIngress.Spec.Backend = &defaultBackend
+				newIngress.Spec.DefaultBackend = &defaultBackend
 			},
 			expectedErrs: field.ErrorList{},
 		},
@@ -1899,11 +1925,15 @@ func TestValidateIngressClassUpdate(t *testing.T) {
 }
 
 func TestValidateIngressTLS(t *testing.T) {
-	defaultBackend := networking.IngressBackend{
-		ServiceName: "default-backend",
-		ServicePort: intstr.FromInt(80),
+	serviceBackend := &networking.IngressServiceBackend{
+		Name: "defaultbackend",
+		Port: networking.ServiceBackendPort{
+			Number: 80,
+		},
+	}
+	defaultBackend := networking.IngressBackend{
+		Service: serviceBackend,
 	}
-
 	newValid := func() networking.Ingress {
 		return networking.Ingress{
 			ObjectMeta: metav1.ObjectMeta{
@@ -1911,10 +1941,7 @@ func TestValidateIngressTLS(t *testing.T) {
 				Namespace: metav1.NamespaceDefault,
 			},
 			Spec: networking.IngressSpec{
-				Backend: &networking.IngressBackend{
-					ServiceName: "default-backend",
-					ServicePort: intstr.FromInt(80),
-				},
+				DefaultBackend: &defaultBackend,
 				Rules: []networking.IngressRule{
 					{
 						Host: "foo.bar.com",
@@ -1987,9 +2014,14 @@ func TestValidateIngressTLS(t *testing.T) {
 }
 
 func TestValidateIngressStatusUpdate(t *testing.T) {
+	serviceBackend := &networking.IngressServiceBackend{
+		Name: "defaultbackend",
+		Port: networking.ServiceBackendPort{
+			Number: 80,
+		},
+	}
 	defaultBackend := networking.IngressBackend{
-		ServiceName: "default-backend",
-		ServicePort: intstr.FromInt(80),
+		Service: serviceBackend,
 	}
 
 	newValid := func() networking.Ingress {
@@ -2000,10 +2032,7 @@ func TestValidateIngressStatusUpdate(t *testing.T) {
 				ResourceVersion: "9",
 			},
 			Spec: networking.IngressSpec{
-				Backend: &networking.IngressBackend{
-					ServiceName: "default-backend",
-					ServicePort: intstr.FromInt(80),
-				},
+				DefaultBackend: &defaultBackend,
 				Rules: []networking.IngressRule{
 					{
 						Host: "foo.bar.com",