import the netpol testing package so that ownership is attributed correctly in the network policy testing suit

test/e2e/BUILD

@@ -34,7 +34,6 @@ go_test(
         "//test/e2e/lifecycle:go_default_library",
         "//test/e2e/lifecycle/bootstrap:go_default_library",
         "//test/e2e/network:go_default_library",
-        "//test/e2e/network/netpol:go_default_library",
         "//test/e2e/node:go_default_library",
         "//test/e2e/scheduling:go_default_library",
         "//test/e2e/storage:go_default_library",

test/e2e/e2e_test.go

@@ -51,7 +51,6 @@ import (
 	_ "k8s.io/kubernetes/test/e2e/lifecycle"
 	_ "k8s.io/kubernetes/test/e2e/lifecycle/bootstrap"
 	_ "k8s.io/kubernetes/test/e2e/network"
-	_ "k8s.io/kubernetes/test/e2e/network/netpol"
 	_ "k8s.io/kubernetes/test/e2e/node"
 	_ "k8s.io/kubernetes/test/e2e/scheduling"
 	_ "k8s.io/kubernetes/test/e2e/storage"

test/e2e/network/BUILD

@@ -86,6 +86,7 @@ go_library(
         "//test/e2e/framework/service:go_default_library",
         "//test/e2e/framework/skipper:go_default_library",
         "//test/e2e/framework/ssh:go_default_library",
+        "//test/e2e/network/netpol:go_default_library",
         "//test/e2e/network/scale:go_default_library",
         "//test/e2e/storage/utils:go_default_library",
         "//test/utils:go_default_library",

test/e2e/network/netpol/BUILD

@@ -24,7 +24,6 @@ go_library(
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/pod:go_default_library",
-        "//test/e2e/network:go_default_library",
         "//test/utils/image:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",

test/e2e/network/netpol/network_policy.go

@@ -27,7 +27,6 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
-	"k8s.io/kubernetes/test/e2e/network"
 
 	"github.com/onsi/ginkgo"
 	utilnet "k8s.io/utils/net"
@@ -108,7 +107,13 @@ and what is happening in practice:
 		z/b	.	.	.	.	.	.	.	.	.
 		z/c	.	.	.	.	.	.	.	.	.
 */
-var _ = network.SIGDescribe("Netpol [LinuxOnly]", func() {
+
+// SIGDescribeCopy function SIGDescribe is COPIED from test/e2e/network/framework.go , so that we can avoid a cyclic dependency while we incubate these new tests.
+func SIGDescribeCopy(text string, body func()) bool {
+	return ginkgo.Describe("[sig-network] "+text, body)
+}
+
+var _ = SIGDescribeCopy("Netpol [LinuxOnly]", func() {
 	f := framework.NewDefaultFramework("netpol")
 
 	ginkgo.Context("NetworkPolicy between server and client", func() {

test/e2e/network/network_policy.go

@@ -23,6 +23,7 @@ import (
 	"net"
 	"time"
 
+	"github.com/onsi/ginkgo"
 	v1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -35,10 +36,11 @@ import (
 	e2enode "k8s.io/kubernetes/test/e2e/framework/node"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 	e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
+
+	// synthetic import of netpol suite, until these tests are replaced entirely, so that its included properly
+	_ "k8s.io/kubernetes/test/e2e/network/netpol"
 	imageutils "k8s.io/kubernetes/test/utils/image"
 	utilnet "k8s.io/utils/net"
-
-	"github.com/onsi/ginkgo"
 )
 
 /*