Update Godeps.

Godeps/Godeps.json

@@ -2464,13 +2464,13 @@
 		},
 		{
 			"ImportPath": "k8s.io/heapster/metrics/api/v1/types",
-			"Comment": "v1.1.0-beta2",
-			"Rev": "9cb18ac0ceb193eb530a1fe339355c94ea454d85"
+			"Comment": "v1.2.0-beta.1",
+			"Rev": "c2ac40f1adf8c42a79badddb2a2acd673cae3bcb"
 		},
 		{
 			"ImportPath": "k8s.io/heapster/metrics/apis/metrics/v1alpha1",
-			"Comment": "v1.1.0-beta2",
-			"Rev": "9cb18ac0ceb193eb530a1fe339355c94ea454d85"
+			"Comment": "v1.2.0-beta.1",
+			"Rev": "c2ac40f1adf8c42a79badddb2a2acd673cae3bcb"
 		}
 	]
 }

pkg/kubectl/cmd/top_node_test.go

@@ -23,12 +23,12 @@ import (
 	"strings"
 	"testing"
 
+	"k8s.io/heapster/metrics/apis/metrics/v1alpha1"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	"k8s.io/kubernetes/pkg/client/unversioned/fake"
 	"net/url"
-	"k8s.io/heapster/metrics/apis/metrics/v1alpha1"
 )
 
 const (

vendor/k8s.io/heapster/metrics/api/v1/types/historical_types.go

+// 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 types
+
+import (
+	"time"
+)
+
+// MetricValue is either a floating point value or an unsigned integer value
+type MetricValue struct {
+	IntValue   *int64   `json:"intValue,omitempty"`
+	FloatValue *float64 `json:"floatValue,omitempty"`
+}
+
+// MetricAggregationBucket holds information about various aggregations across a single bucket of time
+type MetricAggregationBucket struct {
+	Timestamp time.Time `json:"timestamp"`
+	Count     *uint64   `json:"count,omitempty"`
+
+	Average *MetricValue `json:"average,omitempty"`
+	Maximum *MetricValue `json:"maximum,omitempty"`
+	Minimum *MetricValue `json:"minimum,omitempty"`
+	Median  *MetricValue `json:"median,omitempty"`
+
+	Percentiles map[string]MetricValue `json:"percentiles,omitempty"`
+}
+
+// MetricAggregationResult holds a series of MetricAggregationBuckets of a particular size
+type MetricAggregationResult struct {
+	Buckets    []MetricAggregationBucket `json:"buckets"`
+	BucketSize time.Duration             `json:"bucketSize"`
+}
+
+// MetricAggregationResultList is a list of MetricAggregationResults, each for a different object
+type MetricAggregationResultList struct {
+	Items []MetricAggregationResult `json:"items"`
+}

vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1/types.go

@@ -33,6 +33,17 @@ type NodeMetrics struct {
 	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"`
@@ -47,6 +58,17 @@ type PodMetrics struct {
 	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.