Skip to content

Commit 71c4322

Browse files
committed
chore(glide): upgrade k8s.io/kubernetes to 1.4.12
Signed-off-by: Cryptophobia <aouzounov@gmail.com>
1 parent 4591544 commit 71c4322

3 files changed

Lines changed: 105 additions & 48 deletions

File tree

glide.lock

Lines changed: 99 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ import:
2323
- package: github.com/codegangsta/cli
2424
version: a65b733b303f0055f8d324d805f393cd3e7a7904
2525
- package: k8s.io/kubernetes
26-
version: 1.4.0-alpha.2
26+
version: v1.4.12
27+
- package: k8s.io/client-go
28+
version: release-1.4
2729
- package: github.com/arschles/assert
2830
version: 6882f85ccdc7c1822b146d1a6b0c2c48f91b5140
2931
- package: github.com/docker/distribution

pkg/k8s/watch.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"k8s.io/kubernetes/pkg/api"
77
"k8s.io/kubernetes/pkg/client/cache"
88
client "k8s.io/kubernetes/pkg/client/unversioned"
9-
"k8s.io/kubernetes/pkg/controller/framework"
109
"k8s.io/kubernetes/pkg/labels"
1110
"k8s.io/kubernetes/pkg/runtime"
1211
"k8s.io/kubernetes/pkg/watch"
@@ -19,21 +18,21 @@ var (
1918
//PodWatcher is a struct which holds the return values of (k8s.io/kubernetes/pkg/controller/framework).NewIndexerInformer together.
2019
type PodWatcher struct {
2120
Store cache.StoreToPodLister
22-
Controller *framework.Controller
21+
Controller *cache.Controller
2322
}
2423

2524
//NewPodWatcher creates a new BuildPodWatcher useful to list the pods using a cache which gets updated based on the watch func.
2625
func NewPodWatcher(c *client.Client, ns string) *PodWatcher {
2726
pw := &PodWatcher{}
2827

29-
pw.Store.Indexer, pw.Controller = framework.NewIndexerInformer(
28+
pw.Store.Indexer, pw.Controller = cache.NewIndexerInformer(
3029
&cache.ListWatch{
3130
ListFunc: podListFunc(c, ns),
3231
WatchFunc: podWatchFunc(c, ns),
3332
},
3433
&api.Pod{},
3534
resyncPeriod,
36-
framework.ResourceEventHandlerFuncs{},
35+
cache.ResourceEventHandlerFuncs{},
3736
cache.Indexers{},
3837
)
3938

0 commit comments

Comments
 (0)