From af2cedde4e738f4beb3506d93eb8b5e1ab6451ba Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 28 Feb 2019 18:50:53 +0100 Subject: [PATCH 1/2] bump(k8s.io/kube-openapi): b3a7cee44a305be0a69e1b9ac03018307287e1b0 To get https://github.com/kubernetes/kube-openapi/pull/149. --- Godeps/Godeps.json | 28 ++--- .../cmd/openapi-gen/openapi-gen.go | 1 - .../kube-openapi/pkg/handler/handler.go | 102 ++++-------------- 3 files changed, 34 insertions(+), 97 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 5bccb7d92c..c76762dc24 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -4231,59 +4231,59 @@ }, { "ImportPath": "k8s.io/kube-openapi/cmd/openapi-gen", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/cmd/openapi-gen/args", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/aggregator", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/generators", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/generators/rules", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto/testing", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto/validation", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/sets", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/repo-infra/kazel", diff --git a/vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go b/vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go index 3d42da21a8..b1098c014c 100644 --- a/vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go +++ b/vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go @@ -54,5 +54,4 @@ func main() { ); err != nil { log.Fatalf("OpenAPI code generation error: %v", err) } - log.Println("Code for OpenAPI definitions generated") } diff --git a/vendor/k8s.io/kube-openapi/pkg/handler/handler.go b/vendor/k8s.io/kube-openapi/pkg/handler/handler.go index 6b3887e585..853d0dbef0 100644 --- a/vendor/k8s.io/kube-openapi/pkg/handler/handler.go +++ b/vendor/k8s.io/kube-openapi/pkg/handler/handler.go @@ -23,19 +23,18 @@ import ( "fmt" "mime" "net/http" - "strings" "sync" "time" "github.com/NYTimes/gziphandler" - restful "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful" "github.com/go-openapi/spec" "github.com/golang/protobuf/proto" - openapi_v2 "github.com/googleapis/gnostic/OpenAPIv2" + "github.com/googleapis/gnostic/OpenAPIv2" "github.com/googleapis/gnostic/compiler" "github.com/json-iterator/go" "github.com/munnerz/goautoneg" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" "k8s.io/kube-openapi/pkg/builder" "k8s.io/kube-openapi/pkg/common" @@ -86,84 +85,6 @@ func NewOpenAPIService(spec *spec.Swagger) (*OpenAPIService, error) { 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) { o.rwMutex.RLock() defer o.rwMutex.RUnlock() @@ -238,6 +159,23 @@ func jsonToYAMLValue(j interface{}) interface{} { ret[i] = jsonToYAMLValue(j[i]) } 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 } From b7f11084fa563f2b30315afd4fc69a52d2b2434f Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Fri, 1 Mar 2019 09:52:34 +0100 Subject: [PATCH 2/2] Update staging godeps --- staging/src/k8s.io/api/Godeps/Godeps.json | 2 +- .../Godeps/Godeps.json | 20 ++++++----------- .../k8s.io/apimachinery/Godeps/Godeps.json | 4 ++-- .../src/k8s.io/apiserver/Godeps/Godeps.json | 22 +++++++------------ .../src/k8s.io/cli-runtime/Godeps/Godeps.json | 6 ++--- .../src/k8s.io/client-go/Godeps/Godeps.json | 4 ++-- .../k8s.io/cloud-provider/Godeps/Godeps.json | 4 ++-- .../cluster-bootstrap/Godeps/Godeps.json | 2 +- .../k8s.io/code-generator/Godeps/Godeps.json | 2 +- .../k8s.io/component-base/Godeps/Godeps.json | 2 +- staging/src/k8s.io/csi-api/Godeps/Godeps.json | 4 ++-- .../csi-translation-lib/Godeps/Godeps.json | 2 +- .../k8s.io/kube-aggregator/Godeps/Godeps.json | 21 +++++++----------- .../Godeps/Godeps.json | 2 +- .../src/k8s.io/kube-proxy/Godeps/Godeps.json | 2 +- .../k8s.io/kube-scheduler/Godeps/Godeps.json | 2 +- staging/src/k8s.io/kubelet/Godeps/Godeps.json | 2 +- staging/src/k8s.io/metrics/Godeps/Godeps.json | 4 ++-- .../src/k8s.io/node-api/Godeps/Godeps.json | 4 ++-- .../sample-apiserver/Godeps/Godeps.json | 19 ++++++---------- .../sample-cli-plugin/Godeps/Godeps.json | 6 ++--- .../sample-controller/Godeps/Godeps.json | 4 ++-- 22 files changed, 59 insertions(+), 81 deletions(-) diff --git a/staging/src/k8s.io/api/Godeps/Godeps.json b/staging/src/k8s.io/api/Godeps/Godeps.json index 5eeedb72f8..7371564eec 100644 --- a/staging/src/k8s.io/api/Godeps/Godeps.json +++ b/staging/src/k8s.io/api/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/api", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index 759a5c6fde..3e8fdd9ebf 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/apiextensions-apiserver", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -572,17 +572,14 @@ }, { "ImportPath": "github.com/prometheus/client_golang/prometheus", - "Comment": "v0.9.2", "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" }, { "ImportPath": "github.com/prometheus/client_golang/prometheus/internal", - "Comment": "v0.9.2", "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" }, { "ImportPath": "github.com/prometheus/client_golang/prometheus/promhttp", - "Comment": "v0.9.2", "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" }, { @@ -591,17 +588,14 @@ }, { "ImportPath": "github.com/prometheus/common/expfmt", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { "ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { "ImportPath": "github.com/prometheus/common/model", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { @@ -2266,27 +2260,27 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "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 a7a06ed950..5695993fce 100644 --- a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json +++ b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/apimachinery", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -176,7 +176,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "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 40bf2148f1..0ebf89c7ed 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/apiserver", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -552,17 +552,14 @@ }, { "ImportPath": "github.com/prometheus/client_golang/prometheus", - "Comment": "v0.9.2", "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" }, { "ImportPath": "github.com/prometheus/client_golang/prometheus/internal", - "Comment": "v0.9.2", "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" }, { "ImportPath": "github.com/prometheus/client_golang/prometheus/promhttp", - "Comment": "v0.9.2", "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" }, { @@ -571,17 +568,14 @@ }, { "ImportPath": "github.com/prometheus/common/expfmt", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { "ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { "ImportPath": "github.com/prometheus/common/model", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { @@ -1982,31 +1976,31 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto/testing", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/client-go/discovery", diff --git a/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json b/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json index 8d4a016320..59b09ba887 100644 --- a/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json +++ b/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/cli-runtime", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -656,11 +656,11 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "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 e218371629..c82b71e658 100644 --- a/staging/src/k8s.io/client-go/Godeps/Godeps.json +++ b/staging/src/k8s.io/client-go/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/client-go", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -620,7 +620,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/utils/buffer", diff --git a/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json b/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json index 64c9d59758..6eee62b2eb 100644 --- a/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json +++ b/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/cloud-provider", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -996,7 +996,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/utils/buffer", diff --git a/staging/src/k8s.io/cluster-bootstrap/Godeps/Godeps.json b/staging/src/k8s.io/cluster-bootstrap/Godeps/Godeps.json index e200cf466a..e63163ef2a 100644 --- a/staging/src/k8s.io/cluster-bootstrap/Godeps/Godeps.json +++ b/staging/src/k8s.io/cluster-bootstrap/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/cluster-bootstrap", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." diff --git a/staging/src/k8s.io/code-generator/Godeps/Godeps.json b/staging/src/k8s.io/code-generator/Godeps/Godeps.json index c7959921e2..b1f61b7877 100644 --- a/staging/src/k8s.io/code-generator/Godeps/Godeps.json +++ b/staging/src/k8s.io/code-generator/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/code-generator", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." diff --git a/staging/src/k8s.io/component-base/Godeps/Godeps.json b/staging/src/k8s.io/component-base/Godeps/Godeps.json index c013224172..ffd7e6cf5e 100644 --- a/staging/src/k8s.io/component-base/Godeps/Godeps.json +++ b/staging/src/k8s.io/component-base/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/component-base", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." diff --git a/staging/src/k8s.io/csi-api/Godeps/Godeps.json b/staging/src/k8s.io/csi-api/Godeps/Godeps.json index c14e2a8c02..fdb23b7fc1 100644 --- a/staging/src/k8s.io/csi-api/Godeps/Godeps.json +++ b/staging/src/k8s.io/csi-api/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/csi-api", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -540,7 +540,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/utils/buffer", diff --git a/staging/src/k8s.io/csi-translation-lib/Godeps/Godeps.json b/staging/src/k8s.io/csi-translation-lib/Godeps/Godeps.json index 75a383f117..b638f2a18d 100644 --- a/staging/src/k8s.io/csi-translation-lib/Godeps/Godeps.json +++ b/staging/src/k8s.io/csi-translation-lib/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/csi-translation-lib", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index 53bc6fe964..1c0252238e 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/kube-aggregator", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -220,12 +220,10 @@ }, { "ImportPath": "github.com/prometheus/client_golang/prometheus", - "Comment": "v0.9.2", "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" }, { "ImportPath": "github.com/prometheus/client_golang/prometheus/internal", - "Comment": "v0.9.2", "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" }, { @@ -234,17 +232,14 @@ }, { "ImportPath": "github.com/prometheus/common/expfmt", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { "ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { "ImportPath": "github.com/prometheus/common/model", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { @@ -1821,31 +1816,31 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/aggregator", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/utils/buffer", diff --git a/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json b/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json index 0091a56517..aa5b57e5b2 100644 --- a/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/kube-controller-manager", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." diff --git a/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json b/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json index fbf6a6cd9b..3304cbc9ac 100644 --- a/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/kube-proxy", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." diff --git a/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json b/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json index f20c4841c6..8eae6ee2a7 100644 --- a/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/kube-scheduler", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." diff --git a/staging/src/k8s.io/kubelet/Godeps/Godeps.json b/staging/src/k8s.io/kubelet/Godeps/Godeps.json index 66be2bfe7b..72fad3e015 100644 --- a/staging/src/k8s.io/kubelet/Godeps/Godeps.json +++ b/staging/src/k8s.io/kubelet/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/kubelet", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." diff --git a/staging/src/k8s.io/metrics/Godeps/Godeps.json b/staging/src/k8s.io/metrics/Godeps/Godeps.json index 2c727e19c8..a2826625dc 100644 --- a/staging/src/k8s.io/metrics/Godeps/Godeps.json +++ b/staging/src/k8s.io/metrics/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/metrics", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -516,7 +516,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/utils/integer", diff --git a/staging/src/k8s.io/node-api/Godeps/Godeps.json b/staging/src/k8s.io/node-api/Godeps/Godeps.json index 82aae3cdd9..db6cb73bd6 100644 --- a/staging/src/k8s.io/node-api/Godeps/Godeps.json +++ b/staging/src/k8s.io/node-api/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/node-api", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -540,7 +540,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/utils/buffer", diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json index 814b037b9e..6a7a3e5dae 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/sample-apiserver", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -204,12 +204,10 @@ }, { "ImportPath": "github.com/prometheus/client_golang/prometheus", - "Comment": "v0.9.2", "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" }, { "ImportPath": "github.com/prometheus/client_golang/prometheus/internal", - "Comment": "v0.9.2", "Rev": "505eaef017263e299324067d40ca2c48f6a2cf50" }, { @@ -218,17 +216,14 @@ }, { "ImportPath": "github.com/prometheus/common/expfmt", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { "ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { "ImportPath": "github.com/prometheus/common/model", - "Comment": "v0.2.0", "Rev": "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" }, { @@ -1777,27 +1772,27 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/schemaconv", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/utils/buffer", diff --git a/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json b/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json index 59c363e673..d01f443f67 100644 --- a/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/sample-cli-plugin", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -728,11 +728,11 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/utils/integer", diff --git a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json index 699eb57d88..515e5b49c6 100644 --- a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/sample-controller", - "GoVersion": "go1.11", + "GoVersion": "go1.12", "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." @@ -1180,7 +1180,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e" + "Rev": "b3a7cee44a305be0a69e1b9ac03018307287e1b0" }, { "ImportPath": "k8s.io/utils/buffer",