mirror of https://github.com/k3s-io/k3s
Fix kubeadm checks import error
kubeadm checks package import path exist "kubernetes/test", So change the import path. * move "k8s.io/kubernetes/test/e2e_node/system" directory file to "k8s.io/kubernetes/cmd/kubeadm/app/util/system" * change system package import path * remove "k8s.io/kubernetes/test/e2e_node/system" directory Issues report link: https://github.com/kubernetes/kubeadm/issues/976 Signed-off-by: Yuanbin.Chen <cybing4@gmail.com>pull/8/head
parent
bc98f7a5f2
commit
f2eee3fe2a
|
@ -20,6 +20,7 @@ go_library(
|
||||||
"//cmd/kubeadm/app/apis/kubeadm/v1alpha3:go_default_library",
|
"//cmd/kubeadm/app/apis/kubeadm/v1alpha3:go_default_library",
|
||||||
"//cmd/kubeadm/app/constants:go_default_library",
|
"//cmd/kubeadm/app/constants:go_default_library",
|
||||||
"//cmd/kubeadm/app/images: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/registry/core/service/ipallocator:go_default_library",
|
||||||
"//pkg/util/initsystem:go_default_library",
|
"//pkg/util/initsystem:go_default_library",
|
||||||
"//pkg/util/ipvs:go_default_library",
|
"//pkg/util/ipvs:go_default_library",
|
||||||
|
@ -27,7 +28,6 @@ go_library(
|
||||||
"//pkg/version:go_default_library",
|
"//pkg/version:go_default_library",
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/util/net: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",
|
"//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/PuerkitoBio/purell:go_default_library",
|
||||||
"//vendor/github.com/blang/semver:go_default_library",
|
"//vendor/github.com/blang/semver:go_default_library",
|
||||||
"//vendor/github.com/golang/glog:go_default_library",
|
"//vendor/github.com/golang/glog:go_default_library",
|
||||||
|
|
|
@ -45,12 +45,12 @@ import (
|
||||||
kubeadmapiv1alpha3 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3"
|
kubeadmapiv1alpha3 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3"
|
||||||
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
||||||
"k8s.io/kubernetes/cmd/kubeadm/app/images"
|
"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/registry/core/service/ipallocator"
|
||||||
"k8s.io/kubernetes/pkg/util/initsystem"
|
"k8s.io/kubernetes/pkg/util/initsystem"
|
||||||
ipvsutil "k8s.io/kubernetes/pkg/util/ipvs"
|
ipvsutil "k8s.io/kubernetes/pkg/util/ipvs"
|
||||||
versionutil "k8s.io/kubernetes/pkg/util/version"
|
versionutil "k8s.io/kubernetes/pkg/util/version"
|
||||||
kubeadmversion "k8s.io/kubernetes/pkg/version"
|
kubeadmversion "k8s.io/kubernetes/pkg/version"
|
||||||
"k8s.io/kubernetes/test/e2e_node/system"
|
|
||||||
utilsexec "k8s.io/utils/exec"
|
utilsexec "k8s.io/utils/exec"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -78,6 +78,7 @@ filegroup(
|
||||||
"//cmd/kubeadm/app/util/kubeconfig:all-srcs",
|
"//cmd/kubeadm/app/util/kubeconfig:all-srcs",
|
||||||
"//cmd/kubeadm/app/util/pubkeypin:all-srcs",
|
"//cmd/kubeadm/app/util/pubkeypin:all-srcs",
|
||||||
"//cmd/kubeadm/app/util/staticpod:all-srcs",
|
"//cmd/kubeadm/app/util/staticpod:all-srcs",
|
||||||
|
"//cmd/kubeadm/app/util/system:all-srcs",
|
||||||
],
|
],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
)
|
)
|
||||||
|
|
|
@ -21,7 +21,7 @@ go_library(
|
||||||
"types_windows.go",
|
"types_windows.go",
|
||||||
"validators.go",
|
"validators.go",
|
||||||
],
|
],
|
||||||
importpath = "k8s.io/kubernetes/test/e2e_node/system",
|
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/util/system",
|
||||||
deps = [
|
deps = [
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
|
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
|
||||||
"//vendor/github.com/blang/semver:go_default_library",
|
"//vendor/github.com/blang/semver:go_default_library",
|
|
@ -9,6 +9,7 @@ cmd/kubeadm/app
|
||||||
cmd/kubeadm/app/apis/kubeadm/v1alpha2
|
cmd/kubeadm/app/apis/kubeadm/v1alpha2
|
||||||
cmd/kubeadm/app/apis/kubeadm/v1alpha3
|
cmd/kubeadm/app/apis/kubeadm/v1alpha3
|
||||||
cmd/kubeadm/app/util/config
|
cmd/kubeadm/app/util/config
|
||||||
|
cmd/kubeadm/app/util/system
|
||||||
cmd/kubelet/app
|
cmd/kubelet/app
|
||||||
cmd/kubelet/app/options
|
cmd/kubelet/app/options
|
||||||
cmd/kubemark
|
cmd/kubemark
|
||||||
|
@ -716,7 +717,6 @@ test/e2e_node/environment
|
||||||
test/e2e_node/remote
|
test/e2e_node/remote
|
||||||
test/e2e_node/runner/remote
|
test/e2e_node/runner/remote
|
||||||
test/e2e_node/services
|
test/e2e_node/services
|
||||||
test/e2e_node/system
|
|
||||||
test/images/net/nat
|
test/images/net/nat
|
||||||
test/images/netexec
|
test/images/netexec
|
||||||
test/images/nettest
|
test/images/nettest
|
||||||
|
|
|
@ -158,12 +158,12 @@ go_test(
|
||||||
"//vendor/github.com/prometheus/common/model:go_default_library",
|
"//vendor/github.com/prometheus/common/model:go_default_library",
|
||||||
] + select({
|
] + select({
|
||||||
"@io_bazel_rules_go//go/platform:linux": [
|
"@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/labels:go_default_library",
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/runtime: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/apimachinery/pkg/util/yaml:go_default_library",
|
||||||
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
|
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
|
||||||
"//test/e2e/common:go_default_library",
|
"//test/e2e/common:go_default_library",
|
||||||
"//test/e2e_node/system:go_default_library",
|
|
||||||
"//test/utils:go_default_library",
|
"//test/utils:go_default_library",
|
||||||
"//vendor/github.com/kardianos/osext:go_default_library",
|
"//vendor/github.com/kardianos/osext:go_default_library",
|
||||||
"//vendor/github.com/onsi/ginkgo/config: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/local:all-srcs",
|
||||||
"//test/e2e_node/runner/remote:all-srcs",
|
"//test/e2e_node/runner/remote:all-srcs",
|
||||||
"//test/e2e_node/services:all-srcs",
|
"//test/e2e_node/services:all-srcs",
|
||||||
"//test/e2e_node/system:all-srcs",
|
|
||||||
],
|
],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
|
|
|
@ -38,11 +38,11 @@ import (
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
utilyaml "k8s.io/apimachinery/pkg/util/yaml"
|
utilyaml "k8s.io/apimachinery/pkg/util/yaml"
|
||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
|
"k8s.io/kubernetes/cmd/kubeadm/app/util/system"
|
||||||
nodeutil "k8s.io/kubernetes/pkg/api/v1/node"
|
nodeutil "k8s.io/kubernetes/pkg/api/v1/node"
|
||||||
commontest "k8s.io/kubernetes/test/e2e/common"
|
commontest "k8s.io/kubernetes/test/e2e/common"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
"k8s.io/kubernetes/test/e2e_node/services"
|
"k8s.io/kubernetes/test/e2e_node/services"
|
||||||
"k8s.io/kubernetes/test/e2e_node/system"
|
|
||||||
|
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
"github.com/kardianos/osext"
|
"github.com/kardianos/osext"
|
||||||
|
|
|
@ -31,7 +31,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
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.
|
// NodeE2ERemote contains the specific functions in the node e2e test suite.
|
||||||
|
|
|
@ -33,10 +33,10 @@ import (
|
||||||
var buildDependencies = flag.Bool("build-dependencies", true, "If true, build all dependencies.")
|
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 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 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 (
|
const (
|
||||||
systemSpecPath = "test/e2e_node/system/specs"
|
systemSpecPath = "k8s.io/kubernetes/cmd/kubeadm/app/util/system/specs"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
|
@ -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<p' means the key is 'k' and the value is extracted from the local path 'p', e.g. k1=v1,k2<p2")
|
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<p' means the key is 'k' and the value is extracted from the local path 'p', e.g. k1=v1,k2<p2")
|
||||||
var gubernator = flag.Bool("gubernator", false, "If true, output Gubernator link to view logs")
|
var gubernator = flag.Bool("gubernator", false, "If true, output Gubernator link to view logs")
|
||||||
var ginkgoFlags = flag.String("ginkgo-flags", "", "Passed to ginkgo to specify additional flags such as --skip=.")
|
var ginkgoFlags = flag.String("ginkgo-flags", "", "Passed to ginkgo to specify additional flags such as --skip=.")
|
||||||
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.")
|
||||||
|
|
||||||
// envs is the type used to collect all node envs. The key is the env name,
|
// envs is the type used to collect all node envs. The key is the env name,
|
||||||
// and the value is the env value
|
// and the value is the env value
|
||||||
|
|
Loading…
Reference in New Issue