github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #124906 from liggitt/pod-list-panic

Browse Source 
Fix printPod panic with spurious container statuses
This commit is contained in:
Kubernetes Prow Robot 2024-05-16 12:27:47 -07:00 committed by GitHub
commit 0aa01be424
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/printers/internalversion/printers.go
View File

@ -3207,6 +3207,9 @@ func (list SortableResourceNames) Less(i, j int) bool {
} }
func isRestartableInitContainer(initContainer *api.Container) bool { func isRestartableInitContainer(initContainer *api.Container) bool {
if initContainer == nil {
return false
}
if initContainer.RestartPolicy == nil { if initContainer.RestartPolicy == nil {
return false return false
} }

28
pkg/printers/internalversion/printers_test.go
View File

@ -25,6 +25,7 @@ import (
"time" "time"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -50,6 +51,7 @@ import (
"k8s.io/kubernetes/pkg/apis/storagemigration" "k8s.io/kubernetes/pkg/apis/storagemigration"
"k8s.io/kubernetes/pkg/printers" "k8s.io/kubernetes/pkg/printers"
utilpointer "k8s.io/utils/pointer" utilpointer "k8s.io/utils/pointer"
"k8s.io/utils/ptr"
) )
var containerRestartPolicyAlways = api.ContainerRestartPolicyAlways var containerRestartPolicyAlways = api.ContainerRestartPolicyAlways
@ -1718,6 +1720,32 @@ func TestPrintPodWithRestartableInitContainer(t *testing.T) {
}, },
}, },
}, },
{
// Test pod has container statuses for non-existent initContainers and containers
api.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "test4"},
Spec: api.PodSpec{
InitContainers: []api.Container{
{Name: "init1", Image: "initimage"},
{Name: "sidecar1", Image: "sidecarimage", RestartPolicy: ptr.To(api.ContainerRestartPolicyAlways)},
},
Containers: []api.Container{{Name: "container1", Image: "containerimage"}},
},
Status: api.PodStatus{
Phase: "Running",
InitContainerStatuses: []api.ContainerStatus{
{Name: "initinvalid"},
{Name: "init1"},
{Name: "sidecar1"},
},
ContainerStatuses: []api.ContainerStatus{
{Name: "containerinvalid"},
{Name: "container1"},
},
},
},
[]metav1.TableRow{{Cells: []interface{}{"test4", "0/2", "Init:0/2", "0", "<unknown>"}}},
},
} }
for i, test := range tests { for i, test := range tests {