Merge pull request #1563 from saschagrunert/podname

k8s-ci-robot · web-flow · commit 0c91e0241fed · 2024-08-08T07:00:34.000-07:00
Dedup pod name const
diff --git a/cmd/crictl/container.go b/cmd/crictl/container.go
@@ -1209,7 +1209,7 @@ func OutputContainers(runtimeClient internalapi.RuntimeService, imageClient inte
 
 	display := newDefaultTableDisplay()
 	if !opts.verbose && !opts.quiet {
-		display.AddRow([]string{columnContainer, columnImage, columnCreated, columnState, columnName, columnAttempt, columnPodID, columnPodname})
+		display.AddRow([]string{columnContainer, columnImage, columnCreated, columnState, columnName, columnAttempt, columnPodID, columnPodName})
 	}
 	for _, c := range r {
 		if match, err := matchesImage(imageClient, opts.image, c.GetImage().GetImage()); err != nil {
diff --git a/cmd/crictl/display.go b/cmd/crictl/display.go
@@ -43,7 +43,6 @@ const (
 	columnInodes     = "INODES"
 	columnDisk       = "DISK"
 	columnCPU        = "CPU %"
-	columnPodname    = "POD"
 	columnKey        = "KEY"
 	columnValue      = "VALUE"
 )

Original file line number	Diff line number	Diff line change
`@@ -1209,7 +1209,7 @@ func OutputContainers(runtimeClient internalapi.RuntimeService, imageClient inte`
`1209`	`1209`
`1210`	`1210`	`display := newDefaultTableDisplay()`
`1211`	`1211`	`if !opts.verbose && !opts.quiet {`
`1212`		`- display.AddRow([]string{columnContainer, columnImage, columnCreated, columnState, columnName, columnAttempt, columnPodID, columnPodname})`
	`1212`	`+ display.AddRow([]string{columnContainer, columnImage, columnCreated, columnState, columnName, columnAttempt, columnPodID, columnPodName})`
`1213`	`1213`	`}`
`1214`	`1214`	`for _, c := range r {`
`1215`	`1215`	`if match, err := matchesImage(imageClient, opts.image, c.GetImage().GetImage()); err != nil {`