github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #154 from brendandburns/fix-etcd

Browse Source 
Fix a bug in pod listing introduced in a recent refactor.
This commit is contained in:
Daniel Smith 2014-06-18 10:45:53 -07:00
commit 6647f040f1
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/registry/etcd_registry.go
View File

@ -78,6 +78,7 @@ func (registry *EtcdRegistry) ListPods(query labels.Query) ([]api.Pod, error) {
}
for _, pod := range machinePods {
if query.Matches(labels.Set(pod.Labels)) {
pod.CurrentState.Host = machine
pods = append(pods, pod)
}
}

4
pkg/registry/etcd_registry_test.go
View File

@ -354,6 +354,10 @@ func TestEtcdListPods(t *testing.T) {
if len(pods) != 2 || pods[0].ID != "foo" || pods[1].ID != "bar" {
t.Errorf("Unexpected pod list: %#v", pods)
}
if pods[0].CurrentState.Host != "machine" ||
pods[1].CurrentState.Host != "machine" {
t.Errorf("Failed to populate host name.")
}
}
func TestEtcdListControllersNotFound(t *testing.T) {