Merge pull request kubernetes#90035 from alejandrox1/mv-manifests-to-framework

Moved e2e/manifests to e2e test framework

Author: k8s-ci-robot

test/e2e/BUILD

@@ -75,6 +75,7 @@ go_library(
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/auth:go_default_library",
         "//test/e2e/framework/kubectl:go_default_library",
+        "//test/e2e/framework/manifest:go_default_library",
         "//test/e2e/framework/metrics:go_default_library",
         "//test/e2e/framework/node:go_default_library",
         "//test/e2e/framework/pod:go_default_library",
@@ -86,7 +87,6 @@ go_library(
         "//test/e2e/framework/providers/vsphere:go_default_library",
         "//test/e2e/framework/skipper:go_default_library",
         "//test/e2e/framework/testfiles:go_default_library",
-        "//test/e2e/manifest:go_default_library",
         "//test/e2e/reporters:go_default_library",
         "//test/utils:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
@@ -123,7 +123,6 @@ filegroup(
         "//test/e2e/instrumentation:all-srcs",
         "//test/e2e/kubectl:all-srcs",
         "//test/e2e/lifecycle:all-srcs",
-        "//test/e2e/manifest:all-srcs",
         "//test/e2e/network:all-srcs",
         "//test/e2e/node:all-srcs",
         "//test/e2e/perftype:all-srcs",

test/e2e/e2e.go

@@ -45,9 +45,9 @@ import (
 	commontest "k8s.io/kubernetes/test/e2e/common"
 	"k8s.io/kubernetes/test/e2e/framework"
 	e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
+	e2emanifest "k8s.io/kubernetes/test/e2e/framework/manifest"
 	e2enode "k8s.io/kubernetes/test/e2e/framework/node"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
-	"k8s.io/kubernetes/test/e2e/manifest"
 	e2ereporters "k8s.io/kubernetes/test/e2e/reporters"
 	testutils "k8s.io/kubernetes/test/utils"
 	utilnet "k8s.io/utils/net"
@@ -135,7 +135,7 @@ func RunE2ETests(t *testing.T) {
 func runKubernetesServiceTestContainer(c clientset.Interface, ns string) {
 	path := "test/images/clusterapi-tester/pod.yaml"
 	framework.Logf("Parsing pod from %v", path)
-	p, err := manifest.PodFromManifest(path)
+	p, err := e2emanifest.PodFromManifest(path)
 	if err != nil {
 		framework.Logf("Failed to parse clusterapi-tester from manifest %v: %v", path, err)
 		return

test/e2e/framework/BUILD

@@ -116,6 +116,7 @@ filegroup(
         "//test/e2e/framework/kubelet:all-srcs",
         "//test/e2e/framework/kubesystem:all-srcs",
         "//test/e2e/framework/log:all-srcs",
+        "//test/e2e/framework/manifest:all-srcs",
         "//test/e2e/framework/metrics:all-srcs",
         "//test/e2e/framework/network:all-srcs",
         "//test/e2e/framework/node:all-srcs",

test/e2e/manifest/BUILD renamed to test/e2e/framework/manifest/BUILD

@@ -8,7 +8,7 @@ load(
 go_library(
     name = "go_default_library",
     srcs = ["manifest.go"],
-    importpath = "k8s.io/kubernetes/test/e2e/manifest",
+    importpath = "k8s.io/kubernetes/test/e2e/framework/manifest",
     deps = [
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",

test/e2e/manifest/manifest.go renamed to test/e2e/framework/manifest/manifest.go

@@ -22,7 +22,7 @@ go_library(
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library",
         "//test/e2e/framework:go_default_library",
-        "//test/e2e/manifest:go_default_library",
+        "//test/e2e/framework/manifest:go_default_library",
         "//test/utils/image:go_default_library",
     ],
 )

test/e2e/framework/statefulset/BUILD

@@ -33,7 +33,7 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubectl/pkg/util/podutils"
 	"k8s.io/kubernetes/test/e2e/framework"
-	"k8s.io/kubernetes/test/e2e/manifest"
+	e2emanifest "k8s.io/kubernetes/test/e2e/framework/manifest"
 )
 
 // CreateStatefulSet creates a StatefulSet from the manifest at manifestPath in the Namespace ns using kubectl create.
@@ -43,10 +43,10 @@ func CreateStatefulSet(c clientset.Interface, manifestPath, ns string) *appsv1.S
 	}
 
 	framework.Logf("Parsing statefulset from %v", mkpath("statefulset.yaml"))
-	ss, err := manifest.StatefulSetFromManifest(mkpath("statefulset.yaml"), ns)
+	ss, err := e2emanifest.StatefulSetFromManifest(mkpath("statefulset.yaml"), ns)
 	framework.ExpectNoError(err)
 	framework.Logf("Parsing service from %v", mkpath("service.yaml"))
-	svc, err := manifest.SvcFromManifest(mkpath("service.yaml"))
+	svc, err := e2emanifest.SvcFromManifest(mkpath("service.yaml"))
 	framework.ExpectNoError(err)
 
 	framework.Logf(fmt.Sprintf("creating " + ss.Name + " service"))