github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 13:42:02 +00:00
Code Issues Projects Releases Wiki Activity

Remove PodIP from ContainerStatus

Browse Source
This commit is contained in:
Dawn Chen
2015-03-18 09:44:50 -07:00
parent 80914498e4
commit 4910be6dcb
8 changed files with 59 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/handlers.go
View File

@@ -24,7 +24,6 @@ import (
"strconv"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools"
"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog"
@@ -77,11 +76,10 @@ func (h *httpActionHandler) Run(podFullName string, uid types.UID, container *ap
glog.Errorf("Unable to get pod info, event handlers may be invalid.")
return err
}
netInfo, found := status.Info[dockertools.PodInfraContainerName]
if !found {
if status.PodIP == "" {
return fmt.Errorf("failed to find networking container: %v", status)
}
host = netInfo.PodIP
host = status.PodIP
}
var port int
if handler.HTTPGet.Port.Kind == util.IntstrString && len(handler.HTTPGet.Port.StrVal) == 0 {