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

Inject ContainersReady

Browse Source
This commit is contained in:
Minhan Xia 2018-06-01 18:32:27 -07:00
parent 176f34ea07
commit 370268f123
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/kubelet_pods.go
View File

@ -1354,6 +1354,7 @@ func (kl *Kubelet) generateAPIPodStatus(pod *v1.Pod, podStatus *kubecontainer.Po
kl.probeManager.UpdatePodStatus(pod.UID, s) kl.probeManager.UpdatePodStatus(pod.UID, s)
s.Conditions = append(s.Conditions, status.GeneratePodInitializedCondition(spec, s.InitContainerStatuses, s.Phase)) s.Conditions = append(s.Conditions, status.GeneratePodInitializedCondition(spec, s.InitContainerStatuses, s.Phase))
s.Conditions = append(s.Conditions, status.GeneratePodReadyCondition(spec, s.Conditions, s.ContainerStatuses, s.Phase)) s.Conditions = append(s.Conditions, status.GeneratePodReadyCondition(spec, s.Conditions, s.ContainerStatuses, s.Phase))
s.Conditions = append(s.Conditions, status.GenerateContainersReadyCondition(spec, s.ContainerStatuses, s.Phase))
// Status manager will take care of the LastTransitionTimestamp, either preserve // Status manager will take care of the LastTransitionTimestamp, either preserve
// the timestamp from apiserver, or set a new one. When kubelet sees the pod, // the timestamp from apiserver, or set a new one. When kubelet sees the pod,
// `PodScheduled` condition must be true. // `PodScheduled` condition must be true.

21
pkg/kubelet/status/status_manager.go
View File

@ -226,21 +226,24 @@ func (m *manager) SetContainerReadiness(podUID types.UID, containerID kubecontai
containerStatus, _, _ = findContainerStatus(&status, containerID.String()) containerStatus, _, _ = findContainerStatus(&status, containerID.String())
containerStatus.Ready = ready containerStatus.Ready = ready
// Update pod condition. // updateConditionFunc updates the corresponding type of condition
podReadyConditionIndex := -1 updateConditionFunc := func(conditionType v1.PodConditionType, condition v1.PodCondition) {
conditionIndex := -1
for i, condition := range status.Conditions { for i, condition := range status.Conditions {
if condition.Type == v1.PodReady { if condition.Type == conditionType {
podReadyConditionIndex = i conditionIndex = i
break break
} }
} }
podReady := GeneratePodReadyCondition(&pod.Spec, status.Conditions, status.ContainerStatuses, status.Phase) if conditionIndex != -1 {
if podReadyConditionIndex != -1 { status.Conditions[conditionIndex] = condition
status.Conditions[podReadyConditionIndex] = podReady
} else { } else {
glog.Warningf("PodStatus missing PodReady condition: %+v", status) glog.Warningf("PodStatus missing %s type condition: %+v", conditionType, status)
status.Conditions = append(status.Conditions, podReady) status.Conditions = append(status.Conditions, condition)
} }
}
updateConditionFunc(v1.PodReady, GeneratePodReadyCondition(&pod.Spec, status.Conditions, status.ContainerStatuses, status.Phase))
updateConditionFunc(v1.ContainersReady, GenerateContainersReadyCondition(&pod.Spec, status.ContainerStatuses, status.Phase))
m.updateStatusInternal(pod, status, false) m.updateStatusInternal(pod, status, false)
} }