diff --git a/cmd/kubeadm/app/preflight/BUILD b/cmd/kubeadm/app/preflight/BUILD index a213dd0998..81b4e616c8 100644 --- a/cmd/kubeadm/app/preflight/BUILD +++ b/cmd/kubeadm/app/preflight/BUILD @@ -20,6 +20,7 @@ go_library( "//cmd/kubeadm/app/apis/kubeadm/v1alpha3:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", "//cmd/kubeadm/app/images:go_default_library", + "//cmd/kubeadm/app/util/system:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/util/initsystem:go_default_library", "//pkg/util/ipvs:go_default_library", @@ -27,7 +28,6 @@ go_library( "//pkg/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//test/e2e_node/system:go_default_library", "//vendor/github.com/PuerkitoBio/purell:go_default_library", "//vendor/github.com/blang/semver:go_default_library", "//vendor/github.com/golang/glog:go_default_library", diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index 88dfbba76b..826cc0de30 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -45,12 +45,12 @@ import ( kubeadmapiv1alpha3 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/images" + "k8s.io/kubernetes/cmd/kubeadm/app/util/system" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/util/initsystem" ipvsutil "k8s.io/kubernetes/pkg/util/ipvs" versionutil "k8s.io/kubernetes/pkg/util/version" kubeadmversion "k8s.io/kubernetes/pkg/version" - "k8s.io/kubernetes/test/e2e_node/system" utilsexec "k8s.io/utils/exec" ) diff --git a/cmd/kubeadm/app/util/BUILD b/cmd/kubeadm/app/util/BUILD index dc58000ff6..08eb8158a9 100644 --- a/cmd/kubeadm/app/util/BUILD +++ b/cmd/kubeadm/app/util/BUILD @@ -78,6 +78,7 @@ filegroup( "//cmd/kubeadm/app/util/kubeconfig:all-srcs", "//cmd/kubeadm/app/util/pubkeypin:all-srcs", "//cmd/kubeadm/app/util/staticpod:all-srcs", + "//cmd/kubeadm/app/util/system:all-srcs", ], tags = ["automanaged"], ) diff --git a/test/e2e_node/system/BUILD b/cmd/kubeadm/app/util/system/BUILD similarity index 95% rename from test/e2e_node/system/BUILD rename to cmd/kubeadm/app/util/system/BUILD index a3eb9e4f36..7dc1c6a624 100644 --- a/test/e2e_node/system/BUILD +++ b/cmd/kubeadm/app/util/system/BUILD @@ -21,7 +21,7 @@ go_library( "types_windows.go", "validators.go", ], - importpath = "k8s.io/kubernetes/test/e2e_node/system", + importpath = "k8s.io/kubernetes/cmd/kubeadm/app/util/system", deps = [ "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//vendor/github.com/blang/semver:go_default_library", diff --git a/test/e2e_node/system/cgroup_validator.go b/cmd/kubeadm/app/util/system/cgroup_validator.go similarity index 100% rename from test/e2e_node/system/cgroup_validator.go rename to cmd/kubeadm/app/util/system/cgroup_validator.go diff --git a/test/e2e_node/system/cgroup_validator_test.go b/cmd/kubeadm/app/util/system/cgroup_validator_test.go similarity index 100% rename from test/e2e_node/system/cgroup_validator_test.go rename to cmd/kubeadm/app/util/system/cgroup_validator_test.go diff --git a/test/e2e_node/system/docker_validator.go b/cmd/kubeadm/app/util/system/docker_validator.go similarity index 100% rename from test/e2e_node/system/docker_validator.go rename to cmd/kubeadm/app/util/system/docker_validator.go diff --git a/test/e2e_node/system/docker_validator_test.go b/cmd/kubeadm/app/util/system/docker_validator_test.go similarity index 100% rename from test/e2e_node/system/docker_validator_test.go rename to cmd/kubeadm/app/util/system/docker_validator_test.go diff --git a/test/e2e_node/system/kernel_validator.go b/cmd/kubeadm/app/util/system/kernel_validator.go similarity index 100% rename from test/e2e_node/system/kernel_validator.go rename to cmd/kubeadm/app/util/system/kernel_validator.go diff --git a/test/e2e_node/system/kernel_validator_helper.go b/cmd/kubeadm/app/util/system/kernel_validator_helper.go similarity index 100% rename from test/e2e_node/system/kernel_validator_helper.go rename to cmd/kubeadm/app/util/system/kernel_validator_helper.go diff --git a/test/e2e_node/system/kernel_validator_test.go b/cmd/kubeadm/app/util/system/kernel_validator_test.go similarity index 100% rename from test/e2e_node/system/kernel_validator_test.go rename to cmd/kubeadm/app/util/system/kernel_validator_test.go diff --git a/test/e2e_node/system/os_validator.go b/cmd/kubeadm/app/util/system/os_validator.go similarity index 100% rename from test/e2e_node/system/os_validator.go rename to cmd/kubeadm/app/util/system/os_validator.go diff --git a/test/e2e_node/system/os_validator_test.go b/cmd/kubeadm/app/util/system/os_validator_test.go similarity index 100% rename from test/e2e_node/system/os_validator_test.go rename to cmd/kubeadm/app/util/system/os_validator_test.go diff --git a/test/e2e_node/system/package_validator.go b/cmd/kubeadm/app/util/system/package_validator.go similarity index 100% rename from test/e2e_node/system/package_validator.go rename to cmd/kubeadm/app/util/system/package_validator.go diff --git a/test/e2e_node/system/package_validator_test.go b/cmd/kubeadm/app/util/system/package_validator_test.go similarity index 100% rename from test/e2e_node/system/package_validator_test.go rename to cmd/kubeadm/app/util/system/package_validator_test.go diff --git a/test/e2e_node/system/report.go b/cmd/kubeadm/app/util/system/report.go similarity index 100% rename from test/e2e_node/system/report.go rename to cmd/kubeadm/app/util/system/report.go diff --git a/test/e2e_node/system/specs/gke.yaml b/cmd/kubeadm/app/util/system/specs/gke.yaml similarity index 100% rename from test/e2e_node/system/specs/gke.yaml rename to cmd/kubeadm/app/util/system/specs/gke.yaml diff --git a/test/e2e_node/system/types.go b/cmd/kubeadm/app/util/system/types.go similarity index 100% rename from test/e2e_node/system/types.go rename to cmd/kubeadm/app/util/system/types.go diff --git a/test/e2e_node/system/types_unix.go b/cmd/kubeadm/app/util/system/types_unix.go similarity index 100% rename from test/e2e_node/system/types_unix.go rename to cmd/kubeadm/app/util/system/types_unix.go diff --git a/test/e2e_node/system/types_windows.go b/cmd/kubeadm/app/util/system/types_windows.go similarity index 100% rename from test/e2e_node/system/types_windows.go rename to cmd/kubeadm/app/util/system/types_windows.go diff --git a/test/e2e_node/system/validators.go b/cmd/kubeadm/app/util/system/validators.go similarity index 100% rename from test/e2e_node/system/validators.go rename to cmd/kubeadm/app/util/system/validators.go diff --git a/hack/.golint_failures b/hack/.golint_failures index fb6c335aeb..f597c9e39a 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -9,6 +9,7 @@ cmd/kubeadm/app cmd/kubeadm/app/apis/kubeadm/v1alpha2 cmd/kubeadm/app/apis/kubeadm/v1alpha3 cmd/kubeadm/app/util/config +cmd/kubeadm/app/util/system cmd/kubelet/app cmd/kubelet/app/options cmd/kubemark @@ -716,7 +717,6 @@ test/e2e_node/environment test/e2e_node/remote test/e2e_node/runner/remote test/e2e_node/services -test/e2e_node/system test/images/net/nat test/images/netexec test/images/nettest diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index 7988f517ee..03461b0c02 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -158,12 +158,12 @@ go_test( "//vendor/github.com/prometheus/common/model:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:linux": [ + "//cmd/kubeadm/app/util/system:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/yaml:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//test/e2e/common:go_default_library", - "//test/e2e_node/system:go_default_library", "//test/utils:go_default_library", "//vendor/github.com/kardianos/osext:go_default_library", "//vendor/github.com/onsi/ginkgo/config:go_default_library", @@ -201,7 +201,6 @@ filegroup( "//test/e2e_node/runner/local:all-srcs", "//test/e2e_node/runner/remote:all-srcs", "//test/e2e_node/services:all-srcs", - "//test/e2e_node/system:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/test/e2e_node/e2e_node_suite_test.go b/test/e2e_node/e2e_node_suite_test.go index 7b017401f0..91f3586ad4 100644 --- a/test/e2e_node/e2e_node_suite_test.go +++ b/test/e2e_node/e2e_node_suite_test.go @@ -38,11 +38,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilyaml "k8s.io/apimachinery/pkg/util/yaml" clientset "k8s.io/client-go/kubernetes" + "k8s.io/kubernetes/cmd/kubeadm/app/util/system" nodeutil "k8s.io/kubernetes/pkg/api/v1/node" commontest "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e_node/services" - "k8s.io/kubernetes/test/e2e_node/system" "github.com/golang/glog" "github.com/kardianos/osext" diff --git a/test/e2e_node/remote/node_e2e.go b/test/e2e_node/remote/node_e2e.go index d54b0d94b0..082437975e 100644 --- a/test/e2e_node/remote/node_e2e.go +++ b/test/e2e_node/remote/node_e2e.go @@ -31,7 +31,7 @@ import ( ) const ( - systemSpecPath = "test/e2e_node/system/specs" + systemSpecPath = "k8s.io/kubernetes/cmd/kubeadm/app/util/system/specs" ) // NodeE2ERemote contains the specific functions in the node e2e test suite. diff --git a/test/e2e_node/runner/local/run_local.go b/test/e2e_node/runner/local/run_local.go index c2c169e87b..9b01199929 100644 --- a/test/e2e_node/runner/local/run_local.go +++ b/test/e2e_node/runner/local/run_local.go @@ -33,10 +33,10 @@ import ( var buildDependencies = flag.Bool("build-dependencies", true, "If true, build all dependencies.") var ginkgoFlags = flag.String("ginkgo-flags", "", "Space-separated list of arguments to pass to Ginkgo test runner.") var testFlags = flag.String("test-flags", "", "Space-separated list of arguments to pass to node e2e test.") -var systemSpecName = flag.String("system-spec-name", "", "The name of the system spec used for validating the image in the node conformance test. The specs are at test/e2e_node/system/specs/. If unspecified, the default built-in spec (system.DefaultSpec) will be used.") +var systemSpecName = flag.String("system-spec-name", "", "The name of the system spec used for validating the image in the node conformance test. The specs are at k8s.io/kubernetes/cmd/kubeadm/app/util/system/specs/. If unspecified, the default built-in spec (system.DefaultSpec) will be used.") const ( - systemSpecPath = "test/e2e_node/system/specs" + systemSpecPath = "k8s.io/kubernetes/cmd/kubeadm/app/util/system/specs" ) func main() { diff --git a/test/e2e_node/runner/remote/run_remote.go b/test/e2e_node/runner/remote/run_remote.go index 7c440ad96b..d250761213 100644 --- a/test/e2e_node/runner/remote/run_remote.go +++ b/test/e2e_node/runner/remote/run_remote.go @@ -61,7 +61,7 @@ var buildOnly = flag.Bool("build-only", false, "If true, build e2e_node_test.tar var instanceMetadata = flag.String("instance-metadata", "", "key/value metadata for instances separated by '=' or '<', 'k=v' means the key is 'k' and the value is 'v'; 'k