github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #50236 from crassirostris/sig-instrumentation-e2e-last-move 

Automatic merge from submit-queue (batch tested with PRs 50091, 50231, 50238, 50236, 50243)

Move the sig-instrumentation test to a dedicated folder

Move the last remaining test to sig-instrumentation folder, also move "metrics" package to the "framework" folder

Related issue: https://github.com/kubernetes/kubernetes/issues/49161

/cc @xiangpengzhao @piosz
pull/6/head
Kubernetes Submit Queue 2017-08-07 07:14:58 -07:00 committed by GitHub
parent 969ae1ebee e79a228a78
commit 2d5729e227
21 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.golint_failures
View File

@ -813,13 +813,13 @@ test/e2e/autoscaling
test/e2e/chaosmonkey
test/e2e/common
test/e2e/framework
test/e2e/framework/metrics
test/e2e/instrumentation
test/e2e/instrumentation/logging
test/e2e/instrumentation/monitoring
test/e2e/kubectl
test/e2e/lifecycle
test/e2e/lifecycle/bootstrap
test/e2e/metrics
test/e2e/network
test/e2e/node
test/e2e/scalability

6
test/e2e/BUILD
View File

@ -12,7 +12,6 @@ go_test(
name = "go_default_test",
srcs = [
"e2e_test.go",
"metrics_grabber_test.go",
"taints_test.go",
],
library = ":go_default_library",
@ -26,14 +25,12 @@ go_test(
"//test/e2e/kubectl:go_default_library",
"//test/e2e/lifecycle:go_default_library",
"//test/e2e/lifecycle/bootstrap:go_default_library",
"//test/e2e/metrics:go_default_library",
"//test/e2e/network:go_default_library",
"//test/e2e/scalability:go_default_library",
"//test/e2e/scheduling:go_default_library",
"//test/e2e/storage:go_default_library",
"//test/utils:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@ -85,9 +82,9 @@ go_library(
"//test/e2e/common:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/ginkgowrapper:go_default_library",
"//test/e2e/framework/metrics:go_default_library",
"//test/e2e/generated:go_default_library",
"//test/e2e/manifest:go_default_library",
"//test/e2e/metrics:go_default_library",
"//test/e2e_federation:go_default_library",
"//test/utils:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
@ -155,7 +152,6 @@ filegroup(
"//test/e2e/kubectl:all-srcs",
"//test/e2e/lifecycle:all-srcs",
"//test/e2e/manifest:all-srcs",
"//test/e2e/metrics:all-srcs",
"//test/e2e/network:all-srcs",
"//test/e2e/node:all-srcs",
"//test/e2e/perftype:all-srcs",

2
test/e2e/apimachinery/BUILD
View File

@ -28,7 +28,7 @@ go_library(
"//pkg/util/version:go_default_library",
"//test/e2e/apps:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/metrics:go_default_library",
"//test/e2e/framework/metrics:go_default_library",
"//test/utils:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",

2
test/e2e/apimachinery/garbage_collector.go
View File

@ -35,7 +35,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/metrics"
"k8s.io/kubernetes/test/e2e/framework/metrics"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

2
test/e2e/e2e.go
View File

@ -40,8 +40,8 @@ import (
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/framework/metrics"
"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"
)

3
test/e2e/framework/BUILD
View File

@ -79,8 +79,8 @@ go_library(
"//plugin/pkg/scheduler/algorithm/predicates:go_default_library",
"//plugin/pkg/scheduler/schedulercache:go_default_library",
"//test/e2e/framework/ginkgowrapper:go_default_library",
"//test/e2e/framework/metrics: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",
@ -152,6 +152,7 @@ filegroup(
srcs = [
":package-srcs",
"//test/e2e/framework/ginkgowrapper:all-srcs",
"//test/e2e/framework/metrics:all-srcs",
],
tags = ["automanaged"],
)

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

@ -43,7 +43,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/test/e2e/metrics"
"k8s.io/kubernetes/test/e2e/framework/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/test/e2e/metrics"
"k8s.io/kubernetes/test/e2e/framework/metrics"
"github.com/prometheus/common/model"
)

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

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

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

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

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

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

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

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

@ -33,7 +33,7 @@ import (
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/pkg/master/ports"
"k8s.io/kubernetes/pkg/util/system"
"k8s.io/kubernetes/test/e2e/metrics"
"k8s.io/kubernetes/test/e2e/framework/metrics"
"github.com/prometheus/common/expfmt"
"github.com/prometheus/common/model"

3
test/e2e/instrumentation/monitoring/BUILD
View File

@ -12,15 +12,18 @@ go_library(
srcs = [
"cadvisor.go",
"influxdb.go",
"metrics_grabber.go",
"stackdriver.go",
],
tags = ["automanaged"],
deps = [
"//test/e2e/common:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/metrics:go_default_library",
"//test/e2e/instrumentation/common:go_default_library",
"//vendor/github.com/influxdata/influxdb/client/v2:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/golang.org/x/oauth2/google:go_default_library",
"//vendor/google.golang.org/api/monitoring/v3:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

39
test/e2e/metrics_grabber_test.go → test/e2e/instrumentation/monitoring/metrics_grabber.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e
package monitoring
import (
"strings"
@ -22,17 +22,18 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/metrics"
"k8s.io/kubernetes/test/e2e/framework/metrics"
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
gin "github.com/onsi/ginkgo"
gom "github.com/onsi/gomega"
)
var _ = framework.KubeDescribe("MetricsGrabber", func() {
var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
f := framework.NewDefaultFramework("metrics-grabber")
var c clientset.Interface
var grabber *metrics.MetricsGrabber
BeforeEach(func() {
gin.BeforeEach(func() {
var err error
c = f.ClientSet
framework.ExpectNoError(err)
@ -40,24 +41,24 @@ var _ = framework.KubeDescribe("MetricsGrabber", func() {
framework.ExpectNoError(err)
})
It("should grab all metrics from API server.", func() {
By("Connecting to /metrics endpoint")
gin.It("should grab all metrics from API server.", func() {
gin.By("Connecting to /metrics endpoint")
response, err := grabber.GrabFromApiServer()
framework.ExpectNoError(err)
Expect(response).NotTo(BeEmpty())
gom.Expect(response).NotTo(gom.BeEmpty())
})
It("should grab all metrics from a Kubelet.", func() {
By("Proxying to Node through the API server")
gin.It("should grab all metrics from a Kubelet.", func() {
gin.By("Proxying to Node through the API server")
nodes := framework.GetReadySchedulableNodesOrDie(f.ClientSet)
Expect(nodes.Items).NotTo(BeEmpty())
gom.Expect(nodes.Items).NotTo(gom.BeEmpty())
response, err := grabber.GrabFromKubelet(nodes.Items[0].Name)
framework.ExpectNoError(err)
Expect(response).NotTo(BeEmpty())
gom.Expect(response).NotTo(gom.BeEmpty())
})
It("should grab all metrics from a Scheduler.", func() {
By("Proxying to Pod through the API server")
gin.It("should grab all metrics from a Scheduler.", func() {
gin.By("Proxying to Pod through the API server")
// Check if master Node is registered
nodes, err := c.Core().Nodes().List(metav1.ListOptions{})
framework.ExpectNoError(err)
@ -74,11 +75,11 @@ var _ = framework.KubeDescribe("MetricsGrabber", func() {
}
response, err := grabber.GrabFromScheduler()
framework.ExpectNoError(err)
Expect(response).NotTo(BeEmpty())
gom.Expect(response).NotTo(gom.BeEmpty())
})
It("should grab all metrics from a ControllerManager.", func() {
By("Proxying to Pod through the API server")
gin.It("should grab all metrics from a ControllerManager.", func() {
gin.By("Proxying to Pod through the API server")
// Check if master Node is registered
nodes, err := c.Core().Nodes().List(metav1.ListOptions{})
framework.ExpectNoError(err)
@ -95,6 +96,6 @@ var _ = framework.KubeDescribe("MetricsGrabber", func() {
}
response, err := grabber.GrabFromControllerManager()
framework.ExpectNoError(err)
Expect(response).NotTo(BeEmpty())
gom.Expect(response).NotTo(gom.BeEmpty())
})
})

4
test/e2e_node/BUILD
View File

@ -36,7 +36,7 @@ go_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/framework/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",
@ -114,7 +114,7 @@ go_test(
"//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/framework/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

@ -34,7 +34,7 @@ import (
stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
kubemetrics "k8s.io/kubernetes/pkg/kubelet/metrics"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/metrics"
"k8s.io/kubernetes/test/e2e/framework/metrics"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

2
test/e2e_node/util.go
View File

@ -39,7 +39,7 @@ import (
stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/metrics"
"k8s.io/kubernetes/test/e2e/framework/metrics"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"