Use networking.k8s.io/v1 API

- Backend Service Port struct has been changed to ServiceBackendPort, so controllers now will use ServiceBackendPort instead of IntOrString type. - E2E tests need to be able to run against different versions of the ingress controllers & kubernetes clusters so an adpater client is used to for Ingress CRUD operations in the tests that use the V1 API if available and fallback to v1beta1 - cmd/fuzzer was converted to use the V1 API solely
kubernetes · Apr 23, 2021 · 60bc150 · 60bc150
1 parent c980904
commit 60bc150
Show file tree

Hide file tree

Showing 126 changed files with 2,000 additions and 1,219 deletions.
diff --git a/cmd/e2e-test/affinity_beta_test.go b/cmd/e2e-test/affinity_beta_test.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"testing"
 
+	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
 	"k8s.io/ingress-gce/pkg/annotations"
@@ -78,7 +78,7 @@ func TestAffinityBeta(t *testing.T) {
 		t.Logf("Echo service created (%s/%s)", s.Namespace, svcName)
 
 		ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
-			AddPath("test.com", "/", svcName, intstr.FromInt(80)).
+			AddPath("test.com", "/", svcName, networkingv1.ServiceBackendPort{Number: 80}).
 			Build()
 		crud := adapter.IngressCRUD{C: Framework.Clientset}
 		if _, err := crud.Create(ing); err != nil {

diff --git a/cmd/e2e-test/affinity_test.go b/cmd/e2e-test/affinity_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/apimachinery/pkg/util/intstr"
+	v1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
 	"k8s.io/ingress-gce/pkg/annotations"
@@ -103,7 +103,7 @@ func TestAffinity(t *testing.T) {
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
-				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
+				AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
 				Build()
 			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
@@ -241,7 +241,7 @@ func TestILBSA(t *testing.T) {
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
-				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
+				AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
 				ConfigureForILB().
 				Build()
 			crud := adapter.IngressCRUD{C: Framework.Clientset}

diff --git a/cmd/e2e-test/app_protocols_test.go b/cmd/e2e-test/app_protocols_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/util/intstr"
+	v1 "k8s.io/api/networking/v1"
 	"k8s.io/ingress-gce/pkg/annotations"
 	"k8s.io/ingress-gce/pkg/e2e"
 	"k8s.io/ingress-gce/pkg/e2e/adapter"
@@ -60,8 +60,8 @@ func TestAppProtocol(t *testing.T) {
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
-				DefaultBackend("service-1", intstr.FromString("https-port")).
-				AddPath("test.com", "/", "service-1", intstr.FromString("https-port")).
+				DefaultBackend("service-1", v1.ServiceBackendPort{Name: "https-port"}).
+				AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Name: "https-port"}).
 				Build()
 			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
@@ -130,8 +130,8 @@ func TestAppProtocolTransition(t *testing.T) {
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
-				DefaultBackend("service-1", intstr.FromString("https-port")).
-				AddPath("test.com", "/", "service-1", intstr.FromString("https-port")).
+				DefaultBackend("service-1", v1.ServiceBackendPort{Name: "https-port"}).
+				AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Name: "https-port"}).
 				Build()
 			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {

diff --git a/cmd/e2e-test/backend_config_test.go b/cmd/e2e-test/backend_config_test.go
@@ -25,10 +25,10 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/ingress-gce/pkg/e2e/adapter"
 
+	networkingv1 "k8s.io/api/networking/v1"
 	"k8s.io/ingress-gce/pkg/annotations"
 	backendconfigv1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"
 	"k8s.io/ingress-gce/pkg/e2e"
@@ -104,7 +104,7 @@ func TestBackendConfigNegatives(t *testing.T) {
 				t.Fatalf("e2e.CreateEchoService(s, service-1, %q) = _, _, %v, want _, _, nil", tc.svcAnnotations, err)
 			}
 
-			port80 := intstr.FromInt(80)
+			port80 := networkingv1.ServiceBackendPort{Number: 80}
 			testIng := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
 				AddPath("test.com", "/", "service-1", port80).
 				Build()

diff --git a/cmd/e2e-test/basic_https_test.go b/cmd/e2e-test/basic_https_test.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/util/intstr"
+	v1 "k8s.io/api/networking/v1"
 	"k8s.io/ingress-gce/pkg/e2e"
 	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
@@ -30,7 +30,7 @@ import (
 func TestBasicHTTPS(t *testing.T) {
 	t.Parallel()
 
-	port80 := intstr.FromInt(80)
+	port80 := v1.ServiceBackendPort{Number: 80}
 
 	for _, tc := range []struct {
 		desc       string

diff --git a/cmd/e2e-test/basic_test.go b/cmd/e2e-test/basic_test.go
@@ -21,8 +21,7 @@ import (
 	"fmt"
 	"testing"
 
-	"k8s.io/api/networking/v1beta1"
-	"k8s.io/apimachinery/pkg/util/intstr"
+	v1 "k8s.io/api/networking/v1"
 	"k8s.io/ingress-gce/pkg/e2e"
 	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
@@ -41,11 +40,11 @@ func TestBasic(t *testing.T) {
 func testBasicOS(t *testing.T, os e2e.OS) {
 	t.Parallel()
 
-	port80 := intstr.FromInt(80)
+	port80 := v1.ServiceBackendPort{Number: 80}
 
 	for _, tc := range []struct {
 		desc string
-		ing  *v1beta1.Ingress
+		ing  *v1.Ingress
 	}{
 		{
 			desc: "http default backend",
@@ -126,7 +125,7 @@ func TestBasicStaticIP(t *testing.T) {
 		defer e2e.DeleteGCPAddress(s, addrName, "")
 
 		testIng := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
-			DefaultBackend("service-1", intstr.FromInt(80)).
+			DefaultBackend("service-1", v1.ServiceBackendPort{Number: 80}).
 			AddStaticIP(addrName, false).
 			Build()
 		crud := adapter.IngressCRUD{C: Framework.Clientset}
@@ -166,11 +165,11 @@ func TestBasicStaticIP(t *testing.T) {
 func TestEdge(t *testing.T) {
 	t.Parallel()
 
-	port80 := intstr.FromInt(80)
+	port80 := v1.ServiceBackendPort{Number: 80}
 
 	for _, tc := range []struct {
 		desc string
-		ing  *v1beta1.Ingress
+		ing  *v1.Ingress
 	}{
 		{
 			desc: "long ingress name",
@@ -223,7 +222,7 @@ func TestEdge(t *testing.T) {
 // deleted. This also tests that necessary GCP frontend resources exist.
 func TestFrontendResourceDeletion(t *testing.T) {
 	t.Parallel()
-	port80 := intstr.FromInt(80)
+	port80 := v1.ServiceBackendPort{Number: 80}
 	svcName := "service-1"
 	host := "foo.com"
 
@@ -319,7 +318,7 @@ func TestFrontendResourceDeletion(t *testing.T) {
 				ingBuilder = ingBuilder.SetAllowHttp(true)
 			}
 			if tc.disableHTTPS {
-				ingBuilder.SetTLS([]v1beta1.IngressTLS{
+				ingBuilder.SetTLS([]v1.IngressTLS{
 					{
 						Hosts:      []string{},
 						SecretName: cert.Name,

diff --git a/cmd/e2e-test/cdn_test.go b/cmd/e2e-test/cdn_test.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/util/intstr"
+	v1 "k8s.io/api/networking/v1"
 	"k8s.io/ingress-gce/pkg/annotations"
 	backendconfig "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"
 	"k8s.io/ingress-gce/pkg/e2e"
@@ -90,7 +90,7 @@ func TestCDN(t *testing.T) {
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
-				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
+				AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
 				Build()
 			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {

diff --git a/cmd/e2e-test/customrequestheaders_test.go b/cmd/e2e-test/customrequestheaders_test.go
@@ -22,8 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
+	v1 "k8s.io/api/networking/v1"
 	"k8s.io/ingress-gce/pkg/annotations"
 	backendconfig "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"
 	"k8s.io/ingress-gce/pkg/e2e"
@@ -39,7 +38,7 @@ func TestCustomRequestHeaders(t *testing.T) {
 	t.Parallel()
 
 	ing := fuzz.NewIngressBuilder("", "ingress-1", "").
-		AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
+		AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
 		Build()
 
 	for _, tc := range []struct {
@@ -74,7 +73,8 @@ func TestCustomRequestHeaders(t *testing.T) {
 			}
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
-			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(context.TODO(), ing, metav1.CreateOptions{}); err != nil {
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
+			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}
 			t.Logf("Ingress created (%s/%s)", s.Namespace, ing.Name)
@@ -98,7 +98,7 @@ func TestCustomRequestHeaders(t *testing.T) {
 			}
 
 			// Wait for GCLB resources to be deleted.
-			if err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Delete(context.TODO(), ing.Name, metav1.DeleteOptions{}); err != nil {
+			if err := crud.Delete(ing.Namespace, ing.Name); err != nil {
 				t.Errorf("Delete(%q) = %v, want nil", ing.Name, err)
 			}
 

diff --git a/cmd/e2e-test/draining_test.go b/cmd/e2e-test/draining_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/apimachinery/pkg/util/intstr"
+	v1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
 	"k8s.io/ingress-gce/pkg/annotations"
@@ -85,7 +85,7 @@ func TestDraining(t *testing.T) {
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
-				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
+				AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
 				Build()
 			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {

diff --git a/cmd/e2e-test/finalizer_test.go b/cmd/e2e-test/finalizer_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/util/intstr"
+	v1 "k8s.io/api/networking/v1"
 	"k8s.io/ingress-gce/pkg/e2e"
 	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
@@ -32,7 +32,7 @@ import (
 func TestFinalizer(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()
-	port80 := intstr.FromInt(80)
+	port80 := v1.ServiceBackendPort{Number: 80}
 	svcName := "service-1"
 	ing := fuzz.NewIngressBuilder("", "ingress-1", "").
 		AddPath("foo.com", "/", svcName, port80).
@@ -83,7 +83,7 @@ func TestFinalizer(t *testing.T) {
 func TestFinalizerIngressClassChange(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()
-	port80 := intstr.FromInt(80)
+	port80 := v1.ServiceBackendPort{Number: 80}
 	svcName := "service-1"
 	ing := fuzz.NewIngressBuilder("", "ingress-1", "").
 		AddPath("foo.com", "/", svcName, port80).
@@ -143,7 +143,7 @@ func TestFinalizerIngressClassChange(t *testing.T) {
 func TestFinalizerIngressesWithSharedResources(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()
-	port80 := intstr.FromInt(80)
+	port80 := v1.ServiceBackendPort{Number: 80}
 	svcName := "service-1"
 	ing := fuzz.NewIngressBuilder("", "ingress-1", "").
 		AddPath("foo.com", "/", svcName, port80).

diff --git a/cmd/e2e-test/healthcheck_test.go b/cmd/e2e-test/healthcheck_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
+	networkingv1 "k8s.io/api/networking/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
 	"k8s.io/ingress-gce/pkg/annotations"
@@ -98,7 +98,7 @@ func TestHealthCheck(t *testing.T) {
 			}
 
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
-				DefaultBackend("service-1", intstr.FromInt(80)).
+				DefaultBackend("service-1", networkingv1.ServiceBackendPort{Number: 80}).
 				Build()
 			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {

diff --git a/cmd/e2e-test/iap_test.go b/cmd/e2e-test/iap_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/util/intstr"
+	v1 "k8s.io/api/networking/v1"
 	"k8s.io/ingress-gce/pkg/annotations"
 	backendconfig "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"
 	"k8s.io/ingress-gce/pkg/e2e"
@@ -71,7 +71,7 @@ func TestIAP(t *testing.T) {
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
-				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
+				AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
 				Build()
 			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {