Skip to content

K
k3s
Unverified Commit 979bef15 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #74795 from sttts/sttts-kube-openapi-149

kube-openapi: revendor to fix integer handling
parents 7514c49e b7f11084
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 178 deletions
Godeps/Godeps.json
View file @ 979bef15
...@@ -4231,59 +4231,59 @@ ...@@ -4231,59 +4231,59 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/cmd/openapi-gen", "ImportPath": "k8s.io/kube-openapi/cmd/openapi-gen",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/cmd/openapi-gen/args", "ImportPath": "k8s.io/kube-openapi/cmd/openapi-gen/args",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/aggregator", "ImportPath": "k8s.io/kube-openapi/pkg/aggregator",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/builder", "ImportPath": "k8s.io/kube-openapi/pkg/builder",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/generators", "ImportPath": "k8s.io/kube-openapi/pkg/generators",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/generators/rules", "ImportPath": "k8s.io/kube-openapi/pkg/generators/rules",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/handler", "ImportPath": "k8s.io/kube-openapi/pkg/handler",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util", "ImportPath": "k8s.io/kube-openapi/pkg/util",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto/testing", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto/testing",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto/validation", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto/validation",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/sets", "ImportPath": "k8s.io/kube-openapi/pkg/util/sets",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/repo-infra/kazel", "ImportPath": "k8s.io/repo-infra/kazel",
......
staging/src/k8s.io/api/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
......
staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/apiextensions-apiserver", "ImportPath": "k8s.io/apiextensions-apiserver",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -572,17 +572,14 @@ ...@@ -572,17 +572,14 @@
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus", "ImportPath": "github.com/prometheus/client_golang/prometheus",
"Comment": "v0.9.2",
"Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50"
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus/internal", "ImportPath": "github.com/prometheus/client_golang/prometheus/internal",
"Comment": "v0.9.2",
"Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50"
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus/promhttp", "ImportPath": "github.com/prometheus/client_golang/prometheus/promhttp",
"Comment": "v0.9.2",
"Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50"
}, },
{ {
...@@ -591,17 +588,14 @@ ...@@ -591,17 +588,14 @@
}, },
{ {
"ImportPath": "github.com/prometheus/common/expfmt", "ImportPath": "github.com/prometheus/common/expfmt",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
"ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", "ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
"ImportPath": "github.com/prometheus/common/model", "ImportPath": "github.com/prometheus/common/model",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
...@@ -2266,27 +2260,27 @@ ...@@ -2266,27 +2260,27 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/builder", "ImportPath": "k8s.io/kube-openapi/pkg/builder",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/handler", "ImportPath": "k8s.io/kube-openapi/pkg/handler",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util", "ImportPath": "k8s.io/kube-openapi/pkg/util",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
......
staging/src/k8s.io/apimachinery/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "sigs.k8s.io/yaml", "ImportPath": "sigs.k8s.io/yaml",
......
staging/src/k8s.io/apiserver/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/apiserver", "ImportPath": "k8s.io/apiserver",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -552,17 +552,14 @@ ...@@ -552,17 +552,14 @@
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus", "ImportPath": "github.com/prometheus/client_golang/prometheus",
"Comment": "v0.9.2",
"Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50"
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus/internal", "ImportPath": "github.com/prometheus/client_golang/prometheus/internal",
"Comment": "v0.9.2",
"Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50"
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus/promhttp", "ImportPath": "github.com/prometheus/client_golang/prometheus/promhttp",
"Comment": "v0.9.2",
"Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50"
}, },
{ {
...@@ -571,17 +568,14 @@ ...@@ -571,17 +568,14 @@
}, },
{ {
"ImportPath": "github.com/prometheus/common/expfmt", "ImportPath": "github.com/prometheus/common/expfmt",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
"ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", "ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
"ImportPath": "github.com/prometheus/common/model", "ImportPath": "github.com/prometheus/common/model",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
...@@ -1982,31 +1976,31 @@ ...@@ -1982,31 +1976,31 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/builder", "ImportPath": "k8s.io/kube-openapi/pkg/builder",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/handler", "ImportPath": "k8s.io/kube-openapi/pkg/handler",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util", "ImportPath": "k8s.io/kube-openapi/pkg/util",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto/testing", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto/testing",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/client-go/discovery", "ImportPath": "k8s.io/client-go/discovery",
......
staging/src/k8s.io/cli-runtime/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/cli-runtime", "ImportPath": "k8s.io/cli-runtime",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -656,11 +656,11 @@ ...@@ -656,11 +656,11 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/client-go/discovery", "ImportPath": "k8s.io/client-go/discovery",
......
staging/src/k8s.io/client-go/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -620,7 +620,7 @@ ...@@ -620,7 +620,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/utils/buffer", "ImportPath": "k8s.io/utils/buffer",
......
staging/src/k8s.io/cloud-provider/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/cloud-provider", "ImportPath": "k8s.io/cloud-provider",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -996,7 +996,7 @@ ...@@ -996,7 +996,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/utils/buffer", "ImportPath": "k8s.io/utils/buffer",
......
staging/src/k8s.io/cluster-bootstrap/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/cluster-bootstrap", "ImportPath": "k8s.io/cluster-bootstrap",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
......
staging/src/k8s.io/code-generator/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
......
staging/src/k8s.io/component-base/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
......
staging/src/k8s.io/csi-api/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/csi-api", "ImportPath": "k8s.io/csi-api",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -540,7 +540,7 @@ ...@@ -540,7 +540,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/utils/buffer", "ImportPath": "k8s.io/utils/buffer",
......
staging/src/k8s.io/csi-translation-lib/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/csi-translation-lib", "ImportPath": "k8s.io/csi-translation-lib",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
......
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/kube-aggregator", "ImportPath": "k8s.io/kube-aggregator",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -220,12 +220,10 @@ ...@@ -220,12 +220,10 @@
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus", "ImportPath": "github.com/prometheus/client_golang/prometheus",
"Comment": "v0.9.2",
"Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50"
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus/internal", "ImportPath": "github.com/prometheus/client_golang/prometheus/internal",
"Comment": "v0.9.2",
"Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50"
}, },
{ {
...@@ -234,17 +232,14 @@ ...@@ -234,17 +232,14 @@
}, },
{ {
"ImportPath": "github.com/prometheus/common/expfmt", "ImportPath": "github.com/prometheus/common/expfmt",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
"ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", "ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
"ImportPath": "github.com/prometheus/common/model", "ImportPath": "github.com/prometheus/common/model",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
...@@ -1821,31 +1816,31 @@ ...@@ -1821,31 +1816,31 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/aggregator", "ImportPath": "k8s.io/kube-openapi/pkg/aggregator",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/builder", "ImportPath": "k8s.io/kube-openapi/pkg/builder",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/handler", "ImportPath": "k8s.io/kube-openapi/pkg/handler",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util", "ImportPath": "k8s.io/kube-openapi/pkg/util",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/utils/buffer", "ImportPath": "k8s.io/utils/buffer",
......
staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/kube-controller-manager", "ImportPath": "k8s.io/kube-controller-manager",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
......
staging/src/k8s.io/kube-proxy/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/kube-proxy", "ImportPath": "k8s.io/kube-proxy",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
......
staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/kube-scheduler", "ImportPath": "k8s.io/kube-scheduler",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
......
staging/src/k8s.io/kubelet/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/kubelet", "ImportPath": "k8s.io/kubelet",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
......
staging/src/k8s.io/metrics/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/metrics", "ImportPath": "k8s.io/metrics",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -516,7 +516,7 @@ ...@@ -516,7 +516,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/utils/integer", "ImportPath": "k8s.io/utils/integer",
......
staging/src/k8s.io/node-api/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/node-api", "ImportPath": "k8s.io/node-api",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -540,7 +540,7 @@ ...@@ -540,7 +540,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/utils/buffer", "ImportPath": "k8s.io/utils/buffer",
......
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/sample-apiserver", "ImportPath": "k8s.io/sample-apiserver",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -204,12 +204,10 @@ ...@@ -204,12 +204,10 @@
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus", "ImportPath": "github.com/prometheus/client_golang/prometheus",
"Comment": "v0.9.2",
"Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50"
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus/internal", "ImportPath": "github.com/prometheus/client_golang/prometheus/internal",
"Comment": "v0.9.2",
"Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50"
}, },
{ {
...@@ -218,17 +216,14 @@ ...@@ -218,17 +216,14 @@
}, },
{ {
"ImportPath": "github.com/prometheus/common/expfmt", "ImportPath": "github.com/prometheus/common/expfmt",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
"ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", "ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
"ImportPath": "github.com/prometheus/common/model", "ImportPath": "github.com/prometheus/common/model",
"Comment": "v0.2.0",
"Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
}, },
{ {
...@@ -1777,27 +1772,27 @@ ...@@ -1777,27 +1772,27 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/builder", "ImportPath": "k8s.io/kube-openapi/pkg/builder",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/handler", "ImportPath": "k8s.io/kube-openapi/pkg/handler",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util", "ImportPath": "k8s.io/kube-openapi/pkg/util",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/utils/buffer", "ImportPath": "k8s.io/utils/buffer",
......
staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/sample-cli-plugin", "ImportPath": "k8s.io/sample-cli-plugin",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -728,11 +728,11 @@ ...@@ -728,11 +728,11 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/utils/integer", "ImportPath": "k8s.io/utils/integer",
......
staging/src/k8s.io/sample-controller/Godeps/Godeps.json
View file @ 979bef15
{ {
"ImportPath": "k8s.io/sample-controller", "ImportPath": "k8s.io/sample-controller",
"GoVersion": "go1.11", "GoVersion": "go1.12",
"GodepVersion": "v80-k8s-r1", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
...@@ -1180,7 +1180,7 @@ ...@@ -1180,7 +1180,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
}, },
{ {
"ImportPath": "k8s.io/utils/buffer", "ImportPath": "k8s.io/utils/buffer",
......
vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go
View file @ 979bef15
...@@ -54,5 +54,4 @@ func main() { ...@@ -54,5 +54,4 @@ func main() {
); err != nil { ); err != nil {
log.Fatalf("OpenAPI code generation error: %v", err) log.Fatalf("OpenAPI code generation error: %v", err)
} }
log.Println("Code for OpenAPI definitions generated")
} }
vendor/k8s.io/kube-openapi/pkg/handler/handler.go
View file @ 979bef15
...@@ -23,19 +23,18 @@ import ( ...@@ -23,19 +23,18 @@ import (
"fmt" "fmt"
"mime" "mime"
"net/http" "net/http"
"strings"
"sync" "sync"
"time" "time"
"github.com/NYTimes/gziphandler" "github.com/NYTimes/gziphandler"
restful "github.com/emicklei/go-restful" "github.com/emicklei/go-restful"
"github.com/go-openapi/spec" "github.com/go-openapi/spec"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
openapi_v2 "github.com/googleapis/gnostic/OpenAPIv2" "github.com/googleapis/gnostic/OpenAPIv2"
"github.com/googleapis/gnostic/compiler" "github.com/googleapis/gnostic/compiler"
"github.com/json-iterator/go" "github.com/json-iterator/go"
"github.com/munnerz/goautoneg" "github.com/munnerz/goautoneg"
yaml "gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"k8s.io/kube-openapi/pkg/builder" "k8s.io/kube-openapi/pkg/builder"
"k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/common"
...@@ -86,84 +85,6 @@ func NewOpenAPIService(spec *spec.Swagger) (*OpenAPIService, error) { ...@@ -86,84 +85,6 @@ func NewOpenAPIService(spec *spec.Swagger) (*OpenAPIService, error) {
return o, nil return o, nil
} }
// NOTE: [DEPRECATION] We will announce deprecation for format-separated endpoints for OpenAPI spec,
// and switch to a single /openapi/v2 endpoint in Kubernetes 1.10. The design doc and deprecation process
// are tracked at: https://docs.google.com/document/d/19lEqE9lc4yHJ3WJAJxS_G7TcORIJXGHyq3wpwcH28nU.
//
// BuildAndRegisterOpenAPIService builds the spec and registers a handler to provide access to it.
// Use this method if your OpenAPI spec is static. If you want to update the spec, use BuildOpenAPISpec then RegisterOpenAPIService.
func BuildAndRegisterOpenAPIService(servePath string, webServices []*restful.WebService, config *common.Config, handler common.PathHandler) (*OpenAPIService, error) {
spec, err := builder.BuildOpenAPISpec(webServices, config)
if err != nil {
return nil, err
}
o, err := NewOpenAPIService(spec)
if err != nil {
return nil, err
}
return o, o.RegisterOpenAPIService(servePath, handler)
}
// NOTE: [DEPRECATION] We will announce deprecation for format-separated endpoints for OpenAPI spec,
// and switch to a single /openapi/v2 endpoint in Kubernetes 1.10. The design doc and deprecation process
// are tracked at: https://docs.google.com/document/d/19lEqE9lc4yHJ3WJAJxS_G7TcORIJXGHyq3wpwcH28nU.
//
// RegisterOpenAPIService registers a handler to provide access to provided swagger spec.
// Note: servePath should end with ".json" as the RegisterOpenAPIService assume it is serving a
// json file and will also serve .pb and .gz files.
//
// Deprecated: use OpenAPIService.RegisterOpenAPIService instead.
func RegisterOpenAPIService(spec *spec.Swagger, servePath string, handler common.PathHandler) (*OpenAPIService, error) {
o, err := NewOpenAPIService(spec)
if err != nil {
return nil, err
}
return o, o.RegisterOpenAPIService(servePath, handler)
}
// NOTE: [DEPRECATION] We will announce deprecation for format-separated endpoints for OpenAPI spec,
// and switch to a single /openapi/v2 endpoint in Kubernetes 1.10. The design doc and deprecation process
// are tracked at: https://docs.google.com/document/d/19lEqE9lc4yHJ3WJAJxS_G7TcORIJXGHyq3wpwcH28nU.
//
// RegisterOpenAPIService registers a handler to provide access to provided swagger spec.
// Note: servePath should end with ".json" as the RegisterOpenAPIService assume it is serving a
// json file and will also serve .pb and .gz files.
func (o *OpenAPIService) RegisterOpenAPIService(servePath string, handler common.PathHandler) error {
if !strings.HasSuffix(servePath, jsonExt) {
return fmt.Errorf("serving path must end with \"%s\"", jsonExt)
}
servePathBase := strings.TrimSuffix(servePath, jsonExt)
type fileInfo struct {
ext string
getDataAndETag func() ([]byte, string, time.Time)
}
files := []fileInfo{
{".json", o.getSwaggerBytes},
{"-2.0.0.json", o.getSwaggerBytes},
{"-2.0.0.pb-v1", o.getSwaggerPbBytes},
{"-2.0.0.pb-v1.gz", o.getSwaggerPbGzBytes},
}
for _, file := range files {
path := servePathBase + file.ext
getDataAndETag := file.getDataAndETag
handler.Handle(path, gziphandler.GzipHandler(http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
data, etag, lastModified := getDataAndETag()
w.Header().Set("Etag", etag)
// ServeContent will take care of caching using eTag.
http.ServeContent(w, r, path, lastModified, bytes.NewReader(data))
}),
))
}
return nil
}
func (o *OpenAPIService) getSwaggerBytes() ([]byte, string, time.Time) { func (o *OpenAPIService) getSwaggerBytes() ([]byte, string, time.Time) {
o.rwMutex.RLock() o.rwMutex.RLock()
defer o.rwMutex.RUnlock() defer o.rwMutex.RUnlock()
...@@ -238,6 +159,23 @@ func jsonToYAMLValue(j interface{}) interface{} { ...@@ -238,6 +159,23 @@ func jsonToYAMLValue(j interface{}) interface{} {
ret[i] = jsonToYAMLValue(j[i]) ret[i] = jsonToYAMLValue(j[i])
} }
return ret return ret
case float64:
// replicate the logic in https://github.com/go-yaml/yaml/blob/51d6538a90f86fe93ac480b35f37b2be17fef232/resolve.go#L151
if i64 := int64(j); j == float64(i64) {
if i := int(i64); i64 == int64(i) {
return i
}
return i64
}
if ui64 := uint64(j); j == float64(ui64) {
return ui64
}
return j
case int64:
if i := int(j); j == int64(i) {
return i
}
return j
} }
return j return j
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment