github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Move metrics_grabbert to test/e2e

Browse Source
This commit is contained in:
gmarek 2017-07-07 13:13:44 +02:00
parent a9bf44101b
commit 55880e6b4b
19 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/BUILD
View File

@ -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",

5
test/e2e/BUILD
View File

@ -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",

2
test/e2e/e2e.go
View File

@ -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"
)

2
test/e2e/framework/BUILD
View File

@ -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",

2
test/e2e/framework/framework.go
View File

@ -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"

2
test/e2e/framework/kubelet_stats.go
View File

@ -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"
)

2
test/e2e/framework/metrics_util.go
View File

@ -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"

2
test/e2e/garbage_collector.go
View File

@ -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"

0
pkg/metrics/BUILD → test/e2e/metrics/BUILD
View File

0
pkg/metrics/api_server_metrics.go → test/e2e/metrics/api_server_metrics.go
View File

0
pkg/metrics/controller_manager_metrics.go → test/e2e/metrics/controller_manager_metrics.go
View File

0
pkg/metrics/generic_metrics.go → test/e2e/metrics/generic_metrics.go
View File

0
pkg/metrics/kubelet_metrics.go → test/e2e/metrics/kubelet_metrics.go
View File

0
pkg/metrics/metrics_grabber.go → test/e2e/metrics/metrics_grabber.go
View File

0
pkg/metrics/scheduler_metrics.go → test/e2e/metrics/scheduler_metrics.go
View File

2
test/e2e/metrics_grabber_test.go
View File

@ -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"

4
test/e2e_node/BUILD
View File

@ -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",

2
test/e2e_node/density_test.go
View File

@ -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"

2
test/e2e_node/util.go
View File

@ -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"