diff --git a/pkg/controller/podautoscaler/legacy_horizontal_test.go b/pkg/controller/podautoscaler/legacy_horizontal_test.go index fe809a0bf56..1bc2d9b2cf0 100644 --- a/pkg/controller/podautoscaler/legacy_horizontal_test.go +++ b/pkg/controller/podautoscaler/legacy_horizontal_test.go @@ -35,7 +35,6 @@ import ( clientv1 "k8s.io/client-go/pkg/api/v1" restclient "k8s.io/client-go/rest" core "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" @@ -46,7 +45,7 @@ import ( "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" 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" @@ -325,19 +324,19 @@ func (tc *legacyTestCase) prepareTestClient(t *testing.T) *fake.Clientset { metrics := metricsapi.PodMetricsList{} for i, cpu := range tc.reportedLevels { podMetric := metricsapi.PodMetrics{ - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Namespace: namespace, }, - Timestamp: unversioned.Time{Time: time.Now()}, + Timestamp: metav1.Time{Time: time.Now()}, Containers: []metricsapi.ContainerMetrics{ { Name: "container", - Usage: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity( + Usage: clientv1.ResourceList{ + clientv1.ResourceCPU: *resource.NewMilliQuantity( int64(cpu), resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity( + clientv1.ResourceMemory: *resource.NewQuantity( int64(1024*1024), resource.BinarySI), }, diff --git a/pkg/controller/podautoscaler/legacy_replica_calculator_test.go b/pkg/controller/podautoscaler/legacy_replica_calculator_test.go index ea2dc114687..cdb9b1685ca 100644 --- a/pkg/controller/podautoscaler/legacy_replica_calculator_test.go +++ b/pkg/controller/podautoscaler/legacy_replica_calculator_test.go @@ -28,15 +28,15 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + clientv1 "k8s.io/client-go/pkg/api/v1" restclient "k8s.io/client-go/rest" core "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" 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/require" @@ -116,19 +116,19 @@ func (tc *legacyReplicaCalcTestCase) prepareTestClient(t *testing.T) *fake.Clien podName = tc.resource.podNames[i] } podMetric := metricsapi.PodMetrics{ - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: podName, Namespace: testNamespace, }, - Timestamp: unversioned.Time{Time: tc.timestamp}, + Timestamp: metav1.Time{Time: tc.timestamp}, Containers: make([]metricsapi.ContainerMetrics, numContainersPerPod), } for i := 0; i < numContainersPerPod; i++ { podMetric.Containers[i] = metricsapi.ContainerMetrics{ Name: fmt.Sprintf("container%v", i), - Usage: v1.ResourceList{ - v1.ResourceName(tc.resource.name): *resource.NewMilliQuantity( + Usage: clientv1.ResourceList{ + clientv1.ResourceName(tc.resource.name): *resource.NewMilliQuantity( int64(resValue), resource.DecimalSI), }, diff --git a/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go b/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go index 3582770924e..64a102b9667 100644 --- a/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go +++ b/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go @@ -24,10 +24,11 @@ import ( "github.com/golang/glog" 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" "k8s.io/apimachinery/pkg/labels" + clientgov1 "k8s.io/client-go/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -90,7 +91,7 @@ func (h *HeapsterMetricsClient) GetResourceMetric(resource v1.ResourceName, name podSum := int64(0) missing := len(m.Containers) == 0 for _, c := range m.Containers { - resValue, found := c.Usage[v1.ResourceName(resource)] + resValue, found := c.Usage[clientgov1.ResourceName(resource)] if !found { missing = true glog.V(2).Infof("missing resource metric %v for container %s in pod %s/%s", resource, c.Name, namespace, m.Name) diff --git a/pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go b/pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go index 9a3cc6776ce..0ee74cd0c69 100644 --- a/pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go @@ -27,14 +27,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + clientv1 "k8s.io/client-go/pkg/api/v1" restclient "k8s.io/client-go/rest" core "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" 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" ) @@ -105,21 +105,21 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { metrics := metricsapi.PodMetricsList{} for i, containers := range tc.reportedPodMetrics { metric := metricsapi.PodMetrics{ - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: fmt.Sprintf("%s-%d", podNamePrefix, i), 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{}, } for j, cpu := range containers { cm := metricsapi.ContainerMetrics{ Name: fmt.Sprintf("%s-%d-container-%d", podNamePrefix, i, j), - Usage: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity( + Usage: clientv1.ResourceList{ + clientv1.ResourceCPU: *resource.NewMilliQuantity( cpu, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity( + clientv1.ResourceMemory: *resource.NewQuantity( int64(1024*1024), resource.BinarySI), }, diff --git a/pkg/kubectl/cmd/top_node_test.go b/pkg/kubectl/cmd/top_node_test.go index 7a50a2dbbf8..34fbdd68016 100644 --- a/pkg/kubectl/cmd/top_node_test.go +++ b/pkg/kubectl/cmd/top_node_test.go @@ -26,7 +26,7 @@ import ( "net/url" "k8s.io/client-go/rest/fake" - "k8s.io/heapster/metrics/apis/metrics/v1alpha1" + "k8s.io/metrics/pkg/apis/metrics/v1alpha1" "k8s.io/kubernetes/pkg/api" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" ) diff --git a/pkg/kubectl/cmd/top_pod_test.go b/pkg/kubectl/cmd/top_pod_test.go index f71ad7beeb3..56d3e09e67c 100644 --- a/pkg/kubectl/cmd/top_pod_test.go +++ b/pkg/kubectl/cmd/top_pod_test.go @@ -26,12 +26,12 @@ import ( "net/url" "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" - metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" "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" + metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1" ) const ( @@ -108,7 +108,7 @@ func TestTopPod(t *testing.T) { response = expectedMetrics[0] } else { response = metricsapi.PodMetricsList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "2", }, Items: expectedMetrics, @@ -173,67 +173,67 @@ func TestTopPod(t *testing.T) { func testPodMetricsData() []metricsapi.PodMetrics { return []metricsapi.PodMetrics{ { - ObjectMeta: v1.ObjectMeta{Name: "pod1", Namespace: "test", ResourceVersion: "10"}, - Window: unversioned.Duration{Duration: time.Minute}, + ObjectMeta: metav1.ObjectMeta{Name: "pod1", Namespace: "test", ResourceVersion: "10"}, + Window: metav1.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container1-1", - Usage: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), - v1.ResourceStorage: *resource.NewQuantity(3*(1024*1024), resource.DecimalSI), + Usage: clientv1.ResourceList{ + clientv1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + clientv1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), + clientv1.ResourceStorage: *resource.NewQuantity(3*(1024*1024), resource.DecimalSI), }, }, { Name: "container1-2", - Usage: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity(4, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(5*(1024*1024), resource.DecimalSI), - v1.ResourceStorage: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), + Usage: clientv1.ResourceList{ + clientv1.ResourceCPU: *resource.NewMilliQuantity(4, resource.DecimalSI), + clientv1.ResourceMemory: *resource.NewQuantity(5*(1024*1024), resource.DecimalSI), + clientv1.ResourceStorage: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), }, }, }, }, { - ObjectMeta: v1.ObjectMeta{Name: "pod2", Namespace: "test", ResourceVersion: "11"}, - Window: unversioned.Duration{Duration: time.Minute}, + ObjectMeta: metav1.ObjectMeta{Name: "pod2", Namespace: "test", ResourceVersion: "11"}, + Window: metav1.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container2-1", - Usage: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity(7, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(8*(1024*1024), resource.DecimalSI), - v1.ResourceStorage: *resource.NewQuantity(9*(1024*1024), resource.DecimalSI), + Usage: clientv1.ResourceList{ + clientv1.ResourceCPU: *resource.NewMilliQuantity(7, resource.DecimalSI), + clientv1.ResourceMemory: *resource.NewQuantity(8*(1024*1024), resource.DecimalSI), + clientv1.ResourceStorage: *resource.NewQuantity(9*(1024*1024), resource.DecimalSI), }, }, { Name: "container2-2", - Usage: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity(10, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(11*(1024*1024), resource.DecimalSI), - v1.ResourceStorage: *resource.NewQuantity(12*(1024*1024), resource.DecimalSI), + Usage: clientv1.ResourceList{ + clientv1.ResourceCPU: *resource.NewMilliQuantity(10, resource.DecimalSI), + clientv1.ResourceMemory: *resource.NewQuantity(11*(1024*1024), resource.DecimalSI), + clientv1.ResourceStorage: *resource.NewQuantity(12*(1024*1024), resource.DecimalSI), }, }, { Name: "container2-3", - Usage: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity(13, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(14*(1024*1024), resource.DecimalSI), - v1.ResourceStorage: *resource.NewQuantity(15*(1024*1024), resource.DecimalSI), + Usage: clientv1.ResourceList{ + clientv1.ResourceCPU: *resource.NewMilliQuantity(13, resource.DecimalSI), + clientv1.ResourceMemory: *resource.NewQuantity(14*(1024*1024), resource.DecimalSI), + clientv1.ResourceStorage: *resource.NewQuantity(15*(1024*1024), resource.DecimalSI), }, }, }, }, { - ObjectMeta: v1.ObjectMeta{Name: "pod3", Namespace: "test", ResourceVersion: "12"}, - Window: unversioned.Duration{Duration: time.Minute}, + ObjectMeta: metav1.ObjectMeta{Name: "pod3", Namespace: "test", ResourceVersion: "12"}, + Window: metav1.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container3-1", - Usage: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity(7, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(8*(1024*1024), resource.DecimalSI), - v1.ResourceStorage: *resource.NewQuantity(9*(1024*1024), resource.DecimalSI), + Usage: clientv1.ResourceList{ + clientv1.ResourceCPU: *resource.NewMilliQuantity(7, resource.DecimalSI), + clientv1.ResourceMemory: *resource.NewQuantity(8*(1024*1024), resource.DecimalSI), + clientv1.ResourceStorage: *resource.NewQuantity(9*(1024*1024), resource.DecimalSI), }, }, }, diff --git a/pkg/kubectl/cmd/top_test.go b/pkg/kubectl/cmd/top_test.go index 8d27d7e2f9c..68d5f63979d 100644 --- a/pkg/kubectl/cmd/top_test.go +++ b/pkg/kubectl/cmd/top_test.go @@ -27,11 +27,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" 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/unversioned" - v1 "k8s.io/kubernetes/pkg/api/v1" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1" ) const ( @@ -62,26 +61,26 @@ func marshallBody(metrics interface{}) (io.ReadCloser, error) { func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { metrics := &metricsapi.NodeMetricsList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "1", }, Items: []metricsapi.NodeMetrics{ { - ObjectMeta: v1.ObjectMeta{Name: "node1", ResourceVersion: "10"}, - Window: unversioned.Duration{Duration: time.Minute}, - Usage: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), - v1.ResourceStorage: *resource.NewQuantity(3*(1024*1024), resource.DecimalSI), + ObjectMeta: metav1.ObjectMeta{Name: "node1", ResourceVersion: "10"}, + Window: metav1.Duration{Duration: time.Minute}, + Usage: clientv1.ResourceList{ + clientv1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + clientv1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), + clientv1.ResourceStorage: *resource.NewQuantity(3*(1024*1024), resource.DecimalSI), }, }, { - ObjectMeta: v1.ObjectMeta{Name: "node2", ResourceVersion: "11"}, - Window: unversioned.Duration{Duration: time.Minute}, - Usage: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity(5, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), - v1.ResourceStorage: *resource.NewQuantity(7*(1024*1024), resource.DecimalSI), + ObjectMeta: metav1.ObjectMeta{Name: "node2", ResourceVersion: "11"}, + Window: metav1.Duration{Duration: time.Minute}, + Usage: clientv1.ResourceList{ + clientv1.ResourceCPU: *resource.NewMilliQuantity(5, resource.DecimalSI), + clientv1.ResourceMemory: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), + clientv1.ResourceStorage: *resource.NewQuantity(7*(1024*1024), resource.DecimalSI), }, }, }, diff --git a/pkg/kubectl/metricsutil/metrics_client.go b/pkg/kubectl/metricsutil/metrics_client.go index e72f97dd049..77a65aa8209 100644 --- a/pkg/kubectl/metricsutil/metrics_client.go +++ b/pkg/kubectl/metricsutil/metrics_client.go @@ -24,9 +24,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" - metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" "k8s.io/kubernetes/pkg/api/validation" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1" ) const ( diff --git a/pkg/kubectl/metricsutil/metrics_printer.go b/pkg/kubectl/metricsutil/metrics_printer.go index 576926a6ba4..71c80b7370f 100644 --- a/pkg/kubectl/metricsutil/metrics_printer.go +++ b/pkg/kubectl/metricsutil/metrics_printer.go @@ -21,9 +21,9 @@ import ( "io" "k8s.io/apimachinery/pkg/api/resource" - metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/printers" + metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1" ) var (