scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 19:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify List() signature in clients.

Browse Source
This commit is contained in:
Wojciech Tyczynski
2015-12-02 12:12:57 +01:00
parent 800012dfb8
commit 6dcb689d4e
141 changed files with 532 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/controller/node/nodecontroller.go
View File

@@ -34,7 +34,6 @@ import (
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/framework"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util"
@@ -164,7 +163,7 @@ func NewNodeController(
nc.podStore.Store, nc.podController = framework.NewInformer(
&cache.ListWatch{
ListFunc: func() (runtime.Object, error) {
return nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{})
return nc.kubeClient.Pods(api.NamespaceAll).List(unversioned.ListOptions{})
},
WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) {
return nc.kubeClient.Pods(api.NamespaceAll).Watch(options)
@@ -180,7 +179,7 @@ func NewNodeController(
nc.nodeStore.Store, nc.nodeController = framework.NewInformer(
&cache.ListWatch{
ListFunc: func() (runtime.Object, error) {
return nc.kubeClient.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{})
return nc.kubeClient.Nodes().List(unversioned.ListOptions{})
},
WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) {
return nc.kubeClient.Nodes().Watch(options)
@@ -347,7 +346,7 @@ func forcefullyDeletePod(c client.Interface, pod *api.Pod) {
// post "NodeReady==ConditionUnknown". It also evicts all pods if node is not ready or
// not reachable for a long period of time.
func (nc *NodeController) monitorNodeStatus() error {
nodes, err := nc.kubeClient.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{})
nodes, err := nc.kubeClient.Nodes().List(unversioned.ListOptions{})
if err != nil {
return err
}
@@ -684,7 +683,9 @@ func (nc *NodeController) tryUpdateNodeStatus(node *api.Node) (time.Duration, ap
// returns true if the provided node still has pods scheduled to it, or an error if
// the server could not be contacted.
func (nc *NodeController) hasPods(nodeName string) (bool, error) {
pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.OneTermEqualSelector(client.PodHost, nodeName), unversioned.ListOptions{})
selector := fields.OneTermEqualSelector(client.PodHost, nodeName)
options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}}
pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(options)
if err != nil {
return false, err
}
@@ -717,7 +718,9 @@ func (nc *NodeController) cancelPodEviction(nodeName string) bool {
// if any pods were deleted.
func (nc *NodeController) deletePods(nodeName string) (bool, error) {
remaining := false
pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.OneTermEqualSelector(client.PodHost, nodeName), unversioned.ListOptions{})
selector := fields.OneTermEqualSelector(client.PodHost, nodeName)
options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}}
pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(options)
if err != nil {
return remaining, err
}
@@ -755,9 +758,9 @@ func (nc *NodeController) terminatePods(nodeName string, since time.Time) (bool,
// have we deleted all pods
complete := true
pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(),
fields.OneTermEqualSelector(client.PodHost, nodeName),
unversioned.ListOptions{})
selector := fields.OneTermEqualSelector(client.PodHost, nodeName)
options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}}
pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(options)
if err != nil {
return false, nextAttempt, err
}