Merge pull request #20437 from liggitt/nominated-node

Fix panic with incorrect number of server side pod printing columns
openshift · Jul 28, 2018 · 1a75bd6 · 1a75bd6
2 parents 42ca085 + dbbeefe
commit 1a75bd6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/humanreadable_flags_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/humanreadable_flags_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/printers/humanreadable.go b/vendor/k8s.io/kubernetes/pkg/printers/humanreadable.go
diff --git a/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers.go b/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers.go
diff --git a/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers_test.go b/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/registry/core/pod/storage/storage_test.go b/vendor/k8s.io/kubernetes/pkg/registry/core/pod/storage/storage_test.go