github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1356 from brendandburns/healthz

Browse Source 
Adjust the logic, so that if the apiserver restarts, or has no pod info
This commit is contained in:
Daniel Smith 2014-09-18 15:15:24 -07:00
commit 12b677ad56
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,7 +224,7 @@ func getInstanceIP(cloud cloudprovider.Interface, host string) string {
} }
func getPodStatus(pod *api.Pod, minions client.MinionInterface) (api.PodStatus, error) { func getPodStatus(pod *api.Pod, minions client.MinionInterface) (api.PodStatus, error) {
if pod.CurrentState.Info == nil || pod.CurrentState.Host == "" { if pod.CurrentState.Host == "" {
return api.PodWaiting, nil return api.PodWaiting, nil
} }
res, err := minions.ListMinions() res, err := minions.ListMinions()
@ -242,6 +242,9 @@ func getPodStatus(pod *api.Pod, minions client.MinionInterface) (api.PodStatus,
if !found { if !found {
return api.PodTerminated, nil return api.PodTerminated, nil
} }
if pod.CurrentState.Info == nil {
return api.PodWaiting, nil
}
running := 0 running := 0
stopped := 0 stopped := 0
unknown := 0 unknown := 0

10
pkg/registry/pod/rest_test.go
View File

@ -377,6 +377,16 @@ func TestMakePodStatus(t *testing.T) {
test string test string
}{ }{
{&api.Pod{DesiredState: desiredState, CurrentState: currentState}, api.PodWaiting, "waiting"}, {&api.Pod{DesiredState: desiredState, CurrentState: currentState}, api.PodWaiting, "waiting"},
{
&api.Pod{
DesiredState: desiredState,
CurrentState: api.PodState{
Host: "machine-2",
},
},
api.PodTerminated,
"no info, but bad machine",
},
{ {
&api.Pod{ &api.Pod{
DesiredState: desiredState, DesiredState: desiredState,