e2e-node: move to embedded test manifests

Signed-off-by: Nabarun Pal <pal.nabarun95@gmail.com>
This commit is contained in:
Nabarun Pal 2021-06-01 17:44:22 +05:30
parent d98b2dd2d6
commit bbccf2ecb4
No known key found for this signature in database
GPG Key ID: 611D5079D826B150

View File

@ -27,6 +27,7 @@ import (
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"os" "os"
"os/exec" "os/exec"
@ -44,11 +45,8 @@ import (
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2econfig "k8s.io/kubernetes/test/e2e/framework/config" e2econfig "k8s.io/kubernetes/test/e2e/framework/config"
e2etestfiles "k8s.io/kubernetes/test/e2e/framework/testfiles" e2etestfiles "k8s.io/kubernetes/test/e2e/framework/testfiles"
e2etestingmanifests "k8s.io/kubernetes/test/e2e/testing-manifests"
"k8s.io/kubernetes/test/e2e_node/services" "k8s.io/kubernetes/test/e2e_node/services"
e2enodetestingmanifests "k8s.io/kubernetes/test/e2e_node/testing-manifests" 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" system "k8s.io/system-validators/validators"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
@ -94,12 +92,7 @@ func registerNodeFlags(flags *flag.FlagSet) {
func init() { func init() {
// Enable embedded FS file lookup as fallback // 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(e2enodetestingmanifests.GetE2ENodeTestingManifestsFS())
e2etestfiles.AddFileSource(testimages.GetTestImagesFS())
e2etestfiles.AddFileSource(testfixtures.GetTestFixturesFS())
e2etestfiles.AddFileSource(conformancetestdata.GetConformanceTestdataFS())
} }
func TestMain(m *testing.M) { func TestMain(m *testing.M) {