Skip to content

Commit

Permalink
Merge pull request kubernetes#92985 from serathius/summary
Browse files Browse the repository at this point in the history 
Move Kubelet Summary API to staging directory
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Sep 23, 2020
2 parents f404443 + 7d309e0 commit d19aec8
Showing 65 changed files with 86 additions and 84 deletions.
2 changes: 1 addition & 1 deletion hack/.import-aliases
View file
Original file line number Diff line number Diff line change
@@ -38,6 +38,7 @@
"k8s.io/api/storage/v1alpha1": "storagev1alpha1",
"k8s.io/api/storage/v1beta1": "storagev1beta1",
"k8s.io/apimachinery/pkg/api/errors": "apierrors",
"k8s.io/kubelet/apis/stats/v1alpha1": "kubeletstatsv1alpha1",
"k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1": "controllerconfigv1alpha1",
"k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1": "kubeletconfigv1beta1",
"k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha": "kubeletdevicepluginv1alpha",
@@ -47,7 +48,6 @@
"k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1": "kubeletpluginregistrationv1beta1",
"k8s.io/kubelet/pkg/apis/podresources/v1alpha1": "kubeletpodresourcesv1alpha1",
"k8s.io/kubernetes/pkg/kubelet/apis/resourcemetrics/v1alpha1": "kubeletresourcemetricsv1alpha1",
"k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1": "kubeletstatsv1alpha1",
"k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1": "proxyconfigv1alpha1",
"k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta1": "schedulerconfigv1beta1",
"k8s.io/kubernetes/test/e2e/framework/auth": "e2eauth",
1 change: 0 additions & 1 deletion pkg/kubelet/apis/BUILD
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,6 @@ filegroup(
":package-srcs",
"//pkg/kubelet/apis/config:all-srcs",
"//pkg/kubelet/apis/podresources:all-srcs",
"//pkg/kubelet/apis/stats/v1alpha1:all-srcs",
],
tags = ["automanaged"],
)
4 changes: 2 additions & 2 deletions pkg/kubelet/eviction/BUILD
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@ go_test(
"//pkg/apis/core:go_default_library",
"//pkg/apis/scheduling:go_default_library",
"//pkg/features:go_default_library",
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/eviction/api:go_default_library",
"//pkg/kubelet/lifecycle:go_default_library",
"//pkg/kubelet/types:go_default_library",
@@ -31,6 +30,7 @@ go_test(
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//vendor/github.com/stretchr/testify/mock:go_default_library",
],
)
@@ -53,7 +53,6 @@ go_library(
"//pkg/apis/core/v1/helper:go_default_library",
"//pkg/apis/core/v1/helper/qos:go_default_library",
"//pkg/features:go_default_library",
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/eviction/api:go_default_library",
"//pkg/kubelet/lifecycle:go_default_library",
@@ -69,6 +68,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
] + select({
"@io_bazel_rules_go//go/platform:android": [
2 changes: 1 addition & 1 deletion pkg/kubelet/eviction/eviction_manager.go
View file
Original file line number Diff line number Diff line change
@@ -30,11 +30,11 @@ import (
"k8s.io/apimachinery/pkg/util/clock"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/tools/record"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
apiv1resource "k8s.io/kubernetes/pkg/api/v1/resource"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos"
"k8s.io/kubernetes/pkg/features"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
"k8s.io/kubernetes/pkg/kubelet/metrics"
2 changes: 1 addition & 1 deletion pkg/kubelet/eviction/eviction_manager_test.go
View file
Original file line number Diff line number Diff line change
@@ -28,10 +28,10 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/tools/record"
featuregatetesting "k8s.io/component-base/featuregate/testing"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
kubeapi "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/scheduling"
"k8s.io/kubernetes/pkg/features"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
kubelettypes "k8s.io/kubernetes/pkg/kubelet/types"
2 changes: 1 addition & 1 deletion pkg/kubelet/eviction/helpers.go
View file
Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/klog/v2"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/api/v1/pod"
v1resource "k8s.io/kubernetes/pkg/api/v1/resource"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
volumeutils "k8s.io/kubernetes/pkg/volume/util"
2 changes: 1 addition & 1 deletion pkg/kubelet/eviction/helpers_test.go
View file
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ import (
"k8s.io/apimachinery/pkg/types"
utilfeature "k8s.io/apiserver/pkg/util/feature"
featuregatetesting "k8s.io/component-base/featuregate/testing"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/features"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
)
2 changes: 1 addition & 1 deletion pkg/kubelet/eviction/memory_threshold_notifier.go
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import (
"k8s.io/klog/v2"

"k8s.io/apimachinery/pkg/api/resource"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/cm"
evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
)
2 changes: 1 addition & 1 deletion pkg/kubelet/eviction/memory_threshold_notifier_test.go
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ import (
"time"

"k8s.io/apimachinery/pkg/api/resource"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
)

2 changes: 1 addition & 1 deletion pkg/kubelet/eviction/mock_threshold_notifier_test.go
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ package eviction

import (
mock "github.com/stretchr/testify/mock"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
)

// MockCgroupNotifier is a mock implementation of the CgroupNotifier interface
2 changes: 1 addition & 1 deletion pkg/kubelet/eviction/types.go
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
)

4 changes: 2 additions & 2 deletions pkg/kubelet/images/BUILD
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@ go_library(
],
importpath = "k8s.io/kubernetes/pkg/kubelet/images",
deps = [
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/events:go_default_library",
"//pkg/kubelet/util/sliceutils:go_default_library",
@@ -29,6 +28,7 @@ go_library(
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
"//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//vendor/github.com/docker/distribution/reference:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
@@ -42,7 +42,6 @@ go_test(
],
embed = [":go_default_library"],
deps = [
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/container/testing:go_default_library",
"//pkg/kubelet/server/stats/testing:go_default_library",
@@ -51,6 +50,7 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library",
],
2 changes: 1 addition & 1 deletion pkg/kubelet/images/image_gc_manager.go
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/tools/record"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
2 changes: 1 addition & 1 deletion pkg/kubelet/images/image_gc_manager_test.go
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ import (

"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/client-go/tools/record"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/container"
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing"
4 changes: 2 additions & 2 deletions pkg/kubelet/metrics/collectors/BUILD
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubelet/metrics/collectors",
visibility = ["//visibility:public"],
deps = [
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/metrics:go_default_library",
"//pkg/kubelet/server/stats:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/component-base/metrics:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
)
@@ -28,10 +28,10 @@ go_test(
],
embed = [":go_default_library"],
deps = [
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/server/stats/testing:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/component-base/metrics/testutil:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//vendor/github.com/stretchr/testify/mock:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/kubelet/metrics/collectors/log_metrics.go
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ package collectors
import (
"k8s.io/component-base/metrics"
"k8s.io/klog/v2"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
)

var (
2 changes: 1 addition & 1 deletion pkg/kubelet/metrics/collectors/log_metrics_test.go
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"testing"

"k8s.io/component-base/metrics/testutil"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
)

func TestNoMetricsCollected(t *testing.T) {
2 changes: 1 addition & 1 deletion pkg/kubelet/metrics/collectors/resource_metrics.go
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (

"k8s.io/component-base/metrics"
"k8s.io/klog/v2"
summary "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
summary "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/server/stats"
)

2 changes: 1 addition & 1 deletion pkg/kubelet/metrics/collectors/resource_metrics_test.go
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/component-base/metrics/testutil"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
)

type mockSummaryProvider struct {
2 changes: 1 addition & 1 deletion pkg/kubelet/metrics/collectors/volume_stats.go
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ package collectors
import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/component-base/metrics"
stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics"
serverstats "k8s.io/kubernetes/pkg/kubelet/server/stats"
)
2 changes: 1 addition & 1 deletion pkg/kubelet/metrics/collectors/volume_stats_test.go
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/component-base/metrics/testutil"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing"
)

2 changes: 1 addition & 1 deletion pkg/kubelet/server/BUILD
View file
Original file line number Diff line number Diff line change
@@ -73,7 +73,6 @@ go_test(
deps = [
"//pkg/apis/core:go_default_library",
"//pkg/apis/core/install:go_default_library",
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/cri/streaming:go_default_library",
@@ -92,6 +91,7 @@ go_test(
"//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library",
"//staging/src/k8s.io/client-go/util/testing:go_default_library",
"//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
2 changes: 1 addition & 1 deletion pkg/kubelet/server/server_test.go
View file
Original file line number Diff line number Diff line change
@@ -50,8 +50,8 @@ import (
"k8s.io/client-go/tools/remotecommand"
utiltesting "k8s.io/client-go/util/testing"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
api "k8s.io/kubernetes/pkg/apis/core"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
"k8s.io/utils/pointer"

// Do some initialization to decode the query parameters correctly.
4 changes: 2 additions & 2 deletions pkg/kubelet/server/stats/BUILD
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubelet/server/stats",
visibility = ["//visibility:public"],
deps = [
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/util:go_default_library",
@@ -25,6 +24,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//vendor/github.com/emicklei/go-restful:go_default_library",
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
@@ -42,12 +42,12 @@ go_test(
],
embed = [":go_default_library"],
deps = [
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/server/stats/testing:go_default_library",
"//pkg/volume:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
] + select({
"@io_bazel_rules_go//go/platform:aix": [
2 changes: 1 addition & 1 deletion pkg/kubelet/server/stats/handler.go
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ import (
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/cm"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/volume"
2 changes: 1 addition & 1 deletion pkg/kubelet/server/stats/summary.go
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (
"k8s.io/klog/v2"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/util"
)

2 changes: 1 addition & 1 deletion pkg/kubelet/server/stats/summary_sys_containers.go
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (
"k8s.io/klog/v2"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/cm"
)

2 changes: 1 addition & 1 deletion pkg/kubelet/server/stats/summary_sys_containers_windows.go
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (
"time"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/cm"
)

2 changes: 1 addition & 1 deletion pkg/kubelet/server/stats/summary_test.go
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ import (

"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/cm"
statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing"
)
2 changes: 1 addition & 1 deletion pkg/kubelet/server/stats/summary_windows_test.go
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ import (

"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/cm"
statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing"
)
2 changes: 1 addition & 1 deletion pkg/kubelet/server/stats/testing/BUILD
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubelet/server/stats/testing",
visibility = ["//visibility:public"],
deps = [
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/cm:go_default_library",
"//pkg/volume:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
"//vendor/github.com/stretchr/testify/mock:go_default_library",
2 changes: 1 addition & 1 deletion pkg/kubelet/server/stats/testing/mock_stats_provider.go
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import mock "github.com/stretchr/testify/mock"
import types "k8s.io/apimachinery/pkg/types"
import v1 "github.com/google/cadvisor/info/v1"
import v2 "github.com/google/cadvisor/info/v2"
import v1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
import v1alpha1 "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
import volume "k8s.io/kubernetes/pkg/volume"

// GENERATED BY mockery
Loading

0 comments on commit d19aec8

Please sign in to comment.