diff --git a/Makefile.e2e b/Makefile.e2e index 78a617f84..f5fb5f8be 100644 --- a/Makefile.e2e +++ b/Makefile.e2e @@ -36,7 +36,7 @@ e2e: NODE_NAME := vkubelet-mock-0 e2e: export VK_BUILD_TAGS += mock_provider e2e: e2e.clean bin/e2e/virtual-kubelet skaffold/run @echo Running tests... - cd $(PWD)/test/e2e && go test -v -timeout 5m -tags e2e ./... \ + cd $(PWD)/internal/test/e2e && go test -v -timeout 5m -tags e2e ./... \ -kubeconfig=$(KUBECONFIG) \ -namespace=$(NAMESPACE) \ -node-name=$(NODE_NAME) \ diff --git a/test/e2e/basic_test.go b/internal/test/e2e/basic_test.go similarity index 100% rename from test/e2e/basic_test.go rename to internal/test/e2e/basic_test.go diff --git a/test/e2e/framework/env.go b/internal/test/e2e/framework/env.go similarity index 100% rename from test/e2e/framework/env.go rename to internal/test/e2e/framework/env.go diff --git a/test/e2e/framework/framework.go b/internal/test/e2e/framework/framework.go similarity index 100% rename from test/e2e/framework/framework.go rename to internal/test/e2e/framework/framework.go diff --git a/test/e2e/framework/node.go b/internal/test/e2e/framework/node.go similarity index 100% rename from test/e2e/framework/node.go rename to internal/test/e2e/framework/node.go diff --git a/test/e2e/framework/pod.go b/internal/test/e2e/framework/pod.go similarity index 100% rename from test/e2e/framework/pod.go rename to internal/test/e2e/framework/pod.go diff --git a/test/e2e/framework/stats.go b/internal/test/e2e/framework/stats.go similarity index 100% rename from test/e2e/framework/stats.go rename to internal/test/e2e/framework/stats.go diff --git a/test/e2e/main_test.go b/internal/test/e2e/main_test.go similarity index 95% rename from test/e2e/main_test.go rename to internal/test/e2e/main_test.go index 577497573..e13fe92f2 100644 --- a/test/e2e/main_test.go +++ b/internal/test/e2e/main_test.go @@ -9,7 +9,7 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/virtual-kubelet/virtual-kubelet/test/e2e/framework" + "github.com/virtual-kubelet/virtual-kubelet/internal/test/e2e/framework" ) const ( diff --git a/test/e2e/node_test.go b/internal/test/e2e/node_test.go similarity index 100% rename from test/e2e/node_test.go rename to internal/test/e2e/node_test.go diff --git a/test/util/kubernetes.go b/internal/test/util/kubernetes.go similarity index 100% rename from test/util/kubernetes.go rename to internal/test/util/kubernetes.go diff --git a/test/util/resource_manager.go b/internal/test/util/resource_manager.go similarity index 100% rename from test/util/resource_manager.go rename to internal/test/util/resource_manager.go diff --git a/manager/resource_test.go b/manager/resource_test.go index fc740349b..f8c7866ca 100644 --- a/manager/resource_test.go +++ b/manager/resource_test.go @@ -8,8 +8,8 @@ import ( corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" + testutil "github.com/virtual-kubelet/virtual-kubelet/internal/test/util" "github.com/virtual-kubelet/virtual-kubelet/manager" - testutil "github.com/virtual-kubelet/virtual-kubelet/test/util" ) // TestGetPods verifies that the resource manager acts as a passthrough to a pod lister. diff --git a/vkubelet/env_internal_test.go b/vkubelet/env_internal_test.go index c0ec982af..ceb54eefb 100644 --- a/vkubelet/env_internal_test.go +++ b/vkubelet/env_internal_test.go @@ -11,7 +11,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - testutil "github.com/virtual-kubelet/virtual-kubelet/test/util" + testutil "github.com/virtual-kubelet/virtual-kubelet/internal/test/util" ) const ( diff --git a/vkubelet/pod_test.go b/vkubelet/pod_test.go index 88cb642d5..e2ed7902e 100644 --- a/vkubelet/pod_test.go +++ b/vkubelet/pod_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/virtual-kubelet/virtual-kubelet/errdefs" - testutil "github.com/virtual-kubelet/virtual-kubelet/test/util" + testutil "github.com/virtual-kubelet/virtual-kubelet/internal/test/util" "gotest.tools/assert" is "gotest.tools/assert/cmp" corev1 "k8s.io/api/core/v1"