Skip to content

Commit aeb0a0e

Browse files
author
Keerthan Mala
committed
ref(k8s):update k8s api to 1.2.4
1 parent 026e7e7 commit aeb0a0e

6 files changed

Lines changed: 107 additions & 79 deletions

File tree

glide.lock

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

glide.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ import:
1616
version: eca94c41d994ae2215d455ce578ae6e2dc6ee516
1717
- package: github.com/pborman/uuid
1818
- package: github.com/deis/pkg
19-
version: 7f41ea6de942139d5de67f4d4cb2cccced991f6f
19+
version: 189ed6bd6b6aa6629b72c2c5472095e176eec8a6
2020
subpackages:
2121
- time
2222
- log
2323
- package: github.com/codegangsta/cli
2424
version: a65b733b303f0055f8d324d805f393cd3e7a7904
2525
- package: k8s.io/kubernetes
26-
version: ~1.1
26+
version: 1.2.4
2727
- package: github.com/arschles/assert
2828
version: 6882f85ccdc7c1822b146d1a6b0c2c48f91b5140
2929
- package: github.com/docker/distribution

pkg/cleaner/cleaner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func dirHasGitSuffix(dir string) bool {
8484
// On any error, it uses log messages to output a human readable description of what happened.
8585
func Run(gitHome string, nsLister k8s.NamespaceLister, fs sys.FS, pollSleepDuration time.Duration) error {
8686
for {
87-
nsList, err := nsLister.List(labels.Everything(), fields.Everything())
87+
nsList, err := nsLister.List(api.ListOptions{LabelSelector: labels.Everything(), FieldSelector: fields.Everything()})
8888
if err != nil {
8989
log.Printf("Cleaner error listing namespaces (%s)", err)
9090
continue

pkg/gitreceive/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func build(
190190
req := kubeClient.Get().Namespace(newPod.Namespace).Name(newPod.Name).Resource("pods").SubResource("log").VersionedParams(
191191
&api.PodLogOptions{
192192
Follow: true,
193-
}, api.Scheme)
193+
}, api.ParameterCodec)
194194

195195
rc, err := req.Stream()
196196
if err != nil {

pkg/healthsrv/namespace_lister.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ import (
1111
// for unit tests.
1212
type NamespaceLister interface {
1313
// List lists all namespaces that are selected by the given label and field selectors.
14-
List(labels.Selector, fields.Selector) (*api.NamespaceList, error)
14+
List(opts api.ListOptions) (*api.NamespaceList, error)
1515
}
1616

1717
type emptyNamespaceLister struct{}
1818

19-
func (n emptyNamespaceLister) List(labels.Selector, fields.Selector) (*api.NamespaceList, error) {
19+
func (n emptyNamespaceLister) List(opts api.ListOptions) (*api.NamespaceList, error) {
2020
return &api.NamespaceList{}, nil
2121
}
2222

2323
type errNamespaceLister struct {
2424
err error
2525
}
2626

27-
func (e errNamespaceLister) List(labels.Selector, fields.Selector) (*api.NamespaceList, error) {
27+
func (e errNamespaceLister) List(opts api.ListOptions) (*api.NamespaceList, error) {
2828
return nil, e.err
2929
}
3030

@@ -35,7 +35,7 @@ func (e errNamespaceLister) List(labels.Selector, fields.Selector) (*api.Namespa
3535
// errCh. At most one of {succCh, errCh} will be sent on. If stopCh is closed, no pending or
3636
// future sends will occur.
3737
func listNamespaces(nl NamespaceLister, succCh chan<- *api.NamespaceList, errCh chan<- error, stopCh <-chan struct{}) {
38-
nsList, err := nl.List(labels.Everything(), fields.Everything())
38+
nsList, err := nl.List(api.ListOptions{LabelSelector: labels.Everything(), FieldSelector: fields.Everything()})
3939
if err != nil {
4040
select {
4141
case errCh <- err:

0 commit comments

Comments
 (0)