From a802afb537ef2616813a9f6a74e9852a7bbc34b2 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 19 May 2021 09:59:29 -0700 Subject: [PATCH 1/8] vendor: bump runc to rc95 runc rc95 contains a fix for CVE-2021-30465. runc rc94 provides fixes and improvements. One notable change is cgroup manager's Set now accept Resources rather than Cgroup (see https://github.com/opencontainers/runc/pull/2906). Modify the code accordingly. Also update runc dependencies (as hinted by hack/lint-depdendencies.sh): github.com/cilium/ebpf v0.5.0 github.com/containerd/console v1.0.2 github.com/coreos/go-systemd/v22 v22.3.1 github.com/godbus/dbus/v5 v5.0.4 github.com/moby/sys/mountinfo v0.4.1 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 github.com/google/go-cmp v0.5.4 github.com/kr/pretty v0.2.1 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 Signed-off-by: Kir Kolyshkin Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8 --- go.mod | 11 ++++++----- go.sum | 12 ++++-------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 5842d477c..26e51852e 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e github.com/golang/protobuf v1.4.3 - github.com/google/go-cmp v0.5.2 + github.com/google/go-cmp v0.5.4 github.com/google/gofuzz v1.1.0 github.com/google/uuid v1.1.2 github.com/googleapis/gnostic v0.4.1 @@ -27,8 +27,8 @@ require ( golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba - k8s.io/api v0.0.0-20210518102353-e379db4b881d - k8s.io/apimachinery v0.0.0-20210518101206-7559d788db3a + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 k8s.io/klog/v2 v2.8.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/structured-merge-diff/v4 v4.1.0 @@ -36,6 +36,7 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210518102353-e379db4b881d - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518101206-7559d788db3a + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go ) diff --git a/go.sum b/go.sum index 03d0c0c47..4b2f842cd 100644 --- a/go.sum +++ b/go.sum @@ -108,8 +108,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -298,8 +298,8 @@ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 h1:dXfMednGJh/SUUFjTLsWJz3P+TQt9qnR11GgeI3vWKs= +golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= @@ -431,10 +431,6 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh 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= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20210518102353-e379db4b881d h1:DHzIPPwk8Y05yWpj33Kz8KaRnosOODhmDwLAaJjA8Rs= -k8s.io/api v0.0.0-20210518102353-e379db4b881d/go.mod h1:80FDcYLi/0zAklIq9x0fk3F7zTkqxDN4WUvnc7KD0pI= -k8s.io/apimachinery v0.0.0-20210518101206-7559d788db3a h1:9rchljRrJTMQxX0ck2Qvz2pbAM+Ti6IwaFuYc4QuiwE= -k8s.io/apimachinery v0.0.0-20210518101206-7559d788db3a/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= From ffd8cfc5638d6855b9d82b2ba63fb86d5de2037d Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 21 May 2021 12:58:11 -0700 Subject: [PATCH 2/8] Merge pull request #102196 from kolyshkin/automated-cherry-pick-of-#102147-upstream-release-1.21 Automated cherry pick of #102147: vendor: bump runc to rc95 Kubernetes-commit: 133f66aa603c4624ff3544f26f54a153a54c6f94 --- Godeps/Godeps.json | 8 ++++---- go.mod | 9 ++++----- go.sum | 4 ++++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 6ba4cc9a0..39900d3d6 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -196,7 +196,7 @@ }, { "ImportPath": "github.com/google/go-cmp", - "Rev": "v0.5.2" + "Rev": "v0.5.4" }, { "ImportPath": "github.com/google/gofuzz", @@ -400,7 +400,7 @@ }, { "ImportPath": "golang.org/x/sys", - "Rev": "a50acf3fe073" + "Rev": "d19ff857e887" }, { "ImportPath": "golang.org/x/term", @@ -476,11 +476,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "e379db4b881d" + "Rev": "b96220531b73" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "7559d788db3a" + "Rev": "1a7b32ce3b15" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 26e51852e..1cafa6b3a 100644 --- a/go.mod +++ b/go.mod @@ -27,8 +27,8 @@ require ( golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20210521231242-b96220531b73 + k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 k8s.io/klog/v2 v2.8.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/structured-merge-diff/v4 v4.1.0 @@ -36,7 +36,6 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go + k8s.io/api => k8s.io/api v0.0.0-20210521231242-b96220531b73 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 ) diff --git a/go.sum b/go.sum index 4b2f842cd..8acfa6f71 100644 --- a/go.sum +++ b/go.sum @@ -431,6 +431,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh 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= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.0.0-20210521231242-b96220531b73 h1:PuJc9v6ozb0tuojUdhpMpMiLFLy/M8Mc/kwJMkd47no= +k8s.io/api v0.0.0-20210521231242-b96220531b73/go.mod h1:90UO6Ryvwa9Yd0kKCHR1FoS1rzvfolT51aZuTitZqfM= +k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 h1:8KFyXEHJ9YhaFFEnFRPavjxc7gmLdhiBHAcvXM3ZGd4= +k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= From c18505fdb808d4d96133c4b15e1e4f662f242f0f Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Fri, 4 Jun 2021 08:54:19 +0200 Subject: [PATCH 3/8] Revert "Cleanup portforward streams after their usage" This reverts commit b14bd44f33d93e1ee64c1d68fa7591d79eac5893. A regression has been introduced with this patch. The strategy is to apply the fix on master and revert on the release branches. Kubernetes-commit: 154a5538a5c43f30c3942055e7432cbe4c864f2c --- tools/portforward/portforward_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/portforward/portforward_test.go b/tools/portforward/portforward_test.go index 551d97e96..c6e9e6efe 100644 --- a/tools/portforward/portforward_test.go +++ b/tools/portforward/portforward_test.go @@ -69,9 +69,6 @@ func (c *fakeConnection) CloseChan() <-chan bool { return c.closeChan } -func (c *fakeConnection) RemoveStreams(_ ...httpstream.Stream) { -} - func (c *fakeConnection) SetIdleTimeout(timeout time.Duration) { // no-op } From b63b1ba7e44fe5910cda90c2e80c7a89b35ea7e7 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 4 Jun 2021 09:52:39 -0700 Subject: [PATCH 4/8] Merge pull request #102587 from saschagrunert/release-1.21 Revert "Cleanup portforward streams after their usage" [1.21] Kubernetes-commit: e6824bbd0c2a669a049cc54f6e3d824d43b84f5f --- Godeps/Godeps.json | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 39900d3d6..42ca567f9 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -480,7 +480,7 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "1a7b32ce3b15" + "Rev": "235edae7dd90" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 1cafa6b3a..ece4defc2 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba k8s.io/api v0.0.0-20210521231242-b96220531b73 - k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 + k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90 k8s.io/klog/v2 v2.8.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/structured-merge-diff/v4 v4.1.0 @@ -37,5 +37,5 @@ require ( replace ( k8s.io/api => k8s.io/api v0.0.0-20210521231242-b96220531b73 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90 ) diff --git a/go.sum b/go.sum index 8acfa6f71..8379eafb8 100644 --- a/go.sum +++ b/go.sum @@ -433,8 +433,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20210521231242-b96220531b73 h1:PuJc9v6ozb0tuojUdhpMpMiLFLy/M8Mc/kwJMkd47no= k8s.io/api v0.0.0-20210521231242-b96220531b73/go.mod h1:90UO6Ryvwa9Yd0kKCHR1FoS1rzvfolT51aZuTitZqfM= -k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 h1:8KFyXEHJ9YhaFFEnFRPavjxc7gmLdhiBHAcvXM3ZGd4= -k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM= +k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90 h1:3VEyPqxm8EiEYB39RqGjuz6gHkxGECKCiGF+SyLI6QE= +k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= From 6277e972ffb348698a954f410ad70091a340827c Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 9 Jun 2021 12:16:40 +0000 Subject: [PATCH 5/8] sync: remove Godeps/ --- Godeps/Godeps.json | 522 --------------------------------------------- Godeps/OWNERS | 4 - Godeps/Readme | 5 - 3 files changed, 531 deletions(-) delete mode 100644 Godeps/Godeps.json delete mode 100644 Godeps/OWNERS delete mode 100644 Godeps/Readme diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index 42ca567f9..000000000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,522 +0,0 @@ -{ - "ImportPath": "k8s.io/client-go", - "GoVersion": "unknown", - "GodepVersion": "gen-godeps", - "Packages": [ - "./..." - ], - "Deps": [ - { - "ImportPath": "cloud.google.com/go", - "Rev": "v0.54.0" - }, - { - "ImportPath": "cloud.google.com/go/bigquery", - "Rev": "v1.4.0" - }, - { - "ImportPath": "cloud.google.com/go/datastore", - "Rev": "v1.1.0" - }, - { - "ImportPath": "cloud.google.com/go/pubsub", - "Rev": "v1.2.0" - }, - { - "ImportPath": "cloud.google.com/go/storage", - "Rev": "v1.6.0" - }, - { - "ImportPath": "dmitri.shuralyov.com/gpu/mtl", - "Rev": "666a987793e9" - }, - { - "ImportPath": "github.com/Azure/go-autorest", - "Rev": "v14.2.0" - }, - { - "ImportPath": "github.com/Azure/go-autorest/autorest", - "Rev": "v0.11.12" - }, - { - "ImportPath": "github.com/Azure/go-autorest/autorest/adal", - "Rev": "v0.9.5" - }, - { - "ImportPath": "github.com/Azure/go-autorest/autorest/date", - "Rev": "v0.3.0" - }, - { - "ImportPath": "github.com/Azure/go-autorest/autorest/mocks", - "Rev": "v0.4.1" - }, - { - "ImportPath": "github.com/Azure/go-autorest/logger", - "Rev": "v0.2.0" - }, - { - "ImportPath": "github.com/Azure/go-autorest/tracing", - "Rev": "v0.6.0" - }, - { - "ImportPath": "github.com/BurntSushi/toml", - "Rev": "v0.3.1" - }, - { - "ImportPath": "github.com/BurntSushi/xgb", - "Rev": "27f122750802" - }, - { - "ImportPath": "github.com/NYTimes/gziphandler", - "Rev": "56545f4a5d46" - }, - { - "ImportPath": "github.com/PuerkitoBio/purell", - "Rev": "v1.1.1" - }, - { - "ImportPath": "github.com/PuerkitoBio/urlesc", - "Rev": "de5bf2ad4578" - }, - { - "ImportPath": "github.com/asaskevich/govalidator", - "Rev": "f61b66f89f4a" - }, - { - "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" - }, - { - "ImportPath": "github.com/creack/pty", - "Rev": "v1.1.9" - }, - { - "ImportPath": "github.com/davecgh/go-spew", - "Rev": "v1.1.1" - }, - { - "ImportPath": "github.com/docopt/docopt-go", - "Rev": "ee0de3bc6815" - }, - { - "ImportPath": "github.com/elazarl/goproxy", - "Rev": "947c36da3153" - }, - { - "ImportPath": "github.com/emicklei/go-restful", - "Rev": "ff4f55a20633" - }, - { - "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.9.0" - }, - { - "ImportPath": "github.com/form3tech-oss/jwt-go", - "Rev": "v3.2.2" - }, - { - "ImportPath": "github.com/fsnotify/fsnotify", - "Rev": "v1.4.7" - }, - { - "ImportPath": "github.com/go-gl/glfw", - "Rev": "e6da0acd62b1" - }, - { - "ImportPath": "github.com/go-gl/glfw/v3.3/glfw", - "Rev": "6f7a984d4dc4" - }, - { - "ImportPath": "github.com/go-logr/logr", - "Rev": "v0.4.0" - }, - { - "ImportPath": "github.com/go-openapi/jsonpointer", - "Rev": "v0.19.3" - }, - { - "ImportPath": "github.com/go-openapi/jsonreference", - "Rev": "v0.19.3" - }, - { - "ImportPath": "github.com/go-openapi/spec", - "Rev": "v0.19.3" - }, - { - "ImportPath": "github.com/go-openapi/swag", - "Rev": "v0.19.5" - }, - { - "ImportPath": "github.com/gogo/protobuf", - "Rev": "v1.3.2" - }, - { - "ImportPath": "github.com/golang/glog", - "Rev": "23def4e6c14b" - }, - { - "ImportPath": "github.com/golang/groupcache", - "Rev": "8c9f03a8e57e" - }, - { - "ImportPath": "github.com/golang/mock", - "Rev": "v1.4.1" - }, - { - "ImportPath": "github.com/golang/protobuf", - "Rev": "v1.4.3" - }, - { - "ImportPath": "github.com/google/btree", - "Rev": "v1.0.0" - }, - { - "ImportPath": "github.com/google/go-cmp", - "Rev": "v0.5.4" - }, - { - "ImportPath": "github.com/google/gofuzz", - "Rev": "v1.1.0" - }, - { - "ImportPath": "github.com/google/martian", - "Rev": "v2.1.0" - }, - { - "ImportPath": "github.com/google/pprof", - "Rev": "1ebb73c60ed3" - }, - { - "ImportPath": "github.com/google/renameio", - "Rev": "v0.1.0" - }, - { - "ImportPath": "github.com/google/uuid", - "Rev": "v1.1.2" - }, - { - "ImportPath": "github.com/googleapis/gax-go/v2", - "Rev": "v2.0.5" - }, - { - "ImportPath": "github.com/googleapis/gnostic", - "Rev": "v0.4.1" - }, - { - "ImportPath": "github.com/gorilla/websocket", - "Rev": "v1.4.2" - }, - { - "ImportPath": "github.com/gregjones/httpcache", - "Rev": "9cad4c3443a7" - }, - { - "ImportPath": "github.com/hashicorp/golang-lru", - "Rev": "v0.5.1" - }, - { - "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" - }, - { - "ImportPath": "github.com/json-iterator/go", - "Rev": "v1.1.10" - }, - { - "ImportPath": "github.com/jstemmer/go-junit-report", - "Rev": "v0.9.1" - }, - { - "ImportPath": "github.com/kisielk/errcheck", - "Rev": "v1.5.0" - }, - { - "ImportPath": "github.com/kisielk/gotool", - "Rev": "v1.0.0" - }, - { - "ImportPath": "github.com/kr/pretty", - "Rev": "v0.2.0" - }, - { - "ImportPath": "github.com/kr/pty", - "Rev": "v1.1.5" - }, - { - "ImportPath": "github.com/kr/text", - "Rev": "v0.2.0" - }, - { - "ImportPath": "github.com/mailru/easyjson", - "Rev": "b2ccc519800e" - }, - { - "ImportPath": "github.com/mitchellh/mapstructure", - "Rev": "v1.1.2" - }, - { - "ImportPath": "github.com/moby/spdystream", - "Rev": "v0.2.0" - }, - { - "ImportPath": "github.com/modern-go/concurrent", - "Rev": "bacd9c7ef1dd" - }, - { - "ImportPath": "github.com/modern-go/reflect2", - "Rev": "v1.0.1" - }, - { - "ImportPath": "github.com/munnerz/goautoneg", - "Rev": "a547fc61f48d" - }, - { - "ImportPath": "github.com/mxk/go-flowrate", - "Rev": "cca7078d478f" - }, - { - "ImportPath": "github.com/niemeyer/pretty", - "Rev": "a10e7caefd8e" - }, - { - "ImportPath": "github.com/onsi/ginkgo", - "Rev": "v1.11.0" - }, - { - "ImportPath": "github.com/onsi/gomega", - "Rev": "v1.7.0" - }, - { - "ImportPath": "github.com/peterbourgon/diskv", - "Rev": "v2.0.1" - }, - { - "ImportPath": "github.com/pkg/errors", - "Rev": "v0.9.1" - }, - { - "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" - }, - { - "ImportPath": "github.com/spf13/pflag", - "Rev": "v1.0.5" - }, - { - "ImportPath": "github.com/stretchr/objx", - "Rev": "v0.2.0" - }, - { - "ImportPath": "github.com/stretchr/testify", - "Rev": "v1.6.1" - }, - { - "ImportPath": "github.com/yuin/goldmark", - "Rev": "v1.2.1" - }, - { - "ImportPath": "go.opencensus.io", - "Rev": "v0.22.3" - }, - { - "ImportPath": "golang.org/x/crypto", - "Rev": "5ea612d1eb83" - }, - { - "ImportPath": "golang.org/x/exp", - "Rev": "6cc2880d07d6" - }, - { - "ImportPath": "golang.org/x/image", - "Rev": "cff245a6509b" - }, - { - "ImportPath": "golang.org/x/lint", - "Rev": "738671d3881b" - }, - { - "ImportPath": "golang.org/x/mobile", - "Rev": "d2bd2a29d028" - }, - { - "ImportPath": "golang.org/x/mod", - "Rev": "v0.3.0" - }, - { - "ImportPath": "golang.org/x/net", - "Rev": "3d97a244fca7" - }, - { - "ImportPath": "golang.org/x/oauth2", - "Rev": "bf48bf16ab8d" - }, - { - "ImportPath": "golang.org/x/sync", - "Rev": "67f06af15bc9" - }, - { - "ImportPath": "golang.org/x/sys", - "Rev": "d19ff857e887" - }, - { - "ImportPath": "golang.org/x/term", - "Rev": "6a3ed077a48d" - }, - { - "ImportPath": "golang.org/x/text", - "Rev": "v0.3.4" - }, - { - "ImportPath": "golang.org/x/time", - "Rev": "f8bda1e9f3ba" - }, - { - "ImportPath": "golang.org/x/tools", - "Rev": "113979e3529a" - }, - { - "ImportPath": "golang.org/x/xerrors", - "Rev": "5ec99f83aff1" - }, - { - "ImportPath": "google.golang.org/api", - "Rev": "v0.20.0" - }, - { - "ImportPath": "google.golang.org/appengine", - "Rev": "v1.6.5" - }, - { - "ImportPath": "google.golang.org/genproto", - "Rev": "cb27e3aa2013" - }, - { - "ImportPath": "google.golang.org/grpc", - "Rev": "v1.27.1" - }, - { - "ImportPath": "google.golang.org/protobuf", - "Rev": "v1.25.0" - }, - { - "ImportPath": "gopkg.in/check.v1", - "Rev": "8fa46927fb4f" - }, - { - "ImportPath": "gopkg.in/errgo.v2", - "Rev": "v2.1.0" - }, - { - "ImportPath": "gopkg.in/fsnotify.v1", - "Rev": "v1.4.7" - }, - { - "ImportPath": "gopkg.in/inf.v0", - "Rev": "v0.9.1" - }, - { - "ImportPath": "gopkg.in/tomb.v1", - "Rev": "dd632973f1e7" - }, - { - "ImportPath": "gopkg.in/yaml.v2", - "Rev": "v2.4.0" - }, - { - "ImportPath": "gopkg.in/yaml.v3", - "Rev": "9f266ea9e77c" - }, - { - "ImportPath": "honnef.co/go/tools", - "Rev": "v0.0.1-2020.1.3" - }, - { - "ImportPath": "k8s.io/api", - "Rev": "b96220531b73" - }, - { - "ImportPath": "k8s.io/apimachinery", - "Rev": "235edae7dd90" - }, - { - "ImportPath": "k8s.io/gengo", - "Rev": "3a45101e95ac" - }, - { - "ImportPath": "k8s.io/klog/v2", - "Rev": "v2.8.0" - }, - { - "ImportPath": "k8s.io/kube-openapi", - "Rev": "591a79e4bda7" - }, - { - "ImportPath": "k8s.io/utils", - "Rev": "67b214c5f920" - }, - { - "ImportPath": "rsc.io/binaryregexp", - "Rev": "v0.2.0" - }, - { - "ImportPath": "rsc.io/quote/v3", - "Rev": "v3.1.0" - }, - { - "ImportPath": "rsc.io/sampler", - "Rev": "v1.3.0" - }, - { - "ImportPath": "sigs.k8s.io/structured-merge-diff/v4", - "Rev": "v4.1.0" - }, - { - "ImportPath": "sigs.k8s.io/yaml", - "Rev": "v1.2.0" - } - ] -} \ No newline at end of file diff --git a/Godeps/OWNERS b/Godeps/OWNERS deleted file mode 100644 index 0f5d2f673..000000000 --- a/Godeps/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: -- dep-approvers diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53d5..000000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. From fe825e696460a349c0506d22946a45c777ecce6b Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 10 Jun 2021 20:36:02 +0200 Subject: [PATCH 6/8] client-go: reduce log level of reflector again https://github.com/kubernetes/kubernetes/pull/87795 most likely unintentionally increased the log level of "Starting reflector" and "Stopping reflector", with the result that since Kubernetes 1.21 clients have printed that message by default. This is undesirable, we should use the original level 3 again. Kubernetes-commit: ef0beb2cf7091f3c1c837af63120cb8ce9f084bc --- tools/cache/reflector.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cache/reflector.go b/tools/cache/reflector.go index 360d7304b..c8f35eb8b 100644 --- a/tools/cache/reflector.go +++ b/tools/cache/reflector.go @@ -216,13 +216,13 @@ var internalPackages = []string{"client-go/tools/cache/"} // objects and subsequent deltas. // Run will exit when stopCh is closed. func (r *Reflector) Run(stopCh <-chan struct{}) { - klog.V(2).Infof("Starting reflector %s (%s) from %s", r.expectedTypeName, r.resyncPeriod, r.name) + klog.V(3).Infof("Starting reflector %s (%s) from %s", r.expectedTypeName, r.resyncPeriod, r.name) wait.BackoffUntil(func() { if err := r.ListAndWatch(stopCh); err != nil { r.watchErrorHandler(r, err) } }, r.backoffManager, true, stopCh) - klog.V(2).Infof("Stopping reflector %s (%s) from %s", r.expectedTypeName, r.resyncPeriod, r.name) + klog.V(3).Infof("Stopping reflector %s (%s) from %s", r.expectedTypeName, r.resyncPeriod, r.name) } var ( From 3c428dfbaa76c65cbc54040479bd720419e030ca Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 11 Jun 2021 12:03:02 -0700 Subject: [PATCH 7/8] Merge pull request #102800 from pohly/automated-cherry-pick-of-#102788-upstream-release-1.21 Automated cherry pick of #102788: client-go: reduce log level of reflector again Kubernetes-commit: 05c4b151cf6d1d5dc05a45897f5975489ccafc70 From 6711973af1c55d544f08252297ebf6dab2031975 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 17 Jun 2021 22:18:31 +0000 Subject: [PATCH 8/8] Update dependencies to v0.21.2 tag --- go.mod | 8 ++++---- go.sum | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index ece4defc2..95d2f2d65 100644 --- a/go.mod +++ b/go.mod @@ -27,8 +27,8 @@ require ( golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba - k8s.io/api v0.0.0-20210521231242-b96220531b73 - k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90 + k8s.io/api v0.21.2 + k8s.io/apimachinery v0.21.2 k8s.io/klog/v2 v2.8.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/structured-merge-diff/v4 v4.1.0 @@ -36,6 +36,6 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210521231242-b96220531b73 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90 + k8s.io/api => k8s.io/api v0.21.2 + k8s.io/apimachinery => k8s.io/apimachinery v0.21.2 ) diff --git a/go.sum b/go.sum index 8379eafb8..4e2ada860 100644 --- a/go.sum +++ b/go.sum @@ -431,10 +431,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh 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= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20210521231242-b96220531b73 h1:PuJc9v6ozb0tuojUdhpMpMiLFLy/M8Mc/kwJMkd47no= -k8s.io/api v0.0.0-20210521231242-b96220531b73/go.mod h1:90UO6Ryvwa9Yd0kKCHR1FoS1rzvfolT51aZuTitZqfM= -k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90 h1:3VEyPqxm8EiEYB39RqGjuz6gHkxGECKCiGF+SyLI6QE= -k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM= +k8s.io/api v0.21.2 h1:vz7DqmRsXTCSa6pNxXwQ1IYeAZgdIsua+DZU+o+SX3Y= +k8s.io/api v0.21.2/go.mod h1:Lv6UGJZ1rlMI1qusN8ruAp9PUBFyBwpEHAdG24vIsiU= +k8s.io/apimachinery v0.21.2 h1:vezUc/BHqWlQDnZ+XkrpXSmnANSLbpnlpwo0Lhk0gpc= +k8s.io/apimachinery v0.21.2/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=