Skip to content

K
k3s
Commit 24cb1cec authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45758 from caesarxuchao/remove-vendor-heapster-v1alpha1

Automatic merge from submit-queue (batch tested with PRs 44337, 45775, 45832, 45574, 45758) Stop vendoring heapster v1alpha1 Changes to use the one in staging/metrics. TODO: remove the exception in https://github.com/kubernetes/kubernetes/pull/45176 Implementing https://github.com/kubernetes/kubernetes/issues/45498#issuecomment-301013423.
parents c03e4952 36e2d0b4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 198 deletions
Godeps/Godeps.json
View file @ 24cb1cec
...@@ -2865,11 +2865,6 @@ ...@@ -2865,11 +2865,6 @@
"Rev": "c2ac40f1adf8c42a79badddb2a2acd673cae3bcb" "Rev": "c2ac40f1adf8c42a79badddb2a2acd673cae3bcb"
}, },
{ {
"ImportPath": "k8s.io/heapster/metrics/apis/metrics/v1alpha1",
"Comment": "v1.2.0-beta.1",
"Rev": "c2ac40f1adf8c42a79badddb2a2acd673cae3bcb"
},
{
"ImportPath": "vbom.ml/util/sortorder", "ImportPath": "vbom.ml/util/sortorder",
"Rev": "db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394" "Rev": "db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394"
} }
......
pkg/controller/podautoscaler/BUILD
View file @ 24cb1cec
...@@ -61,7 +61,6 @@ go_test( ...@@ -61,7 +61,6 @@ go_test(
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library", "//pkg/api:go_default_library",
"//pkg/api/unversioned:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/autoscaling/install:go_default_library", "//pkg/apis/autoscaling/install:go_default_library",
"//pkg/apis/autoscaling/v1:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library",
...@@ -84,7 +83,6 @@ go_test( ...@@ -84,7 +83,6 @@ go_test(
"//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/testing:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library",
"//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library", "//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library",
"//vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1:go_default_library",
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library",
"//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake:go_default_library", "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake:go_default_library",
......
pkg/controller/podautoscaler/legacy_horizontal_test.go
View file @ 24cb1cec
...@@ -35,7 +35,6 @@ import ( ...@@ -35,7 +35,6 @@ import (
clientv1 "k8s.io/client-go/pkg/api/v1" clientv1 "k8s.io/client-go/pkg/api/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
...@@ -46,7 +45,7 @@ import ( ...@@ -46,7 +45,7 @@ import (
"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
heapster "k8s.io/heapster/metrics/api/v1/types" heapster "k8s.io/heapster/metrics/api/v1/types"
metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
...@@ -325,19 +324,19 @@ func (tc *legacyTestCase) prepareTestClient(t *testing.T) *fake.Clientset { ...@@ -325,19 +324,19 @@ func (tc *legacyTestCase) prepareTestClient(t *testing.T) *fake.Clientset {
metrics := metricsapi.PodMetricsList{} metrics := metricsapi.PodMetricsList{}
for i, cpu := range tc.reportedLevels { for i, cpu := range tc.reportedLevels {
podMetric := metricsapi.PodMetrics{ podMetric := metricsapi.PodMetrics{
ObjectMeta: v1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Name: fmt.Sprintf("%s-%d", podNamePrefix, i),
Namespace: namespace, Namespace: namespace,
}, },
Timestamp: unversioned.Time{Time: time.Now()}, Timestamp: metav1.Time{Time: time.Now()},
Containers: []metricsapi.ContainerMetrics{ Containers: []metricsapi.ContainerMetrics{
{ {
Name: "container", Name: "container",
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity( clientv1.ResourceCPU: *resource.NewMilliQuantity(
int64(cpu), int64(cpu),
resource.DecimalSI), resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity( clientv1.ResourceMemory: *resource.NewQuantity(
int64(1024*1024), int64(1024*1024),
resource.BinarySI), resource.BinarySI),
}, },
......
pkg/controller/podautoscaler/legacy_replica_calculator_test.go
View file @ 24cb1cec
...@@ -28,15 +28,15 @@ import ( ...@@ -28,15 +28,15 @@ import (
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
clientv1 "k8s.io/client-go/pkg/api/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
heapster "k8s.io/heapster/metrics/api/v1/types" heapster "k8s.io/heapster/metrics/api/v1/types"
metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
...@@ -116,19 +116,19 @@ func (tc *legacyReplicaCalcTestCase) prepareTestClient(t *testing.T) *fake.Clien ...@@ -116,19 +116,19 @@ func (tc *legacyReplicaCalcTestCase) prepareTestClient(t *testing.T) *fake.Clien
podName = tc.resource.podNames[i] podName = tc.resource.podNames[i]
} }
podMetric := metricsapi.PodMetrics{ podMetric := metricsapi.PodMetrics{
ObjectMeta: v1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: podName, Name: podName,
Namespace: testNamespace, Namespace: testNamespace,
}, },
Timestamp: unversioned.Time{Time: tc.timestamp}, Timestamp: metav1.Time{Time: tc.timestamp},
Containers: make([]metricsapi.ContainerMetrics, numContainersPerPod), Containers: make([]metricsapi.ContainerMetrics, numContainersPerPod),
} }
for i := 0; i < numContainersPerPod; i++ { for i := 0; i < numContainersPerPod; i++ {
podMetric.Containers[i] = metricsapi.ContainerMetrics{ podMetric.Containers[i] = metricsapi.ContainerMetrics{
Name: fmt.Sprintf("container%v", i), Name: fmt.Sprintf("container%v", i),
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceName(tc.resource.name): *resource.NewMilliQuantity( clientv1.ResourceName(tc.resource.name): *resource.NewMilliQuantity(
int64(resValue), int64(resValue),
resource.DecimalSI), resource.DecimalSI),
}, },
......
pkg/controller/podautoscaler/metrics/BUILD
View file @ 24cb1cec
...@@ -28,8 +28,8 @@ go_library( ...@@ -28,8 +28,8 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
"//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library", "//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library",
"//vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1:go_default_library",
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library",
"//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library",
"//vendor/k8s.io/metrics/pkg/client/custom_metrics:go_default_library", "//vendor/k8s.io/metrics/pkg/client/custom_metrics:go_default_library",
], ],
...@@ -45,7 +45,6 @@ go_test( ...@@ -45,7 +45,6 @@ go_test(
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library", "//pkg/api:go_default_library",
"//pkg/api/unversioned:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/autoscaling/v2alpha1:go_default_library", "//pkg/apis/autoscaling/v2alpha1:go_default_library",
"//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library",
...@@ -59,7 +58,6 @@ go_test( ...@@ -59,7 +58,6 @@ go_test(
"//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/testing:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library",
"//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library", "//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library",
"//vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1:go_default_library",
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library",
"//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake:go_default_library", "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake:go_default_library",
......
pkg/controller/podautoscaler/metrics/legacy_metrics_client.go
View file @ 24cb1cec
...@@ -24,10 +24,11 @@ import ( ...@@ -24,10 +24,11 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
heapster "k8s.io/heapster/metrics/api/v1/types" heapster "k8s.io/heapster/metrics/api/v1/types"
metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
clientgov1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
...@@ -90,7 +91,7 @@ func (h *HeapsterMetricsClient) GetResourceMetric(resource v1.ResourceName, name ...@@ -90,7 +91,7 @@ func (h *HeapsterMetricsClient) GetResourceMetric(resource v1.ResourceName, name
podSum := int64(0) podSum := int64(0)
missing := len(m.Containers) == 0 missing := len(m.Containers) == 0
for _, c := range m.Containers { for _, c := range m.Containers {
resValue, found := c.Usage[v1.ResourceName(resource)] resValue, found := c.Usage[clientgov1.ResourceName(resource)]
if !found { if !found {
missing = true missing = true
glog.V(2).Infof("missing resource metric %v for container %s in pod %s/%s", resource, c.Name, namespace, m.Name) glog.V(2).Infof("missing resource metric %v for container %s in pod %s/%s", resource, c.Name, namespace, m.Name)
......
pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go
View file @ 24cb1cec
...@@ -27,14 +27,14 @@ import ( ...@@ -27,14 +27,14 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
clientv1 "k8s.io/client-go/pkg/api/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
heapster "k8s.io/heapster/metrics/api/v1/types" heapster "k8s.io/heapster/metrics/api/v1/types"
metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
...@@ -105,21 +105,21 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { ...@@ -105,21 +105,21 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset {
metrics := metricsapi.PodMetricsList{} metrics := metricsapi.PodMetricsList{}
for i, containers := range tc.reportedPodMetrics { for i, containers := range tc.reportedPodMetrics {
metric := metricsapi.PodMetrics{ metric := metricsapi.PodMetrics{
ObjectMeta: v1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Name: fmt.Sprintf("%s-%d", podNamePrefix, i),
Namespace: namespace, Namespace: namespace,
}, },
Timestamp: unversioned.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)}, Timestamp: metav1.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)},
Containers: []metricsapi.ContainerMetrics{}, Containers: []metricsapi.ContainerMetrics{},
} }
for j, cpu := range containers { for j, cpu := range containers {
cm := metricsapi.ContainerMetrics{ cm := metricsapi.ContainerMetrics{
Name: fmt.Sprintf("%s-%d-container-%d", podNamePrefix, i, j), Name: fmt.Sprintf("%s-%d-container-%d", podNamePrefix, i, j),
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity( clientv1.ResourceCPU: *resource.NewMilliQuantity(
cpu, cpu,
resource.DecimalSI), resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity( clientv1.ResourceMemory: *resource.NewQuantity(
int64(1024*1024), int64(1024*1024),
resource.BinarySI), resource.BinarySI),
}, },
......
pkg/kubectl/cmd/BUILD
View file @ 24cb1cec
...@@ -200,7 +200,6 @@ go_test( ...@@ -200,7 +200,6 @@ go_test(
"//pkg/api/ref:go_default_library", "//pkg/api/ref:go_default_library",
"//pkg/api/testapi:go_default_library", "//pkg/api/testapi:go_default_library",
"//pkg/api/testing:go_default_library", "//pkg/api/testing:go_default_library",
"//pkg/api/unversioned:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/batch:go_default_library", "//pkg/apis/batch:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
...@@ -237,11 +236,12 @@ go_test( ...@@ -237,11 +236,12 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/dynamic:go_default_library", "//vendor/k8s.io/client-go/dynamic:go_default_library",
"//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/rest/fake:go_default_library", "//vendor/k8s.io/client-go/rest/fake:go_default_library",
"//vendor/k8s.io/client-go/rest/watch:go_default_library", "//vendor/k8s.io/client-go/rest/watch:go_default_library",
"//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library",
"//vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",
], ],
) )
......
pkg/kubectl/cmd/top_node_test.go
View file @ 24cb1cec
...@@ -26,9 +26,9 @@ import ( ...@@ -26,9 +26,9 @@ import (
"net/url" "net/url"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/heapster/metrics/apis/metrics/v1alpha1"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
"k8s.io/metrics/pkg/apis/metrics/v1alpha1"
) )
const ( const (
......
pkg/kubectl/cmd/top_pod_test.go
View file @ 24cb1cec
...@@ -26,12 +26,12 @@ import ( ...@@ -26,12 +26,12 @@ import (
"net/url" "net/url"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
v1 "k8s.io/kubernetes/pkg/api/v1"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
) )
const ( const (
...@@ -108,7 +108,7 @@ func TestTopPod(t *testing.T) { ...@@ -108,7 +108,7 @@ func TestTopPod(t *testing.T) {
response = expectedMetrics[0] response = expectedMetrics[0]
} else { } else {
response = metricsapi.PodMetricsList{ response = metricsapi.PodMetricsList{
ListMeta: unversioned.ListMeta{ ListMeta: metav1.ListMeta{
ResourceVersion: "2", ResourceVersion: "2",
}, },
Items: expectedMetrics, Items: expectedMetrics,
...@@ -173,67 +173,67 @@ func TestTopPod(t *testing.T) { ...@@ -173,67 +173,67 @@ func TestTopPod(t *testing.T) {
func testPodMetricsData() []metricsapi.PodMetrics { func testPodMetricsData() []metricsapi.PodMetrics {
return []metricsapi.PodMetrics{ return []metricsapi.PodMetrics{
{ {
ObjectMeta: v1.ObjectMeta{Name: "pod1", Namespace: "test", ResourceVersion: "10"}, ObjectMeta: metav1.ObjectMeta{Name: "pod1", Namespace: "test", ResourceVersion: "10"},
Window: unversioned.Duration{Duration: time.Minute}, Window: metav1.Duration{Duration: time.Minute},
Containers: []metricsapi.ContainerMetrics{ Containers: []metricsapi.ContainerMetrics{
{ {
Name: "container1-1", Name: "container1-1",
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), clientv1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), clientv1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI),
v1.ResourceStorage: *resource.NewQuantity(3*(1024*1024), resource.DecimalSI), clientv1.ResourceStorage: *resource.NewQuantity(3*(1024*1024), resource.DecimalSI),
}, },
}, },
{ {
Name: "container1-2", Name: "container1-2",
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(4, resource.DecimalSI), clientv1.ResourceCPU: *resource.NewMilliQuantity(4, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(5*(1024*1024), resource.DecimalSI), clientv1.ResourceMemory: *resource.NewQuantity(5*(1024*1024), resource.DecimalSI),
v1.ResourceStorage: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), clientv1.ResourceStorage: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI),
}, },
}, },
}, },
}, },
{ {
ObjectMeta: v1.ObjectMeta{Name: "pod2", Namespace: "test", ResourceVersion: "11"}, ObjectMeta: metav1.ObjectMeta{Name: "pod2", Namespace: "test", ResourceVersion: "11"},
Window: unversioned.Duration{Duration: time.Minute}, Window: metav1.Duration{Duration: time.Minute},
Containers: []metricsapi.ContainerMetrics{ Containers: []metricsapi.ContainerMetrics{
{ {
Name: "container2-1", Name: "container2-1",
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(7, resource.DecimalSI), clientv1.ResourceCPU: *resource.NewMilliQuantity(7, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(8*(1024*1024), resource.DecimalSI), clientv1.ResourceMemory: *resource.NewQuantity(8*(1024*1024), resource.DecimalSI),
v1.ResourceStorage: *resource.NewQuantity(9*(1024*1024), resource.DecimalSI), clientv1.ResourceStorage: *resource.NewQuantity(9*(1024*1024), resource.DecimalSI),
}, },
}, },
{ {
Name: "container2-2", Name: "container2-2",
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(10, resource.DecimalSI), clientv1.ResourceCPU: *resource.NewMilliQuantity(10, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(11*(1024*1024), resource.DecimalSI), clientv1.ResourceMemory: *resource.NewQuantity(11*(1024*1024), resource.DecimalSI),
v1.ResourceStorage: *resource.NewQuantity(12*(1024*1024), resource.DecimalSI), clientv1.ResourceStorage: *resource.NewQuantity(12*(1024*1024), resource.DecimalSI),
}, },
}, },
{ {
Name: "container2-3", Name: "container2-3",
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(13, resource.DecimalSI), clientv1.ResourceCPU: *resource.NewMilliQuantity(13, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(14*(1024*1024), resource.DecimalSI), clientv1.ResourceMemory: *resource.NewQuantity(14*(1024*1024), resource.DecimalSI),
v1.ResourceStorage: *resource.NewQuantity(15*(1024*1024), resource.DecimalSI), clientv1.ResourceStorage: *resource.NewQuantity(15*(1024*1024), resource.DecimalSI),
}, },
}, },
}, },
}, },
{ {
ObjectMeta: v1.ObjectMeta{Name: "pod3", Namespace: "test", ResourceVersion: "12"}, ObjectMeta: metav1.ObjectMeta{Name: "pod3", Namespace: "test", ResourceVersion: "12"},
Window: unversioned.Duration{Duration: time.Minute}, Window: metav1.Duration{Duration: time.Minute},
Containers: []metricsapi.ContainerMetrics{ Containers: []metricsapi.ContainerMetrics{
{ {
Name: "container3-1", Name: "container3-1",
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(7, resource.DecimalSI), clientv1.ResourceCPU: *resource.NewMilliQuantity(7, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(8*(1024*1024), resource.DecimalSI), clientv1.ResourceMemory: *resource.NewQuantity(8*(1024*1024), resource.DecimalSI),
v1.ResourceStorage: *resource.NewQuantity(9*(1024*1024), resource.DecimalSI), clientv1.ResourceStorage: *resource.NewQuantity(9*(1024*1024), resource.DecimalSI),
}, },
}, },
}, },
......
pkg/kubectl/cmd/top_test.go
View file @ 24cb1cec
...@@ -27,11 +27,10 @@ import ( ...@@ -27,11 +27,10 @@ import (
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" clientv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
v1 "k8s.io/kubernetes/pkg/api/v1"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
) )
const ( const (
...@@ -62,26 +61,26 @@ func marshallBody(metrics interface{}) (io.ReadCloser, error) { ...@@ -62,26 +61,26 @@ func marshallBody(metrics interface{}) (io.ReadCloser, error) {
func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) {
metrics := &metricsapi.NodeMetricsList{ metrics := &metricsapi.NodeMetricsList{
ListMeta: unversioned.ListMeta{ ListMeta: metav1.ListMeta{
ResourceVersion: "1", ResourceVersion: "1",
}, },
Items: []metricsapi.NodeMetrics{ Items: []metricsapi.NodeMetrics{
{ {
ObjectMeta: v1.ObjectMeta{Name: "node1", ResourceVersion: "10"}, ObjectMeta: metav1.ObjectMeta{Name: "node1", ResourceVersion: "10"},
Window: unversioned.Duration{Duration: time.Minute}, Window: metav1.Duration{Duration: time.Minute},
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), clientv1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), clientv1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI),
v1.ResourceStorage: *resource.NewQuantity(3*(1024*1024), resource.DecimalSI), clientv1.ResourceStorage: *resource.NewQuantity(3*(1024*1024), resource.DecimalSI),
}, },
}, },
{ {
ObjectMeta: v1.ObjectMeta{Name: "node2", ResourceVersion: "11"}, ObjectMeta: metav1.ObjectMeta{Name: "node2", ResourceVersion: "11"},
Window: unversioned.Duration{Duration: time.Minute}, Window: metav1.Duration{Duration: time.Minute},
Usage: v1.ResourceList{ Usage: clientv1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(5, resource.DecimalSI), clientv1.ResourceCPU: *resource.NewMilliQuantity(5, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), clientv1.ResourceMemory: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI),
v1.ResourceStorage: *resource.NewQuantity(7*(1024*1024), resource.DecimalSI), clientv1.ResourceStorage: *resource.NewQuantity(7*(1024*1024), resource.DecimalSI),
}, },
}, },
}, },
......
pkg/kubectl/metricsutil/BUILD
View file @ 24cb1cec
...@@ -23,7 +23,7 @@ go_library( ...@@ -23,7 +23,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",
], ],
) )
......
pkg/kubectl/metricsutil/metrics_client.go
View file @ 24cb1cec
...@@ -24,9 +24,9 @@ import ( ...@@ -24,9 +24,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1"
"k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/api/validation"
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
) )
const ( const (
......
pkg/kubectl/metricsutil/metrics_printer.go
View file @ 24cb1cec
...@@ -21,9 +21,9 @@ import ( ...@@ -21,9 +21,9 @@ import (
"io" "io"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/printers" "k8s.io/kubernetes/pkg/printers"
metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
) )
var ( var (
......
vendor/BUILD
View file @ 24cb1cec
...@@ -368,7 +368,6 @@ filegroup( ...@@ -368,7 +368,6 @@ filegroup(
"//vendor/k8s.io/gengo/parser:all-srcs", "//vendor/k8s.io/gengo/parser:all-srcs",
"//vendor/k8s.io/gengo/types:all-srcs", "//vendor/k8s.io/gengo/types:all-srcs",
"//vendor/k8s.io/heapster/metrics/api/v1/types:all-srcs", "//vendor/k8s.io/heapster/metrics/api/v1/types:all-srcs",
"//vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1:all-srcs",
"//vendor/vbom.ml/util/sortorder:all-srcs", "//vendor/vbom.ml/util/sortorder:all-srcs",
], ],
tags = ["automanaged"], tags = ["automanaged"],
......
vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1/BUILD deleted 100644 → 0
View file @ c03e4952
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
go_library(
name = "go_default_library",
srcs = ["types.go"],
tags = ["automanaged"],
deps = [
"//pkg/api/unversioned:go_default_library",
"//pkg/api/v1:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1/types.go deleted 100644 → 0
View file @ c03e4952
// Copyright 2016 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package v1alpha1
import (
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1"
)
// resource usage metrics of a node.
type NodeMetrics struct {
unversioned.TypeMeta `json:",inline"`
v1.ObjectMeta `json:"metadata,omitempty"`
// The following fields define time interval from which metrics were
// collected from the interval [Timestamp-Window, Timestamp].
Timestamp unversioned.Time `json:"timestamp"`
Window unversioned.Duration `json:"window"`
// The memory usage is the memory working set.
Usage v1.ResourceList `json:"usage"`
}
// NodeMetricsList is a list of NodeMetrics.
type NodeMetricsList struct {
unversioned.TypeMeta `json:",inline"`
// Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
unversioned.ListMeta `json:"metadata,omitempty"`
// List of node metrics.
Items []NodeMetrics `json:"items"`
}
// resource usage metrics of a pod.
type PodMetrics struct {
unversioned.TypeMeta `json:",inline"`
v1.ObjectMeta `json:"metadata,omitempty"`
// The following fields define time interval from which metrics were
// collected from the interval [Timestamp-Window, Timestamp].
Timestamp unversioned.Time `json:"timestamp"`
Window unversioned.Duration `json:"window"`
// Metrics for all containers are collected within the same time window.
Containers []ContainerMetrics `json:"containers"`
}
// PodMetricsList is a list of PodMetrics.
type PodMetricsList struct {
unversioned.TypeMeta `json:",inline"`
// Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
unversioned.ListMeta `json:"metadata,omitempty"`
// List of pod metrics.
Items []PodMetrics `json:"items"`
}
// resource usage metrics of a container.
type ContainerMetrics struct {
// Container name corresponding to the one from pod.spec.containers.
Name string `json:"name"`
// The memory usage is the memory working set.
Usage v1.ResourceList `json:"usage"`
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment