Bumping k8s dependencies to 1.13
This commit is contained in:
32
vendor/k8s.io/kubernetes/pkg/printers/humanreadable.go
generated
vendored
32
vendor/k8s.io/kubernetes/pkg/printers/humanreadable.go
generated
vendored
@@ -114,17 +114,25 @@ func (h *HumanReadablePrinter) EnsurePrintHeaders() {
|
||||
// See ValidatePrintHandlerFunc for required method signature.
|
||||
func (h *HumanReadablePrinter) Handler(columns, columnsWithWide []string, printFunc interface{}) error {
|
||||
var columnDefinitions []metav1beta1.TableColumnDefinition
|
||||
for _, column := range columns {
|
||||
for i, column := range columns {
|
||||
format := ""
|
||||
if i == 0 && strings.EqualFold(column, "name") {
|
||||
format = "name"
|
||||
}
|
||||
|
||||
columnDefinitions = append(columnDefinitions, metav1beta1.TableColumnDefinition{
|
||||
Name: column,
|
||||
Type: "string",
|
||||
Name: column,
|
||||
Description: column,
|
||||
Type: "string",
|
||||
Format: format,
|
||||
})
|
||||
}
|
||||
for _, column := range columnsWithWide {
|
||||
columnDefinitions = append(columnDefinitions, metav1beta1.TableColumnDefinition{
|
||||
Name: column,
|
||||
Type: "string",
|
||||
Priority: 1,
|
||||
Name: column,
|
||||
Description: column,
|
||||
Type: "string",
|
||||
Priority: 1,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -363,6 +371,11 @@ func PrintTable(table *metav1beta1.Table, output io.Writer, options PrintOptions
|
||||
for _, row := range table.Rows {
|
||||
first := true
|
||||
for i, cell := range row.Cells {
|
||||
if i >= len(table.ColumnDefinitions) {
|
||||
// https://issue.k8s.io/66379
|
||||
// don't panic in case of bad output from the server, with more cells than column definitions
|
||||
break
|
||||
}
|
||||
column := table.ColumnDefinitions[i]
|
||||
if !options.Wide && column.Priority != 0 {
|
||||
continue
|
||||
@@ -631,6 +644,13 @@ func (h *HumanReadablePrinter) legacyPrinterToTable(obj runtime.Object, handler
|
||||
args := []reflect.Value{reflect.ValueOf(obj), reflect.ValueOf(buf), reflect.ValueOf(options)}
|
||||
|
||||
if meta.IsListType(obj) {
|
||||
listInterface, ok := obj.(metav1.ListInterface)
|
||||
if ok {
|
||||
table.ListMeta.SelfLink = listInterface.GetSelfLink()
|
||||
table.ListMeta.ResourceVersion = listInterface.GetResourceVersion()
|
||||
table.ListMeta.Continue = listInterface.GetContinue()
|
||||
}
|
||||
|
||||
// TODO: this uses more memory than it has to, as we refactor printers we should remove the need
|
||||
// for this.
|
||||
args[0] = reflect.ValueOf(obj)
|
||||
|
Reference in New Issue
Block a user