github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16261 from zhengguoyong/update_condition

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-16 02:34:18 -08:00
commit 081b21687e
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/kubelet.go
View File

@ -2833,7 +2833,7 @@ func readyPodCondition(isPodReady bool, reason, message string) []api.PodConditi
} }
// getPodReadyCondition returns ready condition if all containers in a pod are ready, else it returns an unready condition. // getPodReadyCondition returns ready condition if all containers in a pod are ready, else it returns an unready condition.
func getPodReadyCondition(spec *api.PodSpec, containerStatuses []api.ContainerStatus) []api.PodCondition { func getPodReadyCondition(spec *api.PodSpec, containerStatuses []api.ContainerStatus, podPhase api.PodPhase) []api.PodCondition {
// Find if all containers are ready or not. // Find if all containers are ready or not.
if containerStatuses == nil { if containerStatuses == nil {
return readyPodCondition(false, "UnknownContainerStatuses", "") return readyPodCondition(false, "UnknownContainerStatuses", "")
@ -2849,6 +2849,12 @@ func getPodReadyCondition(spec *api.PodSpec, containerStatuses []api.ContainerSt
unknownContainers = append(unknownContainers, container.Name) unknownContainers = append(unknownContainers, container.Name)
} }
} }
// In case of unexist unknowContainers, If pod has derminated successed and it has unreadyContainers, just return PodCompleted
if podPhase == api.PodSucceeded && len(unknownContainers) == 0 {
return readyPodCondition(false, fmt.Sprint("PodCompleted"), "")
}
unreadyMessages := []string{} unreadyMessages := []string{}
if len(unknownContainers) > 0 { if len(unknownContainers) > 0 {
unreadyMessages = append(unreadyMessages, fmt.Sprintf("containers with unknown status: %s", unknownContainers)) unreadyMessages = append(unreadyMessages, fmt.Sprintf("containers with unknown status: %s", unknownContainers))
@ -2910,7 +2916,7 @@ func (kl *Kubelet) generatePodStatus(pod *api.Pod) (api.PodStatus, error) {
podStatus.Phase = GetPhase(spec, podStatus.ContainerStatuses) podStatus.Phase = GetPhase(spec, podStatus.ContainerStatuses)
kl.probeManager.UpdatePodStatus(pod.UID, podStatus) kl.probeManager.UpdatePodStatus(pod.UID, podStatus)
podStatus.Conditions = append(podStatus.Conditions, getPodReadyCondition(spec, podStatus.ContainerStatuses)...) podStatus.Conditions = append(podStatus.Conditions, getPodReadyCondition(spec, podStatus.ContainerStatuses, podStatus.Phase)...)
if !kl.standaloneMode { if !kl.standaloneMode {
hostIP, err := kl.GetHostIP() hostIP, err := kl.GetHostIP()

21
pkg/kubelet/kubelet_test.go
View File

@ -1933,16 +1933,19 @@ func TestGetPodReadyCondition(t *testing.T) {
tests := []struct { tests := []struct {
spec *api.PodSpec spec *api.PodSpec
containerStatuses []api.ContainerStatus containerStatuses []api.ContainerStatus
podPhase api.PodPhase
expected []api.PodCondition expected []api.PodCondition
}{ }{
{ {
spec: nil, spec: nil,
containerStatuses: nil, containerStatuses: nil,
podPhase: api.PodRunning,
expected: getReadyCondition(api.ConditionFalse, "UnknownContainerStatuses", ""), expected: getReadyCondition(api.ConditionFalse, "UnknownContainerStatuses", ""),
}, },
{ {
spec: &api.PodSpec{}, spec: &api.PodSpec{},
containerStatuses: []api.ContainerStatus{}, containerStatuses: []api.ContainerStatus{},
podPhase: api.PodRunning,
expected: getReadyCondition(api.ConditionTrue, "", ""), expected: getReadyCondition(api.ConditionTrue, "", ""),
}, },
{ {
@ -1952,6 +1955,7 @@ func TestGetPodReadyCondition(t *testing.T) {
}, },
}, },
containerStatuses: []api.ContainerStatus{}, containerStatuses: []api.ContainerStatus{},
podPhase: api.PodRunning,
expected: getReadyCondition(api.ConditionFalse, "ContainersNotReady", "containers with unknown status: [1234]"), expected: getReadyCondition(api.ConditionFalse, "ContainersNotReady", "containers with unknown status: [1234]"),
}, },
{ {
@ -1965,6 +1969,7 @@ func TestGetPodReadyCondition(t *testing.T) {
getReadyStatus("1234"), getReadyStatus("1234"),
getReadyStatus("5678"), getReadyStatus("5678"),
}, },
podPhase: api.PodRunning,
expected: getReadyCondition(api.ConditionTrue, "", ""), expected: getReadyCondition(api.ConditionTrue, "", ""),
}, },
{ {
@ -1977,6 +1982,7 @@ func TestGetPodReadyCondition(t *testing.T) {
containerStatuses: []api.ContainerStatus{ containerStatuses: []api.ContainerStatus{
getReadyStatus("1234"), getReadyStatus("1234"),
}, },
podPhase: api.PodRunning,
expected: getReadyCondition(api.ConditionFalse, "ContainersNotReady", "containers with unknown status: [5678]"), expected: getReadyCondition(api.ConditionFalse, "ContainersNotReady", "containers with unknown status: [5678]"),
}, },
{ {
@ -1990,12 +1996,25 @@ func TestGetPodReadyCondition(t *testing.T) {
getReadyStatus("1234"), getReadyStatus("1234"),
getNotReadyStatus("5678"), getNotReadyStatus("5678"),
}, },
podPhase: api.PodRunning,
expected: getReadyCondition(api.ConditionFalse, "ContainersNotReady", "containers with unready status: [5678]"), expected: getReadyCondition(api.ConditionFalse, "ContainersNotReady", "containers with unready status: [5678]"),
}, },
{
spec: &api.PodSpec{
Containers: []api.Container{
{Name: "1234"},
},
},
containerStatuses: []api.ContainerStatus{
getNotReadyStatus("1234"),
},
podPhase: api.PodSucceeded,
expected: getReadyCondition(api.ConditionFalse, "PodCompleted", ""),
},
} }
for i, test := range tests { for i, test := range tests {
condition := getPodReadyCondition(test.spec, test.containerStatuses) condition := getPodReadyCondition(test.spec, test.containerStatuses, test.podPhase)
if !reflect.DeepEqual(condition, test.expected) { if !reflect.DeepEqual(condition, test.expected) {
t.Errorf("On test case %v, expected:\n%+v\ngot\n%+v\n", i, test.expected, condition) t.Errorf("On test case %v, expected:\n%+v\ngot\n%+v\n", i, test.expected, condition)
} }