github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6352 from piosz/api

Browse Source 
Removed PodStatus.Host
This commit is contained in:
Brian Grant
2015-04-02 13:16:24 -07:00
parent 9b2f835a01 5c6439d449
commit 414be101b6
31 changed files with 149 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/describe.go
View File

@@ -238,7 +238,7 @@ func describePod(pod *api.Pod, rcs []api.ReplicationController, events *api.Even
return tabbedString(func(out io.Writer) error {
fmt.Fprintf(out, "Name:\t%s\n", pod.Name)
fmt.Fprintf(out, "Image(s):\t%s\n", makeImageList(&pod.Spec))
fmt.Fprintf(out, "Host:\t%s\n", pod.Status.Host+"/"+pod.Status.HostIP)
fmt.Fprintf(out, "Host:\t%s\n", pod.Spec.Host+"/"+pod.Status.HostIP)
fmt.Fprintf(out, "Labels:\t%s\n", formatLabels(pod.Labels))
fmt.Fprintf(out, "Status:\t%s\n", string(pod.Status.Phase))
fmt.Fprintf(out, "Replication Controllers:\t%s\n", printReplicationControllersByLabels(rcs))
@@ -415,7 +415,7 @@ func (d *NodeDescriber) Describe(namespace, name string) (string, error) {
return "", err
}
for _, pod := range allPods.Items {
if pod.Status.Host != name {
if pod.Spec.Host != name {
continue
}
pods = append(pods, pod)