github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6985 from csrwng/fix_pod_log_location

Browse Source 
Use Pod.Spec.Host instead of Pod.Status.HostIP for pod subresources
This commit is contained in:
Brian Grant 2015-04-21 12:58:47 -07:00
commit cf523a23d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/registry/pod/rest.go
View File

@ -200,7 +200,7 @@ func LogLocation(getter ResourceGetter, connInfo client.ConnectionInfoGetter, ct
return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name)) return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name))
} }
} }
nodeHost := pod.Status.HostIP nodeHost := pod.Spec.Host
if len(nodeHost) == 0 { if len(nodeHost) == 0 {
// If pod has not been assigned a host, return an empty location // If pod has not been assigned a host, return an empty location
return nil, nil, nil return nil, nil, nil
@ -240,7 +240,7 @@ func ExecLocation(getter ResourceGetter, connInfo client.ConnectionInfoGetter, c
return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name)) return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name))
} }
} }
nodeHost := pod.Status.HostIP nodeHost := pod.Spec.Host
if len(nodeHost) == 0 { if len(nodeHost) == 0 {
// If pod has not been assigned a host, return an empty location // If pod has not been assigned a host, return an empty location
return nil, nil, fmt.Errorf("pod %s does not have a host assigned", name) return nil, nil, fmt.Errorf("pod %s does not have a host assigned", name)
@ -280,7 +280,7 @@ func PortForwardLocation(getter ResourceGetter, connInfo client.ConnectionInfoGe
return nil, nil, err return nil, nil, err
} }
nodeHost := pod.Status.HostIP nodeHost := pod.Spec.Host
if len(nodeHost) == 0 { if len(nodeHost) == 0 {
// If pod has not been assigned a host, return an empty location // If pod has not been assigned a host, return an empty location
return nil, nil, errors.NewBadRequest(fmt.Sprintf("pod %s does not have a host assigned", name)) return nil, nil, errors.NewBadRequest(fmt.Sprintf("pod %s does not have a host assigned", name))