github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89641 from tanjunchen/remove-dependeny-20200330

Browse Source 
test/e2e/framework/kubelet/:remove the direct dependency to k8s.io/kubernetes/pkg
This commit is contained in:
Kubernetes Prow Robot 2020-03-30 08:22:37 -07:00 committed by GitHub
commit 9df42c0342
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/framework/kubelet/BUILD
View File

@ -12,7 +12,6 @@ go_library(
deps = [
"//pkg/kubelet/apis/config:go_default_library",
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/dockershim/metrics:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",

19
test/e2e/framework/kubelet/stats.go
View File

@ -34,7 +34,6 @@ import (
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
dockermetrics "k8s.io/kubernetes/pkg/kubelet/dockershim/metrics"
"k8s.io/kubernetes/test/e2e/framework"
e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics"
)
@ -42,6 +41,18 @@ import (
const (
// timeout for proxy requests.
proxyTimeout = 2 * time.Minute
// dockerOperationsKey is the key for docker operation metrics.
// copied from k8s.io/kubernetes/pkg/kubelet/dockershim/metrics
dockerOperationsKey = "docker_operations_total"
// dockerOperationsErrorsKey is the key for the operation error metrics.
// copied from k8s.io/kubernetes/pkg/kubelet/dockershim/metrics
dockerOperationsErrorsKey = "docker_operations_errors_total"
// dockerOperationsTimeoutKey is the key for the operation timeout metrics.
// copied from k8s.io/kubernetes/pkg/kubelet/dockershim/metrics
dockerOperationsTimeoutKey = "docker_operations_timeout_total"
)
// ContainerResourceUsage is a structure for gathering container resource usage.
@ -190,9 +201,9 @@ func getNodeRuntimeOperationErrorRate(c clientset.Interface, node string) (NodeR
}
// If no corresponding metrics are found, the returned samples will be empty. Then the following
// loop will be skipped automatically.
allOps := ms[dockermetrics.DockerOperationsKey]
errOps := ms[dockermetrics.DockerOperationsErrorsKey]
timeoutOps := ms[dockermetrics.DockerOperationsTimeoutKey]
allOps := ms[dockerOperationsKey]
errOps := ms[dockerOperationsErrorsKey]
timeoutOps := ms[dockerOperationsTimeoutKey]
for _, sample := range allOps {
operation := string(sample.Metric["operation_type"])
result[operation] = &RuntimeOperationErrorRate{TotalNumber: float64(sample.Value)}