github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 12:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Handle invalid selectors properly

Browse Source
This commit is contained in:
Jordan Liggitt
2022-01-14 11:41:07 -05:00
parent 8c6b910e68
commit c0af728f43
20 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1996,14 +1996,16 @@ func printDeployment(obj *apps.Deployment, options printers.GenerateOptions) ([]
age := translateTimestampSince(obj.CreationTimestamp)
containers := obj.Spec.Template.Spec.Containers
selector, err := metav1.LabelSelectorAsSelector(obj.Spec.Selector)
selectorString := ""
if err != nil {
// this shouldn't happen if LabelSelector passed validation
return nil, err
selectorString = "<invalid>"
} else {
selectorString = selector.String()
}
row.Cells = append(row.Cells, obj.Name, fmt.Sprintf("%d/%d", int64(readyReplicas), int64(desiredReplicas)), int64(updatedReplicas), int64(availableReplicas), age)
if options.Wide {
containers, images := layoutContainerCells(containers)
row.Cells = append(row.Cells, containers, images, selector.String())
row.Cells = append(row.Cells, containers, images, selectorString)
}
return []metav1.TableRow{row}, nil
}