Fixed the code to work with the new deps

kubernetes-retired · May 15, 2016 · d22e01c · d22e01c
1 parent 86189b6
commit d22e01c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/common/kubernetes/configs.go b/common/kubernetes/configs.go
@@ -21,7 +21,7 @@ import (
 	"strconv"
 
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	kube_client "k8s.io/kubernetes/pkg/client/unversioned"
+	kube_client "k8s.io/kubernetes/pkg/client/restclient"
 	kubeClientCmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	kubeClientCmdApi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 )

diff --git a/metrics/processors/pod_based_enricher.go b/metrics/processors/pod_based_enricher.go
@@ -211,8 +211,10 @@ func NewPodBasedEnricher(url *url.URL) (*PodBasedEnricher, error) {
 
 	// watch nodes
 	lw := cache.NewListWatchFromClient(kubeClient, "pods", kube_api.NamespaceAll, fields.Everything())
-	podLister := &cache.StoreToPodLister{Store: cache.NewStore(cache.MetaNamespaceKeyFunc)}
-	reflector := cache.NewReflector(lw, &kube_api.Pod{}, podLister.Store, time.Hour)
+
+	store := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
+	podLister := &cache.StoreToPodLister{Indexer: store}
+	reflector := cache.NewReflector(lw, &kube_api.Pod{}, store, time.Hour)
 	reflector.Run()
 
 	return &PodBasedEnricher{

diff --git a/metrics/processors/pod_based_enricher_test.go b/metrics/processors/pod_based_enricher_test.go
@@ -117,7 +117,8 @@ func TestPodEnricher(t *testing.T) {
 		},
 	}
 
-	podLister := &cache.StoreToPodLister{Store: cache.NewStore(cache.MetaNamespaceKeyFunc)}
+	store := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
+	podLister := &cache.StoreToPodLister{Indexer: store}
 	podLister.Add(&pod)
 	podBasedEnricher := PodBasedEnricher{podLister: podLister}
 

diff --git a/metrics/sinks/hawkular/driver.go b/metrics/sinks/hawkular/driver.go
@@ -28,7 +28,7 @@ import (
 	"github.com/hawkular/hawkular-client-go/metrics"
 
 	"k8s.io/heapster/metrics/core"
-	kube_client "k8s.io/kubernetes/pkg/client/unversioned"
+	kube_client "k8s.io/kubernetes/pkg/client/restclient"
 	kubeClientCmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 )
 

diff --git a/metrics/sources/kubelet/configs.go b/metrics/sources/kubelet/configs.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/golang/glog"
 	kube_config "k8s.io/heapster/common/kubernetes"
-	kube_client "k8s.io/kubernetes/pkg/client/unversioned"
+	kube_client "k8s.io/kubernetes/pkg/client/restclient"
 	kubelet_client "k8s.io/kubernetes/pkg/kubelet/client"
 )