Merge pull request #24929 from mwielgus/heapster_godeps_bump

Update Heapster api types location in Godeps

Godeps/Godeps.json

@@ -1138,9 +1138,9 @@
 			"Rev": "a83829b6f1293c91addabc89d0571c246397bbf4"
 		},
 		{
-			"ImportPath": "k8s.io/heapster/api/v1/types",
-			"Comment": "v0.19.1-44-g0991ac5",
-			"Rev": "0991ac528ea24aae194e45d6dcf01896cb42cbea"
+			"ImportPath": "k8s.io/heapster/metrics/api/v1/types",
+			"Comment": "v1.1.0-beta1",
+			"Rev": "de510e4bdcdea96722b5bde19ff0b7a142939485"
 		},
 		{
 			"ImportPath": "speter.net/go/exp/math/dec/inf",

Godeps/LICENSES

@@ -38028,7 +38028,7 @@ Library.
 
 
 ================================================================================
-= Godeps/_workspace/src/k8s.io/heapster/api/v1/types licensed under: =
+= Godeps/_workspace/src/k8s.io/heapster/metrics/api/v1/types licensed under: =
 
 Apache License
                            Version 2.0, January 2004

Godeps/_workspace/src/k8s.io/heapster/metrics/api/v1/types/types.go

@@ -52,6 +52,8 @@ type TimeseriesSchema struct {
 	PodLabels []LabelDescriptor `json:"pod_labels,omitempty"`
 }
 
+// To maintain stable api for GKE.
+
 type MetricDescriptor struct {
 	// The unique name of the metric.
 	Name string `json:"name,omitempty"`

Godeps/_workspace/src/k8s.io/heapster/third_party/window/LICENSE

@@ -1,28 +0,0 @@
-Copyright (c) 2012.  Jake Brukhman <jbrukh@gmail.com>
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions 
-are met:
-
-    1. Redistributions of source code must retain the above 
-       copyright notice, this list of conditions and the 
-       following disclaimer.
-    2. Redistributions in binary form must reproduce the above
-       copyright notice, this list of conditions and the following
-       disclaimer in the documentation and/or other materials 
-       provided with the distribution.
-    3. The name of the author may not be used to endorse or 
-       promote products derived from this software without 
-       specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

pkg/controller/podautoscaler/horizontal_test.go

@@ -38,7 +38,7 @@ import (
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/watch"
 
-	heapster "k8s.io/heapster/api/v1/types"
+	heapster "k8s.io/heapster/metrics/api/v1/types"
 
 	"github.com/stretchr/testify/assert"
 )

pkg/controller/podautoscaler/metrics/metrics_client.go

@@ -27,7 +27,7 @@ import (
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/labels"
 
-	heapster "k8s.io/heapster/api/v1/types"
+	heapster "k8s.io/heapster/metrics/api/v1/types"
 )
 
 const (

pkg/controller/podautoscaler/metrics/metrics_client_test.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/runtime"
 
-	heapster "k8s.io/heapster/api/v1/types"
+	heapster "k8s.io/heapster/metrics/api/v1/types"
 
 	"github.com/stretchr/testify/assert"
 )