From 0e0b2ad56b927f2a7201f1821731429e13220913 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Tue, 11 Dec 2018 13:26:33 -0800 Subject: [PATCH 1/2] Update kube-openapi to fix schema parsing There is a bug with the Time type that it doesn't accept null, which is inconvenient because creationTimeStamp should always be set to null. --- Godeps/Godeps.json | 28 +++++++++---------- .../k8s.io/kube-openapi/pkg/schemaconv/smd.go | 14 ++++++++-- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 3182818af60..e1cb82d05cb 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -3997,59 +3997,59 @@ }, { "ImportPath": "k8s.io/kube-openapi/cmd/openapi-gen", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/cmd/openapi-gen/args", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/aggregator", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/generators", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/generators/rules", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto/testing", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto/validation", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/sets", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/utils/clock", diff --git a/vendor/k8s.io/kube-openapi/pkg/schemaconv/smd.go b/vendor/k8s.io/kube-openapi/pkg/schemaconv/smd.go index 5645e773f14..a885527c726 100644 --- a/vendor/k8s.io/kube-openapi/pkg/schemaconv/smd.go +++ b/vendor/k8s.io/kube-openapi/pkg/schemaconv/smd.go @@ -213,10 +213,18 @@ func (c *convert) VisitPrimitive(p *proto.Primitive) { case proto.Number: a.Scalar = ptr(schema.Numeric) case proto.String: - if p.Format == "int-or-string" { - a.Untyped = &schema.Untyped{} - } else { + switch p.Format { + case "": a.Scalar = ptr(schema.String) + case "byte": + // byte really means []byte and is encoded as a string. + a.Scalar = ptr(schema.String) + case "int-or-string": + a.Untyped = &schema.Untyped{} + case "date-time": + a.Untyped = &schema.Untyped{} + default: + a.Untyped = &schema.Untyped{} } case proto.Boolean: a.Scalar = ptr(schema.Boolean) From 60b8b79e5529c5f1163016c022dcba191d0a69eb Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Tue, 11 Dec 2018 14:27:37 -0800 Subject: [PATCH 2/2] Run update-staging-godeps.sh --- .../apiextensions-apiserver/Godeps/Godeps.json | 10 +++++----- staging/src/k8s.io/apimachinery/Godeps/Godeps.json | 4 ++-- staging/src/k8s.io/apiserver/Godeps/Godeps.json | 14 +++++++------- staging/src/k8s.io/client-go/Godeps/Godeps.json | 2 +- staging/src/k8s.io/csi-api/Godeps/Godeps.json | 2 +- .../src/k8s.io/kube-aggregator/Godeps/Godeps.json | 12 ++++++------ staging/src/k8s.io/metrics/Godeps/Godeps.json | 2 +- .../src/k8s.io/sample-apiserver/Godeps/Godeps.json | 10 +++++----- .../k8s.io/sample-controller/Godeps/Godeps.json | 2 +- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index 14825ca0a64..43a1a0f4c9f 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -2276,23 +2276,23 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", diff --git a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json index 66391d6a567..90eff9c25e5 100644 --- a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json +++ b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json @@ -300,11 +300,11 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto/testing", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json index e9fd3f9f4d2..5fe95c13366 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -1964,31 +1964,31 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto/testing", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/client-go/discovery", diff --git a/staging/src/k8s.io/client-go/Godeps/Godeps.json b/staging/src/k8s.io/client-go/Godeps/Godeps.json index d0ec83308a2..33492eee78b 100644 --- a/staging/src/k8s.io/client-go/Godeps/Godeps.json +++ b/staging/src/k8s.io/client-go/Godeps/Godeps.json @@ -612,7 +612,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/csi-api/Godeps/Godeps.json b/staging/src/k8s.io/csi-api/Godeps/Godeps.json index 4e746a92f73..f8182d4a9d6 100644 --- a/staging/src/k8s.io/csi-api/Godeps/Godeps.json +++ b/staging/src/k8s.io/csi-api/Godeps/Godeps.json @@ -552,7 +552,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index 08e199f238b..45cfc01f689 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -1844,27 +1844,27 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/aggregator", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/metrics/Godeps/Godeps.json b/staging/src/k8s.io/metrics/Godeps/Godeps.json index 6795608144f..f47f06718cc 100644 --- a/staging/src/k8s.io/metrics/Godeps/Godeps.json +++ b/staging/src/k8s.io/metrics/Godeps/Godeps.json @@ -524,7 +524,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json index b2bad16d826..4a621ee1358 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -1800,23 +1800,23 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json index 6a321dba275..5cb9d139c77 100644 --- a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json @@ -1156,7 +1156,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" + "Rev": "0317810137be915b9cf888946c6e115c1bfac693" }, { "ImportPath": "sigs.k8s.io/yaml",