github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-24 14:04:07 +00:00
Code Issues Projects Releases Wiki Activity

Address comments.

Browse Source
This commit is contained in:
Vishnu Kannan
2015-08-18 11:14:52 -07:00
parent 4a148f99d6
commit ec22c2dd82
9 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/client/unversioned/cache/listers.go vendored
View File

@@ -248,10 +248,10 @@ func (s *StoreToDaemonLister) List() (daemons []api.Daemon, err error) {
return daemons, nil
}
// GetPodDaemon returns a list of daemon daemons managing a pod. Returns an error iff no matching daemons are found.
func (s *StoreToDaemonLister) GetPodDaemon(pod *api.Pod) (daemons []api.Daemon, err error) {
// GetPodDaemons returns a list of daemons managing a pod. Returns an error iff no matching daemons are found.
func (s *StoreToDaemonLister) GetPodDaemons(pod *api.Pod) (daemons []api.Daemon, err error) {
var selector labels.Selector
var dc api.Daemon
var daemonController api.Daemon
if len(pod.Labels) == 0 {
err = fmt.Errorf("No daemons found for pod %v because it has no labels", pod.Name)
@@ -259,18 +259,17 @@ func (s *StoreToDaemonLister) GetPodDaemon(pod *api.Pod) (daemons []api.Daemon,
}
for _, m := range s.Store.List() {
dc = *m.(*api.Daemon)
if dc.Namespace != pod.Namespace {
daemonController = *m.(*api.Daemon)
if daemonController.Namespace != pod.Namespace {
continue
}
labelSet := labels.Set(dc.Spec.Selector)
selector = labels.Set(dc.Spec.Selector).AsSelector()
selector = labels.Set(daemonController.Spec.Selector).AsSelector()
// If an dc with a nil or empty selector creeps in, it should match nothing, not everything.
if labelSet.AsSelector().Empty() || !selector.Matches(labels.Set(pod.Labels)) {
// If a daemonController with a nil or empty selector creeps in, it should match nothing, not everything.
if selector.Empty() || !selector.Matches(labels.Set(pod.Labels)) {
continue
}
daemons = append(daemons, dc)
daemons = append(daemons, daemonController)
}
if len(daemons) == 0 {
err = fmt.Errorf("Could not find daemons for pod %s in namespace %s with labels: %v", pod.Name, pod.Namespace, pod.Labels)

10
pkg/client/unversioned/cache/listers_test.go vendored
View File

@@ -64,7 +64,7 @@ func TestStoreToReplicationControllerLister(t *testing.T) {
},
outRCNames: util.NewStringSet("basic"),
},
// No pod lables
// No pod labels
{
inRCs: []*api.ReplicationController{
{
@@ -186,7 +186,7 @@ func TestStoreToDaemonLister(t *testing.T) {
},
outDCNames: util.NewStringSet("basic", "complex", "complex2"),
},
// No pod lables
// No pod labels
{
inDCs: []*api.Daemon{
{
@@ -200,7 +200,7 @@ func TestStoreToDaemonLister(t *testing.T) {
pod := &api.Pod{
ObjectMeta: api.ObjectMeta{Name: "pod1", Namespace: "ns"},
}
return lister.GetPodDaemon(pod)
return lister.GetPodDaemons(pod)
},
outDCNames: util.NewStringSet(),
expectErr: true,
@@ -220,7 +220,7 @@ func TestStoreToDaemonLister(t *testing.T) {
Labels: map[string]string{"foo": "bar"},
},
}
return lister.GetPodDaemon(pod)
return lister.GetPodDaemons(pod)
},
outDCNames: util.NewStringSet(),
expectErr: true,
@@ -249,7 +249,7 @@ func TestStoreToDaemonLister(t *testing.T) {
Namespace: "ns",
},
}
return lister.GetPodDaemon(pod)
return lister.GetPodDaemons(pod)
},
outDCNames: util.NewStringSet("bar"),
},