scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #127195 from yaojunyu/fix-pod-alway-restart-open-envetedpleg

Browse Source 
EventedPLEG: Set Timestamp in PodStatus for Generic PLEG more accurate
This commit is contained in:
Kubernetes Prow Robot
2024-10-14 23:36:20 +01:00
committed by GitHub
parent 429edc5f25 02c6df0436
commit d1e03f3a77
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kuberuntime/kuberuntime_manager.go
View File

@@ -1538,7 +1538,7 @@ func (m *kubeGenericRuntimeManager) GetPodStatus(ctx context.Context, uid kubety
sandboxStatuses := []*runtimeapi.PodSandboxStatus{} sandboxStatuses := []*runtimeapi.PodSandboxStatus{}
containerStatuses := []*kubecontainer.Status{} containerStatuses := []*kubecontainer.Status{}
var timestamp time.Time timestamp := time.Now()
podIPs := []string{} podIPs := []string{}
for idx, podSandboxID := range podSandboxIDs { for idx, podSandboxID := range podSandboxIDs {
@@ -1582,7 +1582,7 @@ func (m *kubeGenericRuntimeManager) GetPodStatus(ctx context.Context, uid kubety
} else { } else {
// Get the statuses of all containers visible to the pod and // Get the statuses of all containers visible to the pod and
// timestamp from sandboxStatus. // timestamp from sandboxStatus.
timestamp = time.Unix(resp.Timestamp, 0) timestamp = time.Unix(0, resp.Timestamp)
for _, cs := range resp.ContainersStatuses { for _, cs := range resp.ContainersStatuses {
cStatus := m.convertToKubeContainerStatus(cs) cStatus := m.convertToKubeContainerStatus(cs)
containerStatuses = append(containerStatuses, cStatus) containerStatuses = append(containerStatuses, cStatus)