github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #71972 from apelisse/update-kube-openapi

Browse Source 
Update kube-openapi to fix schema parsing
This commit is contained in:
Kubernetes Prow Robot
2018-12-12 08:53:46 -08:00
committed by GitHub
parent 3c2224c798 60b8b79e55
commit c4e292da42
11 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Godeps/Godeps.json generated
View File

@@ -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",

10
staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json generated
View File

@@ -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",

4
staging/src/k8s.io/apimachinery/Godeps/Godeps.json generated
View File

@@ -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",

14
staging/src/k8s.io/apiserver/Godeps/Godeps.json generated
View File

@@ -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",

2
staging/src/k8s.io/client-go/Godeps/Godeps.json generated
View File

@@ -612,7 +612,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d"
"Rev": "0317810137be915b9cf888946c6e115c1bfac693"
},
{
"ImportPath": "sigs.k8s.io/yaml",

2
staging/src/k8s.io/csi-api/Godeps/Godeps.json generated
View File

@@ -552,7 +552,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d"
"Rev": "0317810137be915b9cf888946c6e115c1bfac693"
},
{
"ImportPath": "sigs.k8s.io/yaml",

12
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json generated
View File

@@ -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",

2
staging/src/k8s.io/metrics/Godeps/Godeps.json generated
View File

@@ -524,7 +524,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d"
"Rev": "0317810137be915b9cf888946c6e115c1bfac693"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json generated
View File

@@ -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",

2
staging/src/k8s.io/sample-controller/Godeps/Godeps.json generated
View File

@@ -1156,7 +1156,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d"
"Rev": "0317810137be915b9cf888946c6e115c1bfac693"
},
{
"ImportPath": "sigs.k8s.io/yaml",

14
vendor/k8s.io/kube-openapi/pkg/schemaconv/smd.go generated vendored
View File

@@ -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)