chore(glide): upgrade k8s.io/kubernetes to 1.4.12

Signed-off-by: Cryptophobia <[email protected]>

glide.yaml

@@ -23,7 +23,9 @@ import:
 - package: github.com/codegangsta/cli
   version: a65b733b303f0055f8d324d805f393cd3e7a7904
 - package: k8s.io/kubernetes
-  version: 1.4.0-alpha.2
+  version: v1.4.12
+- package: k8s.io/client-go
+  version: release-1.4
 - package: github.com/arschles/assert
   version: 6882f85ccdc7c1822b146d1a6b0c2c48f91b5140
 - package: github.com/docker/distribution

pkg/k8s/watch.go

@@ -6,7 +6,6 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client/cache"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/controller/framework"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/watch"
@@ -19,21 +18,21 @@ var (
 //PodWatcher is a struct which holds the return values of (k8s.io/kubernetes/pkg/controller/framework).NewIndexerInformer together.
 type PodWatcher struct {
 	Store      cache.StoreToPodLister
-	Controller *framework.Controller
+	Controller *cache.Controller
 }
 
 //NewPodWatcher creates a new BuildPodWatcher useful to list the pods using a cache which gets updated based on the watch func.
 func NewPodWatcher(c *client.Client, ns string) *PodWatcher {
 	pw := &PodWatcher{}
 
-	pw.Store.Indexer, pw.Controller = framework.NewIndexerInformer(
+	pw.Store.Indexer, pw.Controller = cache.NewIndexerInformer(
 		&cache.ListWatch{
 			ListFunc:  podListFunc(c, ns),
 			WatchFunc: podWatchFunc(c, ns),
 		},
 		&api.Pod{},
 		resyncPeriod,
-		framework.ResourceEventHandlerFuncs{},
+		cache.ResourceEventHandlerFuncs{},
 		cache.Indexers{},
 	)