Reafctor IngressCRUD into adapter package

kubernetes · Apr 6, 2020 · d7cc07a · d7cc07a
1 parent 7debbf9
commit d7cc07a
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 36 deletions.
diff --git a/cmd/e2e-test/affinity_beta_test.go b/cmd/e2e-test/affinity_beta_test.go
@@ -28,6 +28,7 @@ import (
 	"k8s.io/ingress-gce/pkg/annotations"
 	backendconfigbeta "k8s.io/ingress-gce/pkg/apis/backendconfig/v1beta1"
 	"k8s.io/ingress-gce/pkg/e2e"
+	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
 	"k8s.io/ingress-gce/pkg/fuzz/features"
 )
@@ -79,7 +80,7 @@ func TestAffinityBeta(t *testing.T) {
 		ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
 			AddPath("test.com", "/", svcName, intstr.FromInt(80)).
 			Build()
-		crud := e2e.IngressCRUD{C: Framework.Clientset}
+		crud := adapter.IngressCRUD{C: Framework.Clientset}
 		if _, err := crud.Create(ing); err != nil {
 			t.Fatalf("crud.Create(%#v) = %v, want nil", ing, err)
 		}

diff --git a/cmd/e2e-test/affinity_test.go b/cmd/e2e-test/affinity_test.go
@@ -105,7 +105,7 @@ func TestAffinity(t *testing.T) {
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
 				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
 				Build()
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}
@@ -244,7 +244,7 @@ func TestILBSA(t *testing.T) {
 				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
 				ConfigureForILB().
 				Build()
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}

diff --git a/cmd/e2e-test/app_protocols_test.go b/cmd/e2e-test/app_protocols_test.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/ingress-gce/pkg/annotations"
 	"k8s.io/ingress-gce/pkg/e2e"
+	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
 	"k8s.io/ingress-gce/pkg/fuzz/features"
 )
@@ -62,7 +63,7 @@ func TestAppProtocol(t *testing.T) {
 				DefaultBackend("service-1", intstr.FromString("https-port")).
 				AddPath("test.com", "/", "service-1", intstr.FromString("https-port")).
 				Build()
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}
@@ -132,7 +133,7 @@ func TestAppProtocolTransition(t *testing.T) {
 				DefaultBackend("service-1", intstr.FromString("https-port")).
 				AddPath("test.com", "/", "service-1", intstr.FromString("https-port")).
 				Build()
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}

diff --git a/cmd/e2e-test/backend_config_test.go b/cmd/e2e-test/backend_config_test.go
@@ -107,7 +107,7 @@ func TestBackendConfigNegatives(t *testing.T) {
 			testIng := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
 				AddPath("test.com", "/", "service-1", port80).
 				Build()
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			testIng, err := crud.Create(testIng)
 			if err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)

diff --git a/cmd/e2e-test/basic_https_test.go b/cmd/e2e-test/basic_https_test.go
@@ -23,6 +23,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/ingress-gce/pkg/e2e"
+	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
 )
 
@@ -98,7 +99,7 @@ func TestBasicHTTPS(t *testing.T) {
 			}
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}

diff --git a/cmd/e2e-test/basic_test.go b/cmd/e2e-test/basic_test.go
@@ -24,6 +24,7 @@ import (
 	"k8s.io/api/networking/v1beta1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/ingress-gce/pkg/e2e"
+	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
 	"k8s.io/ingress-gce/pkg/fuzz/features"
 	"k8s.io/ingress-gce/pkg/utils/common"
@@ -78,7 +79,7 @@ func testBasicOS(t *testing.T, os e2e.OS) {
 			}
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			tc.ing.Namespace = s.Namespace // namespace depends on sandbox
 			if _, err = crud.Create(tc.ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
@@ -128,7 +129,7 @@ func TestBasicStaticIP(t *testing.T) {
 			DefaultBackend("service-1", intstr.FromInt(80)).
 			AddStaticIP(addrName).
 			Build()
-		crud := e2e.IngressCRUD{C: Framework.Clientset}
+		crud := adapter.IngressCRUD{C: Framework.Clientset}
 		testIng, err = crud.Create(testIng)
 		if err != nil {
 			t.Fatalf("error creating Ingress spec: %v", err)
@@ -189,7 +190,7 @@ func TestEdge(t *testing.T) {
 				t.Fatalf("error creating echo service: %v", err)
 			}
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			tc.ing.Namespace = s.Namespace // namespace depends on sandbox
 			if _, err = crud.Create(tc.ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
@@ -264,7 +265,7 @@ func TestFrontendResourceDeletion(t *testing.T) {
 				AddPath(host, "/", svcName, port80).AddTLS([]string{}, cert.Name).Build()
 			ingKey := common.NamespacedName(ing)
 
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("crud.Create(%s) = %v, want nil; Ingress: %v", ingKey, err, ing)
 			}

diff --git a/cmd/e2e-test/cdn_test.go b/cmd/e2e-test/cdn_test.go
@@ -92,7 +92,7 @@ func TestCDN(t *testing.T) {
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
 				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
 				Build()
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}

diff --git a/cmd/e2e-test/draining_test.go b/cmd/e2e-test/draining_test.go
@@ -87,7 +87,7 @@ func TestDraining(t *testing.T) {
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
 				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
 				Build()
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}

diff --git a/cmd/e2e-test/finalizer_test.go b/cmd/e2e-test/finalizer_test.go
@@ -22,6 +22,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/ingress-gce/pkg/e2e"
+	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
 	"k8s.io/ingress-gce/pkg/utils/common"
 )
@@ -45,7 +46,7 @@ func TestFinalizer(t *testing.T) {
 		}
 		t.Logf("Echo service created (%s/%s)", s.Namespace, svcName)
 
-		crud := e2e.IngressCRUD{C: Framework.Clientset}
+		crud := adapter.IngressCRUD{C: Framework.Clientset}
 		ing.Namespace = s.Namespace
 		ingKey := common.NamespacedName(ing)
 		if _, err := crud.Create(ing); err != nil {
@@ -96,7 +97,7 @@ func TestFinalizerIngressClassChange(t *testing.T) {
 		}
 		t.Logf("Echo service created (%s/%s)", s.Namespace, svcName)
 
-		crud := e2e.IngressCRUD{C: Framework.Clientset}
+		crud := adapter.IngressCRUD{C: Framework.Clientset}
 		ing.Namespace = s.Namespace
 		ingKey := common.NamespacedName(ing)
 		if _, err := crud.Create(ing); err != nil {
@@ -160,7 +161,7 @@ func TestFinalizerIngressesWithSharedResources(t *testing.T) {
 		}
 		t.Logf("Echo service created (%s/%s)", s.Namespace, svcName)
 
-		crud := e2e.IngressCRUD{C: Framework.Clientset}
+		crud := adapter.IngressCRUD{C: Framework.Clientset}
 		ing.Namespace = s.Namespace
 		ingKey := common.NamespacedName(ing)
 		if _, err := crud.Create(ing); err != nil {

diff --git a/cmd/e2e-test/iap_test.go b/cmd/e2e-test/iap_test.go
@@ -73,7 +73,7 @@ func TestIAP(t *testing.T) {
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
 				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
 				Build()
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}

diff --git a/cmd/e2e-test/security_policy_test.go b/cmd/e2e-test/security_policy_test.go
@@ -112,7 +112,7 @@ func TestSecurityPolicyEnable(t *testing.T) {
 			DefaultBackend("service-1", port80).
 			AddPath("test.com", "/", "service-1", port80).
 			Build()
-		crud := e2e.IngressCRUD{C: Framework.Clientset}
+		crud := adapter.IngressCRUD{C: Framework.Clientset}
 		testIng, err = crud.Create(testIng)
 		if err != nil {
 			t.Fatalf("error creating Ingress spec: %v", err)
@@ -190,7 +190,7 @@ func TestSecurityPolicyTransition(t *testing.T) {
 			DefaultBackend("service-1", port80).
 			AddPath("test.com", "/", "service-1", port80).
 			Build()
-		crud := e2e.IngressCRUD{C: Framework.Clientset}
+		crud := adapter.IngressCRUD{C: Framework.Clientset}
 		testIng, err = crud.Create(testIng)
 		if err != nil {
 			t.Fatalf("error creating Ingress spec: %v", err)

diff --git a/cmd/e2e-test/timeout_test.go b/cmd/e2e-test/timeout_test.go
@@ -78,7 +78,7 @@ func TestTimeout(t *testing.T) {
 			ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
 				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
 				Build()
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}
@@ -169,7 +169,7 @@ func TestILBCT(t *testing.T) {
 				AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
 				ConfigureForILB().
 				Build()
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			if _, err := crud.Create(ing); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}

diff --git a/cmd/e2e-test/upgrade/basic_http.go b/cmd/e2e-test/upgrade/basic_http.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/api/networking/v1beta1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/ingress-gce/pkg/e2e"
+	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
 	"k8s.io/ingress-gce/pkg/utils/common"
 )
@@ -37,7 +38,7 @@ type BasicHTTP struct {
 	t         *testing.T
 	s         *e2e.Sandbox
 	framework *e2e.Framework
-	crud      e2e.IngressCRUD
+	crud      adapter.IngressCRUD
 	ing       *v1beta1.Ingress
 }
 
@@ -72,7 +73,7 @@ func (bh *BasicHTTP) PreUpgrade() error {
 		AddPath("foo.com", "/", svcName, port80).
 		Build()
 	ingKey := common.NamespacedName(bh.ing)
-	bh.crud = e2e.IngressCRUD{C: bh.framework.Clientset}
+	bh.crud = adapter.IngressCRUD{C: bh.framework.Clientset}
 	if _, err := bh.crud.Create(bh.ing); err != nil {
 		bh.t.Fatalf("error creating Ingress %s: %v", ingKey, err)
 	}

diff --git a/cmd/e2e-test/upgrade/finalizer.go b/cmd/e2e-test/upgrade/finalizer.go
@@ -22,6 +22,7 @@ import (
 
 	"k8s.io/api/networking/v1beta1"
 	"k8s.io/ingress-gce/pkg/e2e"
+	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
 	"k8s.io/ingress-gce/pkg/utils/common"
 )
@@ -31,7 +32,7 @@ type Finalizer struct {
 	t         *testing.T
 	s         *e2e.Sandbox
 	framework *e2e.Framework
-	crud      e2e.IngressCRUD
+	crud      adapter.IngressCRUD
 	ing       *v1beta1.Ingress
 }
 
@@ -67,7 +68,7 @@ func (fr *Finalizer) PreUpgrade() error {
 		AddPath("foo.com", "/", svcName, port80).
 		Build()
 	ingKey := common.NamespacedName(ing)
-	fr.crud = e2e.IngressCRUD{C: fr.framework.Clientset}
+	fr.crud = adapter.IngressCRUD{C: fr.framework.Clientset}
 	if _, err := fr.crud.Create(ing); err != nil {
 		fr.t.Fatalf("error creating Ingress %s: %v", ingKey, err)
 	}

diff --git a/cmd/e2e-test/upgrade/v2frontendnamer.go b/cmd/e2e-test/upgrade/v2frontendnamer.go
@@ -22,6 +22,7 @@ import (
 
 	"k8s.io/api/networking/v1beta1"
 	"k8s.io/ingress-gce/pkg/e2e"
+	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
 	"k8s.io/ingress-gce/pkg/utils/common"
 )
@@ -31,7 +32,7 @@ type V2FrontendNamer struct {
 	t         *testing.T
 	s         *e2e.Sandbox
 	framework *e2e.Framework
-	crud      e2e.IngressCRUD
+	crud      adapter.IngressCRUD
 	ing       *v1beta1.Ingress
 }
 
@@ -67,7 +68,7 @@ func (vf *V2FrontendNamer) PreUpgrade() error {
 		SetIngressClass("gce").
 		Build()
 	ingKey := common.NamespacedName(vf.ing)
-	vf.crud = e2e.IngressCRUD{C: vf.framework.Clientset}
+	vf.crud = adapter.IngressCRUD{C: vf.framework.Clientset}
 
 	if _, err := vf.crud.Create(vf.ing); err != nil {
 		vf.t.Fatalf("Create(%s) = %v, want nil; Ingress: %v", ingKey, err, vf.ing)

diff --git a/cmd/e2e-test/v2frontendnamer_test.go b/cmd/e2e-test/v2frontendnamer_test.go
@@ -24,6 +24,7 @@ import (
 	"k8s.io/api/networking/v1beta1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/ingress-gce/pkg/e2e"
+	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/fuzz"
 	"k8s.io/ingress-gce/pkg/utils/common"
 )
@@ -69,7 +70,7 @@ func TestV2FrontendNamer(t *testing.T) {
 			}
 			t.Logf("Echo service created (%s/%s)", s.Namespace, svcName)
 
-			crud := e2e.IngressCRUD{C: Framework.Clientset}
+			crud := adapter.IngressCRUD{C: Framework.Clientset}
 			var gclbs []*fuzz.GCLB
 			var updatedIngs []*v1beta1.Ingress
 

diff --git a/pkg/e2e/legacy.go → pkg/e2e/adapter/ingress.go b/pkg/e2e/legacy.go → pkg/e2e/adapter/ingress.go
@@ -1,4 +1,4 @@
-package e2e
+package adapter
 
 // Legacy conversion code for the old extensions v1beta1 API group.
 

diff --git a/pkg/e2e/legacy_test.go → pkg/e2e/adapter/ingress_test.go b/pkg/e2e/legacy_test.go → pkg/e2e/adapter/ingress_test.go
@@ -1,4 +1,4 @@
-package e2e
+package adapter
 
 import (
 	"reflect"

diff --git a/pkg/e2e/fixtures.go b/pkg/e2e/fixtures.go
@@ -32,6 +32,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/ingress-gce/pkg/e2e/adapter"
 	"k8s.io/ingress-gce/pkg/utils"
 
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
@@ -265,7 +266,7 @@ func DeleteSecret(s *Sandbox, name string) error {
 
 // EnsureIngress creates a new Ingress or updates an existing one.
 func EnsureIngress(s *Sandbox, ing *v1beta1.Ingress) (*v1beta1.Ingress, error) {
-	crud := &IngressCRUD{s.f.Clientset}
+	crud := &adapter.IngressCRUD{C: s.f.Clientset}
 	currentIng, err := crud.Get(ing.ObjectMeta.Namespace, ing.ObjectMeta.Name)
 	if currentIng == nil || err != nil {
 		return crud.Create(ing)