github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-24 03:40:56 +00:00
Code Issues Projects Releases Wiki Activity

kubelet: add nil check for ContainerStatus in GetContainerStatus

Browse Source
This commit is contained in:
Nikolay Gorbatov
2025-10-24 17:25:11 +04:00
parent 8cd57a9e6f
commit fcef697a45
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ import (
"k8s.io/component-base/logs/logreduction"
internalapi "k8s.io/cri-api/pkg/apis"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
remote "k8s.io/cri-client/pkg"
crierror "k8s.io/cri-api/pkg/errors"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/api/legacyscheme"
@@ -1818,7 +1819,13 @@ func (m *kubeGenericRuntimeManager) GetContainerStatus(ctx context.Context, podU
if err != nil {
return nil, fmt.Errorf("runtime container status: %w", err)
}
return m.convertToKubeContainerStatus(ctx, podUID, resp.GetStatus()), nil
status := resp.GetStatus()
if status == nil {
return nil, remote.ErrContainerStatusNil
}
return m.convertToKubeContainerStatus(ctx, podUID, status), nil
}
// GarbageCollect removes dead containers using the specified container gc policy.