From bbccf2ecb43c288e6b9a1365404a408f15b38e6d Mon Sep 17 00:00:00 2001 From: Nabarun Pal Date: Tue, 1 Jun 2021 17:44:22 +0530 Subject: [PATCH] e2e-node: move to embedded test manifests Signed-off-by: Nabarun Pal --- test/e2e_node/e2e_node_suite_test.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/test/e2e_node/e2e_node_suite_test.go b/test/e2e_node/e2e_node_suite_test.go index 0a9b30b1a24..8c864bf5f90 100644 --- a/test/e2e_node/e2e_node_suite_test.go +++ b/test/e2e_node/e2e_node_suite_test.go @@ -27,6 +27,7 @@ import ( "flag" "fmt" "io/ioutil" + "math/rand" "os" "os/exec" @@ -44,11 +45,8 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2econfig "k8s.io/kubernetes/test/e2e/framework/config" e2etestfiles "k8s.io/kubernetes/test/e2e/framework/testfiles" - e2etestingmanifests "k8s.io/kubernetes/test/e2e/testing-manifests" "k8s.io/kubernetes/test/e2e_node/services" e2enodetestingmanifests "k8s.io/kubernetes/test/e2e_node/testing-manifests" - testfixtures "k8s.io/kubernetes/test/fixtures" - testimages "k8s.io/kubernetes/test/images" system "k8s.io/system-validators/validators" "github.com/onsi/ginkgo" @@ -94,12 +92,7 @@ func registerNodeFlags(flags *flag.FlagSet) { func init() { // Enable embedded FS file lookup as fallback - // TODO: This needs to be cleaned up later to include only file sources which are necessary. - e2etestfiles.AddFileSource(e2etestingmanifests.GetE2ETestingManifestsFS()) e2etestfiles.AddFileSource(e2enodetestingmanifests.GetE2ENodeTestingManifestsFS()) - e2etestfiles.AddFileSource(testimages.GetTestImagesFS()) - e2etestfiles.AddFileSource(testfixtures.GetTestFixturesFS()) - e2etestfiles.AddFileSource(conformancetestdata.GetConformanceTestdataFS()) } func TestMain(m *testing.M) {