From 17afa07e76bf24ac6909639c0dbb30d5917c18fe Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 5 Feb 2021 16:33:11 -0800 Subject: [PATCH] Merge pull request #98790 from jkh52/master Bump konnectivity-client to v0.0.15 Kubernetes-commit: 96a98e50afa7641d6f0e4fb324041126ff5a4ec2 --- Godeps/Godeps.json | 16 ++++++++-------- go.mod | 21 ++++++++++----------- go.sum | 7 +++++++ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 400f558..e0b9168 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -912,31 +912,31 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "9f65ac4826aa" + "Rev": "48bd8381a38a" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "9e39a13d2cab" + "Rev": "c93b0f84892e" }, { "ImportPath": "k8s.io/apiserver", - "Rev": "aca5ec67039c" + "Rev": "abc2bd5cb28d" }, { "ImportPath": "k8s.io/client-go", - "Rev": "93ce9718ffcd" + "Rev": "100613764a76" }, { "ImportPath": "k8s.io/cloud-provider", - "Rev": "3747c6100d16" + "Rev": "aab14f8718d3" }, { "ImportPath": "k8s.io/component-base", - "Rev": "81d9ea233619" + "Rev": "fc5f0989f107" }, { "ImportPath": "k8s.io/controller-manager", - "Rev": "29c9515e3c7e" + "Rev": "5fbf917d3bb5" }, { "ImportPath": "k8s.io/gengo", @@ -968,7 +968,7 @@ }, { "ImportPath": "sigs.k8s.io/apiserver-network-proxy/konnectivity-client", - "Rev": "v0.0.14" + "Rev": "v0.0.15" }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/v4", diff --git a/go.mod b/go.mod index 307aeea..63ae7a5 100644 --- a/go.mod +++ b/go.mod @@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager go 1.15 require ( - k8s.io/apimachinery v0.0.0 - k8s.io/cloud-provider v0.0.0 - k8s.io/controller-manager v0.0.0 + k8s.io/apimachinery v0.0.0-20210206010734-c93b0f84892e + k8s.io/cloud-provider v0.0.0-20210206013338-aab14f8718d3 + k8s.io/controller-manager v0.0.0-20210206013244-5fbf917d3bb5 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/apiserver => ../apiserver - k8s.io/client-go => ../client-go - k8s.io/cloud-provider => ../cloud-provider - k8s.io/component-base => ../component-base - k8s.io/controller-manager => ../controller-manager - k8s.io/kube-controller-manager => ../kube-controller-manager + k8s.io/api => k8s.io/api v0.0.0-20210206010904-48bd8381a38a + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210206010734-c93b0f84892e + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210206011850-abc2bd5cb28d + k8s.io/client-go => k8s.io/client-go v0.0.0-20210206011112-100613764a76 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210206013338-aab14f8718d3 + k8s.io/component-base => k8s.io/component-base v0.0.0-20210206011540-fc5f0989f107 + k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210206013244-5fbf917d3bb5 ) diff --git a/go.sum b/go.sum index 983ff8f..64d2e18 100644 --- a/go.sum +++ b/go.sum @@ -585,6 +585,13 @@ 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-20210206010904-48bd8381a38a/go.mod h1:yJXUR00OAZb/k9uZJywbkX/aSggd80m8p8XMVzc+4u8= +k8s.io/apimachinery v0.0.0-20210206010734-c93b0f84892e/go.mod h1:usCLrfBNFPxV+npBFCgIy08RBKPAhZQyIzwcvPV2eh8= +k8s.io/apiserver v0.0.0-20210206011850-abc2bd5cb28d/go.mod h1:sciGLy3V2EVNyHGD1VCFYhnFJtwsiplAmDbQS2FhvRs= +k8s.io/client-go v0.0.0-20210206011112-100613764a76/go.mod h1:JP/D55gccwJmpx9Ipo+OBw26gGWX3rzwISGjNZfGViM= +k8s.io/cloud-provider v0.0.0-20210206013338-aab14f8718d3/go.mod h1:BOH6vfMLtJzU+ufmXyH0YhJ31DEb3rfkn5OvOCp+uAI= +k8s.io/component-base v0.0.0-20210206011540-fc5f0989f107/go.mod h1:2obbX6UCGVs4cZSLH0tOnotvu8nSzowHxNyvM3qCGW8= +k8s.io/controller-manager v0.0.0-20210206013244-5fbf917d3bb5/go.mod h1:vfodosvAxLkMY72r9QGFOqzY4AGRqRzy7kzNqi1bjpo= 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.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI=