From 5b840f83fe281c02027c28c3b11c858881f285e8 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 9 Sep 2019 16:35:10 +0000 Subject: [PATCH] Override reference that causes an error from Go proxy The k8s.io/client-go v12 go.mod file has an error. See https://github.com/golang/go/issues/33558 Signed-off-by: Bryan Boreham --- go.mod | 3 +++ go.sum | 4 ++-- vendor/modules.txt | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0be8f98786..92c50bcc62 100644 --- a/go.mod +++ b/go.mod @@ -81,3 +81,6 @@ require ( // Override since git.apache.org is down. The docs say to fetch from github. replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 + +// Override reference that causes an error from Go proxy - see https://github.com/golang/go/issues/33558 +replace k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085101-78d2af792bab diff --git a/go.sum b/go.sum index 68270993f6..309e011edb 100644 --- a/go.sum +++ b/go.sum @@ -806,8 +806,8 @@ k8s.io/api v0.0.0-20190813020757-36bff7324fb7/go.mod h1:3Iy+myeAORNCLgjd/Xu9ebwN k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA= k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010 h1:pyoq062NftC1y/OcnbSvgolyZDJ8y4fmUPWMkdA6gfU= k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010/go.mod h1:Waf/xTS2FGRrgXCkO5FP3XxTOWh0qLf2QhL1qFZZ/R8= -k8s.io/client-go v12.0.0+incompatible h1:YlJxncpeVUC98/WMZKC3JZGk/OXQWCZjAB4Xr3B17RY= -k8s.io/client-go v12.0.0+incompatible/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k= +k8s.io/client-go v0.0.0-20190620085101-78d2af792bab h1:E8Fecph0qbNsAbijJJQryKu4Oi9QTp5cVpjTE+nqg6g= +k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE= diff --git a/vendor/modules.txt b/vendor/modules.txt index 6c787bd44d..c0fcec6a1d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -836,7 +836,7 @@ k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/util/framer k8s.io/apimachinery/pkg/util/yaml k8s.io/apimachinery/pkg/apis/meta/v1/unstructured -# k8s.io/client-go v12.0.0+incompatible +# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.0.0-20190620085101-78d2af792bab k8s.io/client-go/kubernetes k8s.io/client-go/rest k8s.io/client-go/tools/cache