From 1e2a482e68dd0cf95c4ac459f3a212f8793382a3 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Sat, 16 May 2020 18:59:51 -0700 Subject: [PATCH] Merge pull request #90183 from dims/update-kubernetes-to-klog-v2 Update kubernetes to klog v2 Kubernetes-commit: b170451caa083434ee7875c2708c6f85eb220a39 --- Godeps/Godeps.json | 138 +++++++++++++++++++++++++++++++++++++-------- go.mod | 17 +++--- go.sum | 4 ++ 3 files changed, 125 insertions(+), 34 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 69fd7743..ad57a4aa 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -8,7 +8,27 @@ "Deps": [ { "ImportPath": "cloud.google.com/go", - "Rev": "v0.38.0" + "Rev": "v0.51.0" + }, + { + "ImportPath": "cloud.google.com/go/bigquery", + "Rev": "v1.0.1" + }, + { + "ImportPath": "cloud.google.com/go/datastore", + "Rev": "v1.0.0" + }, + { + "ImportPath": "cloud.google.com/go/pubsub", + "Rev": "v1.0.1" + }, + { + "ImportPath": "cloud.google.com/go/storage", + "Rev": "v1.0.0" + }, + { + "ImportPath": "dmitri.shuralyov.com/gpu/mtl", + "Rev": "666a987793e9" }, { "ImportPath": "github.com/Azure/go-autorest/autorest", @@ -38,6 +58,10 @@ "ImportPath": "github.com/BurntSushi/toml", "Rev": "v0.3.1" }, + { + "ImportPath": "github.com/BurntSushi/xgb", + "Rev": "27f122750802" + }, { "ImportPath": "github.com/NYTimes/gziphandler", "Rev": "56545f4a5d46" @@ -50,6 +74,22 @@ "ImportPath": "github.com/PuerkitoBio/urlesc", "Rev": "de5bf2ad4578" }, + { + "ImportPath": "github.com/census-instrumentation/opencensus-proto", + "Rev": "v0.2.1" + }, + { + "ImportPath": "github.com/chzyer/logex", + "Rev": "v1.1.10" + }, + { + "ImportPath": "github.com/chzyer/readline", + "Rev": "2972be24d48e" + }, + { + "ImportPath": "github.com/chzyer/test", + "Rev": "a1ea475d72b1" + }, { "ImportPath": "github.com/client9/misspell", "Rev": "v0.3.4" @@ -78,6 +118,14 @@ "ImportPath": "github.com/emicklei/go-restful", "Rev": "v2.9.5" }, + { + "ImportPath": "github.com/envoyproxy/go-control-plane", + "Rev": "5f8ba28d4473" + }, + { + "ImportPath": "github.com/envoyproxy/protoc-gen-validate", + "Rev": "v0.1.0" + }, { "ImportPath": "github.com/evanphx/json-patch", "Rev": "v4.2.0" @@ -90,6 +138,10 @@ "ImportPath": "github.com/ghodss/yaml", "Rev": "73d445a93680" }, + { + "ImportPath": "github.com/go-gl/glfw/v3.3/glfw", + "Rev": "12ad95a8df72" + }, { "ImportPath": "github.com/go-logr/logr", "Rev": "v0.1.0" @@ -120,11 +172,11 @@ }, { "ImportPath": "github.com/golang/groupcache", - "Rev": "5b532d6fd5ef" + "Rev": "215e87163ea7" }, { "ImportPath": "github.com/golang/mock", - "Rev": "v1.2.0" + "Rev": "v1.3.1" }, { "ImportPath": "github.com/golang/protobuf", @@ -148,7 +200,11 @@ }, { "ImportPath": "github.com/google/pprof", - "Rev": "3ea8567a2e57" + "Rev": "d4f498aebedc" + }, + { + "ImportPath": "github.com/google/renameio", + "Rev": "v0.1.0" }, { "ImportPath": "github.com/google/uuid", @@ -156,7 +212,7 @@ }, { "ImportPath": "github.com/googleapis/gax-go/v2", - "Rev": "v2.0.4" + "Rev": "v2.0.5" }, { "ImportPath": "github.com/googleapis/gnostic", @@ -174,6 +230,10 @@ "ImportPath": "github.com/hpcloud/tail", "Rev": "v1.0.0" }, + { + "ImportPath": "github.com/ianlancetaylor/demangle", + "Rev": "5e5cf60278f6" + }, { "ImportPath": "github.com/imdario/mergo", "Rev": "v0.3.5" @@ -184,7 +244,7 @@ }, { "ImportPath": "github.com/jstemmer/go-junit-report", - "Rev": "af01ea7f8024" + "Rev": "v0.9.1" }, { "ImportPath": "github.com/kisielk/errcheck", @@ -242,6 +302,14 @@ "ImportPath": "github.com/pmezard/go-difflib", "Rev": "v1.0.0" }, + { + "ImportPath": "github.com/prometheus/client_model", + "Rev": "14fe0d1b01d4" + }, + { + "ImportPath": "github.com/rogpeppe/go-internal", + "Rev": "v1.3.0" + }, { "ImportPath": "github.com/spf13/afero", "Rev": "v1.2.2" @@ -260,7 +328,7 @@ }, { "ImportPath": "go.opencensus.io", - "Rev": "v0.21.0" + "Rev": "v0.22.2" }, { "ImportPath": "golang.org/x/crypto", @@ -268,11 +336,23 @@ }, { "ImportPath": "golang.org/x/exp", - "Rev": "509febef88a4" + "Rev": "da58074b4299" + }, + { + "ImportPath": "golang.org/x/image", + "Rev": "cff245a6509b" }, { "ImportPath": "golang.org/x/lint", - "Rev": "5614ed5bae6f" + "Rev": "fdd1cda4f05f" + }, + { + "ImportPath": "golang.org/x/mobile", + "Rev": "d2bd2a29d028" + }, + { + "ImportPath": "golang.org/x/mod", + "Rev": "v0.1.0" }, { "ImportPath": "golang.org/x/net", @@ -280,11 +360,11 @@ }, { "ImportPath": "golang.org/x/oauth2", - "Rev": "0f29369cfe45" + "Rev": "858c2ad4c8b6" }, { "ImportPath": "golang.org/x/sync", - "Rev": "112230192c58" + "Rev": "cd5d95a43a6e" }, { "ImportPath": "golang.org/x/sys", @@ -308,24 +388,28 @@ }, { "ImportPath": "google.golang.org/api", - "Rev": "v0.4.0" + "Rev": "v0.15.0" }, { "ImportPath": "google.golang.org/appengine", - "Rev": "v1.5.0" + "Rev": "v1.6.5" }, { "ImportPath": "google.golang.org/genproto", - "Rev": "e7d98fc518a7" + "Rev": "f3c370f40bfb" }, { "ImportPath": "google.golang.org/grpc", - "Rev": "v1.19.0" + "Rev": "v1.26.0" }, { "ImportPath": "gopkg.in/check.v1", "Rev": "41f04d3bba15" }, + { + "ImportPath": "gopkg.in/errgo.v2", + "Rev": "v2.1.0" + }, { "ImportPath": "gopkg.in/fsnotify.v1", "Rev": "v1.4.7" @@ -344,39 +428,43 @@ }, { "ImportPath": "honnef.co/go/tools", - "Rev": "3f1c8253044a" + "Rev": "v0.0.1-2019.2.3" }, { "ImportPath": "k8s.io/api", - "Rev": "6a16455650b6" + "Rev": "2490600588fc" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "97fb445e5c49" + "Rev": "561e5e9b265b" }, { "ImportPath": "k8s.io/client-go", - "Rev": "806d15d65454" + "Rev": "3d5c80942cce" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "7baaea6316a6" + "Rev": "0881615ab9fd" }, { "ImportPath": "k8s.io/gengo", - "Rev": "e0e292d8aa12" + "Rev": "8167cfdcfc14" }, { - "ImportPath": "k8s.io/klog", - "Rev": "v1.0.0" + "ImportPath": "k8s.io/klog/v2", + "Rev": "v2.0.0" }, { "ImportPath": "k8s.io/kube-openapi", - "Rev": "e1beb1bd0f35" + "Rev": "656914f816f9" }, { "ImportPath": "k8s.io/utils", - "Rev": "a9aa75ae1b89" + "Rev": "2df71ebbae66" + }, + { + "ImportPath": "rsc.io/binaryregexp", + "Rev": "v0.2.0" }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/v3", diff --git a/go.mod b/go.mod index dd88ba33..4ca8cca2 100644 --- a/go.mod +++ b/go.mod @@ -5,19 +5,18 @@ module k8s.io/sample-controller go 1.13 require ( - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/code-generator v0.0.0 + k8s.io/api v0.0.0-20200517042100-2490600588fc + k8s.io/apimachinery v0.0.0-20200517041843-561e5e9b265b + k8s.io/client-go v0.0.0-20200517042358-3d5c80942cce + k8s.io/code-generator v0.0.0-20200517041639-0881615ab9fd k8s.io/klog/v2 v2.0.0 ) replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/sample-controller => ../sample-controller + k8s.io/api => k8s.io/api v0.0.0-20200517042100-2490600588fc + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200517041843-561e5e9b265b + k8s.io/client-go => k8s.io/client-go v0.0.0-20200517042358-3d5c80942cce + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200517041639-0881615ab9fd ) diff --git a/go.sum b/go.sum index 5e11e4b4..ccc1e046 100644 --- a/go.sum +++ b/go.sum @@ -280,6 +280,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +k8s.io/api v0.0.0-20200517042100-2490600588fc/go.mod h1:ExbRZPEQpO7MaDVNLbKNxu/Wsc3/QfT1Tqfbbhn/M5U= +k8s.io/apimachinery v0.0.0-20200517041843-561e5e9b265b/go.mod h1:XraFtZJYPxtse0n3rSuYw+TjG4aVQFUO5cEG3MRfLTM= +k8s.io/client-go v0.0.0-20200517042358-3d5c80942cce/go.mod h1:sBPsoaDqSdNFq8lY4POs8ZDyBkagaRlaCNDoCe2IHzo= +k8s.io/code-generator v0.0.0-20200517041639-0881615ab9fd/go.mod h1:Ahd1YHWvcZhS215bH8Hd6qX0kZfgMniai8dx6BF+Rn4= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=