From 55880e6b4b1e18af37e276325a83b27dd9b22e9d Mon Sep 17 00:00:00 2001 From: gmarek Date: Fri, 7 Jul 2017 13:13:44 +0200 Subject: [PATCH] Move metrics_grabbert to test/e2e --- pkg/BUILD | 1 - test/e2e/BUILD | 5 +++-- test/e2e/e2e.go | 2 +- test/e2e/framework/BUILD | 2 +- test/e2e/framework/framework.go | 2 +- test/e2e/framework/kubelet_stats.go | 2 +- test/e2e/framework/metrics_util.go | 2 +- test/e2e/garbage_collector.go | 2 +- {pkg => test/e2e}/metrics/BUILD | 0 {pkg => test/e2e}/metrics/api_server_metrics.go | 0 {pkg => test/e2e}/metrics/controller_manager_metrics.go | 0 {pkg => test/e2e}/metrics/generic_metrics.go | 0 {pkg => test/e2e}/metrics/kubelet_metrics.go | 0 {pkg => test/e2e}/metrics/metrics_grabber.go | 0 {pkg => test/e2e}/metrics/scheduler_metrics.go | 0 test/e2e/metrics_grabber_test.go | 2 +- test/e2e_node/BUILD | 4 ++-- test/e2e_node/density_test.go | 2 +- test/e2e_node/util.go | 2 +- 19 files changed, 14 insertions(+), 14 deletions(-) rename {pkg => test/e2e}/metrics/BUILD (100%) rename {pkg => test/e2e}/metrics/api_server_metrics.go (100%) rename {pkg => test/e2e}/metrics/controller_manager_metrics.go (100%) rename {pkg => test/e2e}/metrics/generic_metrics.go (100%) rename {pkg => test/e2e}/metrics/kubelet_metrics.go (100%) rename {pkg => test/e2e}/metrics/metrics_grabber.go (100%) rename {pkg => test/e2e}/metrics/scheduler_metrics.go (100%) diff --git a/pkg/BUILD b/pkg/BUILD index b7edeac6d32..38542dc90f7 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -101,7 +101,6 @@ filegroup( "//pkg/kubemark:all-srcs", "//pkg/labels:all-srcs", "//pkg/master:all-srcs", - "//pkg/metrics:all-srcs", "//pkg/printers:all-srcs", "//pkg/probe:all-srcs", "//pkg/proxy:all-srcs", diff --git a/test/e2e/BUILD b/test/e2e/BUILD index ae5d48ecf08..740a8038877 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -19,12 +19,12 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/metrics:go_default_library", "//test/e2e/api:go_default_library", "//test/e2e/autoscaling:go_default_library", "//test/e2e/cluster-logging:go_default_library", "//test/e2e/extension:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/metrics:go_default_library", "//test/e2e/perf:go_default_library", "//test/e2e/scheduling:go_default_library", "//test/e2e/storage:go_default_library", @@ -128,7 +128,6 @@ go_library( "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/pod:go_default_library", "//pkg/master/ports:go_default_library", - "//pkg/metrics:go_default_library", "//pkg/quota/evaluator/core:go_default_library", "//pkg/util/exec:go_default_library", "//pkg/util/logs:go_default_library", @@ -140,6 +139,7 @@ go_library( "//test/e2e/framework/ginkgowrapper:go_default_library", "//test/e2e/generated:go_default_library", "//test/e2e/manifest:go_default_library", + "//test/e2e/metrics:go_default_library", "//test/e2e/perf:go_default_library", "//test/e2e/scheduling:go_default_library", "//test/e2e/upgrades:go_default_library", @@ -228,6 +228,7 @@ filegroup( "//test/e2e/framework:all-srcs", "//test/e2e/generated:all-srcs", "//test/e2e/manifest:all-srcs", + "//test/e2e/metrics:all-srcs", "//test/e2e/perf:all-srcs", "//test/e2e/perftype:all-srcs", "//test/e2e/scheduling:all-srcs", diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index a77c3f128a7..2c455cc2b7e 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -36,12 +36,12 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" - "k8s.io/kubernetes/pkg/metrics" "k8s.io/kubernetes/pkg/util/logs" commontest "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" "k8s.io/kubernetes/test/e2e/manifest" + "k8s.io/kubernetes/test/e2e/metrics" federationtest "k8s.io/kubernetes/test/e2e_federation" testutils "k8s.io/kubernetes/test/utils" ) diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index e1b7222a209..e4c25d850d4 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -72,7 +72,6 @@ go_library( "//pkg/kubelet/sysctl:go_default_library", "//pkg/kubelet/util/format:go_default_library", "//pkg/master/ports:go_default_library", - "//pkg/metrics:go_default_library", "//pkg/ssh:go_default_library", "//pkg/util:go_default_library", "//pkg/util/exec:go_default_library", @@ -84,6 +83,7 @@ go_library( "//plugin/pkg/scheduler/schedulercache:go_default_library", "//test/e2e/framework/ginkgowrapper:go_default_library", "//test/e2e/manifest:go_default_library", + "//test/e2e/metrics:go_default_library", "//test/e2e/perftype:go_default_library", "//test/utils:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 90043531948..064965ba7a4 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -43,7 +43,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/metrics" + "k8s.io/kubernetes/test/e2e/metrics" testutils "k8s.io/kubernetes/test/utils" . "github.com/onsi/ginkgo" diff --git a/test/e2e/framework/kubelet_stats.go b/test/e2e/framework/kubelet_stats.go index fc065ad9721..78d1a7f9f01 100644 --- a/test/e2e/framework/kubelet_stats.go +++ b/test/e2e/framework/kubelet_stats.go @@ -37,7 +37,7 @@ import ( stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/kubernetes/pkg/master/ports" - "k8s.io/kubernetes/pkg/metrics" + "k8s.io/kubernetes/test/e2e/metrics" "github.com/prometheus/common/model" ) diff --git a/test/e2e/framework/metrics_util.go b/test/e2e/framework/metrics_util.go index dfde399468e..34944d57316 100644 --- a/test/e2e/framework/metrics_util.go +++ b/test/e2e/framework/metrics_util.go @@ -32,8 +32,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/master/ports" - "k8s.io/kubernetes/pkg/metrics" "k8s.io/kubernetes/pkg/util/system" + "k8s.io/kubernetes/test/e2e/metrics" "github.com/prometheus/common/expfmt" "github.com/prometheus/common/model" diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go index 95e43d34892..9b2da511b7d 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/garbage_collector.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/metrics" "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/kubernetes/test/e2e/metrics" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/metrics/BUILD b/test/e2e/metrics/BUILD similarity index 100% rename from pkg/metrics/BUILD rename to test/e2e/metrics/BUILD diff --git a/pkg/metrics/api_server_metrics.go b/test/e2e/metrics/api_server_metrics.go similarity index 100% rename from pkg/metrics/api_server_metrics.go rename to test/e2e/metrics/api_server_metrics.go diff --git a/pkg/metrics/controller_manager_metrics.go b/test/e2e/metrics/controller_manager_metrics.go similarity index 100% rename from pkg/metrics/controller_manager_metrics.go rename to test/e2e/metrics/controller_manager_metrics.go diff --git a/pkg/metrics/generic_metrics.go b/test/e2e/metrics/generic_metrics.go similarity index 100% rename from pkg/metrics/generic_metrics.go rename to test/e2e/metrics/generic_metrics.go diff --git a/pkg/metrics/kubelet_metrics.go b/test/e2e/metrics/kubelet_metrics.go similarity index 100% rename from pkg/metrics/kubelet_metrics.go rename to test/e2e/metrics/kubelet_metrics.go diff --git a/pkg/metrics/metrics_grabber.go b/test/e2e/metrics/metrics_grabber.go similarity index 100% rename from pkg/metrics/metrics_grabber.go rename to test/e2e/metrics/metrics_grabber.go diff --git a/pkg/metrics/scheduler_metrics.go b/test/e2e/metrics/scheduler_metrics.go similarity index 100% rename from pkg/metrics/scheduler_metrics.go rename to test/e2e/metrics/scheduler_metrics.go diff --git a/test/e2e/metrics_grabber_test.go b/test/e2e/metrics_grabber_test.go index 60d4af088e0..f419134eb2f 100644 --- a/test/e2e/metrics_grabber_test.go +++ b/test/e2e/metrics_grabber_test.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/metrics" "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/kubernetes/test/e2e/metrics" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index 0d88c27ae00..bd1137eb8ff 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -35,10 +35,10 @@ go_library( "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//pkg/kubelet/remote:go_default_library", - "//pkg/metrics:go_default_library", "//pkg/util/procfs:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/metrics:go_default_library", "//test/e2e/perftype:go_default_library", "//test/e2e_node/perftype:go_default_library", "//vendor/github.com/golang/glog:go_default_library", @@ -109,10 +109,10 @@ go_test( "//pkg/kubelet/images:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//pkg/kubelet/types:go_default_library", - "//pkg/metrics:go_default_library", "//pkg/security/apparmor:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/metrics:go_default_library", "//test/e2e_node/services:go_default_library", "//test/e2e_node/system:go_default_library", "//test/utils:go_default_library", diff --git a/test/e2e_node/density_test.go b/test/e2e_node/density_test.go index 2dad577f996..8aabd88d281 100644 --- a/test/e2e_node/density_test.go +++ b/test/e2e_node/density_test.go @@ -33,8 +33,8 @@ import ( "k8s.io/client-go/tools/cache" stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" kubemetrics "k8s.io/kubernetes/pkg/kubelet/metrics" - "k8s.io/kubernetes/pkg/metrics" "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/kubernetes/test/e2e/metrics" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index 6e30e0dd2f8..6b91f59fc2d 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -37,8 +37,8 @@ import ( v1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics" - "k8s.io/kubernetes/pkg/metrics" "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/kubernetes/test/e2e/metrics" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega"