From e5a2b5c66c219dd20f7b0443ac88add0135c74ab Mon Sep 17 00:00:00 2001 From: walter Date: Mon, 24 May 2021 14:53:30 -0700 Subject: [PATCH] Upgrade konnectivity-client for GRPC connection fixes The v0.0.19 Konnectivity client includes several significant fixes to prevent the GRPC tunnel between the KAS and the APIServer Network Proxy from becoming blocked/wedged. Importantly it picks up the fix for kubernetes-sigs/apiserver-network-proxy#167. We believe this will also fix many of the failures currently seen on https://testgrid.k8s.io/sig-api-machinery-network-proxy#ci-kubernetes-e2e-gci-gce-network-proxy-grpc&width=5. Kubernetes-commit: 8717fcf8bec1108e4e4c0fb378320e92f6ef5765 --- go.mod | 21 +++++++++++---------- go.sum | 14 +------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index ad8bc0a..2405d3d 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,18 @@ module k8s.io/kube-controller-manager go 1.16 require ( - k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 - k8s.io/cloud-provider v0.0.0-20210521235955-c493e4d68cfb - k8s.io/controller-manager v0.0.0-20210521235757-4aefa2f902bd + k8s.io/apimachinery v0.0.0 + k8s.io/cloud-provider v0.0.0 + k8s.io/controller-manager v0.0.0 ) 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/apiserver => k8s.io/apiserver v0.0.0-20210521233223-378b4eb6c840 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d - k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210521235955-c493e4d68cfb - k8s.io/component-base => k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b - k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210521235757-4aefa2f902bd + 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 ) diff --git a/go.sum b/go.sum index fc8e82c..adbbe34 100644 --- a/go.sum +++ b/go.sum @@ -595,18 +595,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-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/apiserver v0.0.0-20210521233223-378b4eb6c840/go.mod h1:thMMP6Gd4e8tjR6w8+4nbLRt3ZcG1pAQ89v2K7szGI4= -k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d/go.mod h1:5CwzOhEL+/47w5srOLQwDN6ILFRpFF/4htuyNWtSMcw= -k8s.io/cloud-provider v0.0.0-20210521235955-c493e4d68cfb h1:n55UTuNWHW+DTj7JiqlmteUHjcfT0MwFpxqeCMgT3Ow= -k8s.io/cloud-provider v0.0.0-20210521235955-c493e4d68cfb/go.mod h1:qGIU0/0BTFitwHtq3FeFsxAqfrS3vEKzMun3cC3Zhx4= -k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b h1:yRafkncohj21ItWfMMLKX3YIrLxrSZaFgUhSi9eBPm0= -k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b/go.mod h1:tWPM5VVcHmAtb1itx5cU8GYYdfrEgEW4CTP2uYY1xhM= -k8s.io/controller-manager v0.0.0-20210521235757-4aefa2f902bd h1:A8SrVuNyT2Efo9xzTVINYgemf1k5Zy/Gw8ZtOWSXHIg= -k8s.io/controller-manager v0.0.0-20210521235757-4aefa2f902bd/go.mod h1:MLMZMr/aJSt6tW53QBa8skFlpE+wsaJ8pEDvzRQYop4= 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= @@ -617,7 +605,7 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.19/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8= sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=