kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60991 from sttts/sttts-crd-columns 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

apiextensions-apiserver: add columns to CRD spec

Follow-up of https://github.com/kubernetes/kubernetes/pull/60269.

```release-note
Add spec. additionalPrinterColumns to CRDs to define server side printing columns.
```

Kubernetes-commit: 34383aa0a49ab916d74ea897cebc79ce0acfc9dd
This commit is contained in:
Kubernetes Publisher 2018-05-28 07:07:28 -07:00
parent e155869525 0b84708faa
commit 537650babf
2 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
Godeps/Godeps.json generated
View File

@ -952,211 +952,211 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing", "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/validation", "ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path", "ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/rand", "ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid", "ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup", "ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "5276ed7d4167a2c2aee37f42866688926f11ffb3" "Rev": "94ebb086c69b9fec4ddbfb6a1433d28ecca9292b"
}, },
{ {
"ImportPath": "k8s.io/client-go/discovery", "ImportPath": "k8s.io/client-go/discovery",

5
pkg/registry/rest/resttest/resttest.go
View File

@ -1320,7 +1320,7 @@ func (t *Tester) testListTableConversion(obj runtime.Object, assignFn AssignFunc
t.Errorf("column %d has no name", j) t.Errorf("column %d has no name", j)
} }
switch column.Type { switch column.Type {
case "string", "date", "integer": case "string", "date", "integer", "number", "boolean":
default: default:
t.Errorf("column %d has unexpected type: %q", j, column.Type) t.Errorf("column %d has unexpected type: %q", j, column.Type)
} }
@ -1342,13 +1342,14 @@ func (t *Tester) testListTableConversion(obj runtime.Object, assignFn AssignFunc
} }
for i, row := range table.Rows { for i, row := range table.Rows {
if len(row.Cells) != len(table.ColumnDefinitions) { if len(row.Cells) != len(table.ColumnDefinitions) {
t.Errorf("row %d did not have the correct number of cells: %d in %v", i, len(table.ColumnDefinitions), row.Cells) t.Errorf("row %d did not have the correct number of cells: %d in %v, expected %d", i, len(row.Cells), row.Cells, len(table.ColumnDefinitions))
} }
for j, cell := range row.Cells { for j, cell := range row.Cells {
// do not add to this test without discussion - may break clients // do not add to this test without discussion - may break clients
switch cell.(type) { switch cell.(type) {
case float64, int64, int32, int, string, bool: case float64, int64, int32, int, string, bool:
case []interface{}: case []interface{}:
case nil:
default: default:
t.Errorf("row %d, cell %d has an unrecognized type, only JSON serialization safe types are allowed: %T ", i, j, cell) t.Errorf("row %d, cell %d has an unrecognized type, only JSON serialization safe types are allowed: %T ", i, j, cell)
} }