Merge pull request #84718 from yastij/remove-validators

remove system validators package from kubeadm and use k8s.io/system-validators
This commit is contained in:
Kubernetes Prow Robot
2019-11-12 11:50:53 -08:00
committed by GitHub
35 changed files with 439 additions and 813 deletions

View File

@@ -210,7 +210,6 @@ go_test(
"//vendor/k8s.io/klog:go_default_library",
] + select({
"@io_bazel_rules_go//go/platform:android": [
"//cmd/kubeadm/app/util/system:go_default_library",
"//pkg/kubelet/stats/pidlimit:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
@@ -224,9 +223,9 @@ go_test(
"//vendor/github.com/onsi/ginkgo/config:go_default_library",
"//vendor/github.com/onsi/ginkgo/reporters:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/system-validators/validators:go_default_library",
],
"@io_bazel_rules_go//go/platform:linux": [
"//cmd/kubeadm/app/util/system:go_default_library",
"//pkg/kubelet/stats/pidlimit:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
@@ -240,6 +239,7 @@ go_test(
"//vendor/github.com/onsi/ginkgo/config:go_default_library",
"//vendor/github.com/onsi/ginkgo/reporters:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/system-validators/validators:go_default_library",
],
"//conditions:default": [],
}),

View File

@@ -34,17 +34,17 @@ import (
"testing"
"time"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
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"
commontest "k8s.io/kubernetes/test/e2e/common"
"k8s.io/kubernetes/test/e2e/framework"
e2econfig "k8s.io/kubernetes/test/e2e/framework/config"
"k8s.io/kubernetes/test/e2e/framework/testfiles"
"k8s.io/kubernetes/test/e2e/generated"
"k8s.io/kubernetes/test/e2e_node/services"
system "k8s.io/system-validators/validators"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/config"