Merge pull request #3027 from jdef/rest_no_network_settings

only log about no network settings for running pods

Merge pull request #3027 from jdef/rest_no_network_settings
82d0d685 · Brendan Burns · 36bc3604 · b3c7aa8a · 82d0d685
Commit 82d0d685 authored Dec 18, 2014 by Brendan Burns
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

rest.go pkg/registry/pod/rest.go +1 -1

No files found.
--- a/pkg/registry/pod/rest.go
+++ b/pkg/registry/pod/rest.go
@@ -235,7 +235,7 @@ func (rs *REST) fillPodInfo(pod *api.Pod) {
 		if ok {
 			if netContainerInfo.PodIP != "" {
 				pod.Status.PodIP = netContainerInfo.PodIP
-			} else {
+			} else if netContainerInfo.State.Running != nil {
 				glog.Warningf("No network settings: %#v", netContainerInfo)
 			}
 		} else {