From 47d374794be7bc881e8d3a34569cdfe12c8b5646 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 8 Jan 2020 21:06:09 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20go-check=20version=20breaks=20with=20rec?= =?UTF-8?q?ent=20go=20versions=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See golang/go#33546 for more info. --- go.mod | 1 + go.sum | 38 +++++--------------------------------- 2 files changed, 6 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index a36e7f9..fdf23a1 100644 --- a/go.mod +++ b/go.mod @@ -15,6 +15,7 @@ require ( ) replace ( + github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127 gomodules.xyz/cert => gomodules.xyz/cert v1.0.1 gomodules.xyz/jsonpatch/v2 => gomodules.xyz/jsonpatch/v2 v2.0.1 k8s.io/api => k8s.io/api v0.0.0-20190805182251-6c9aa3caf3d6 // kubernetes-1.14.5 diff --git a/go.sum b/go.sum index 8ec7f71..5f47256 100644 --- a/go.sum +++ b/go.sum @@ -166,7 +166,7 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/getsentry/raven-go v0.1.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-check/check v1.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= +github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= github.com/go-ini/ini v1.21.1/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -196,8 +196,6 @@ github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nA github.com/go-openapi/spec v0.17.2/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.19.0 h1:A4SZ6IWh3lnjH0rG0Z5lkxazMGBECtrZcbyYQi+64k4= github.com/go-openapi/spec v0.19.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE= -github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= github.com/go-openapi/spec v0.19.3 h1:0XRyw8kguri6Yw4SxhsQA/atC88yqrk0+G4YhI2wabc= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= @@ -346,8 +344,6 @@ github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef/go.mod github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jsonnet-bundler/jsonnet-bundler v0.1.0/go.mod h1:YKsSFc9VFhhLITkJS3X2PrRqWG9u2Jq99udTdDjQLfM= @@ -433,8 +429,6 @@ github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISe github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007 h1:Ohgj9L0EYOgXxkDp+bczlMBiulwmqYzQpvQNUdtt3oc= -github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007/go.mod h1:wKCOWMb6iNlvKiOToY2cNuaovSXvIiv1zDi9QDR7aGQ= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/oklog/oklog v0.0.0-20170918173356-f857583a70c3/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= @@ -652,7 +646,6 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -816,28 +809,12 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -halkyon.io/api v1.0.0-beta.7/go.mod h1:cO9/hBS8zlmn/tcLFyZdbs03TwZHrRyDQSgvYQf9+fM= -halkyon.io/api v1.0.0-beta.8 h1:YiD2rPWWCSwi/exus5i2LC2N2LswF2kjgpYWtfXeL30= -halkyon.io/api v1.0.0-beta.8/go.mod h1:bCOZh54+rJ4SQad0L0OMO0B+Jf7J3OtKp7SPmdLowGE= -halkyon.io/api v1.0.0-beta.8.0.20191219201020-14dfa325eab8 h1:nTLIzu3qIBgvVssg5LH4L+hETOhyQ0zz6JdBRNs2Khg= -halkyon.io/api v1.0.0-beta.8.0.20191219201020-14dfa325eab8/go.mod h1:bCOZh54+rJ4SQad0L0OMO0B+Jf7J3OtKp7SPmdLowGE= -halkyon.io/api v1.0.0-beta.8.0.20200107175629-6ff499303202 h1:jZyhKfLfCUb9mSxSIOrN5VN6ooL03szagt3zWduY5R0= -halkyon.io/api v1.0.0-beta.8.0.20200107175629-6ff499303202/go.mod h1:bCOZh54+rJ4SQad0L0OMO0B+Jf7J3OtKp7SPmdLowGE= halkyon.io/api v1.0.0-rc.1 h1:H+ZOc1tWD0CAVa338J8gZ7W8Mutf7N/qKhSYFnuOWsg= halkyon.io/api v1.0.0-rc.1/go.mod h1:bCOZh54+rJ4SQad0L0OMO0B+Jf7J3OtKp7SPmdLowGE= -halkyon.io/operator-framework v0.0.0-20191108175501-3d0a053bc383/go.mod h1:teivWH+XwhRXzmbzqx7LWAfBH9f23FYo9RMHRDbJN3A= -halkyon.io/operator-framework v0.0.0-20191218162228-8520e4863185 h1:QJEFHg8V/VLn44xX2JrLtJ0SfKOkjGbyjrgvWkAeX/Q= -halkyon.io/operator-framework v0.0.0-20191218162228-8520e4863185/go.mod h1:ttZP+C3QKAFQWu2+9G8CMxznFWJ14LAgDWmpkgHW1ec= -halkyon.io/operator-framework v0.0.0-20191220094645-78d6d8666a50 h1:4gCsA9yb3Z1RHyLAz4ZaBwQFIYczbdmS4tucAKuShZg= -halkyon.io/operator-framework v0.0.0-20191220094645-78d6d8666a50/go.mod h1:igemGhmhyDR1wXrKdJZRCg9tZGPUthqlTfuvcP0r808= -halkyon.io/operator-framework v0.0.0-20200102215814-202e364c4941 h1:46zBfzWUJ6U2m1AYuByIEfi8OxMvP1KsMsnbOM8jZOY= -halkyon.io/operator-framework v0.0.0-20200102215814-202e364c4941/go.mod h1:igemGhmhyDR1wXrKdJZRCg9tZGPUthqlTfuvcP0r808= -halkyon.io/plugins v0.0.0-20191212092514-440c450bfce0 h1:3A2FnNEvixA03keubk7Dqw+23HkQNLdO1RdXVC1Bj+M= -halkyon.io/plugins v0.0.0-20191212092514-440c450bfce0/go.mod h1:yrSYlr2qLaB0O7clTnOSCatGPl0PNRcMcrcG8i7HRiQ= -halkyon.io/plugins v0.0.0-20191218170816-52ab385e28af h1:+ZKSM+WK5mtICcynmHeBrIhgscuvG3UvygteKZo7el4= -halkyon.io/plugins v0.0.0-20191218170816-52ab385e28af/go.mod h1:0xJGVlcgNsAD+kNQBojKhj3pjK0ZtfHmS5SMunTZX+E= -halkyon.io/plugins v0.0.0-20200102220524-4c27a092f146 h1:KhSQh5rkUAiiDSfzOre5zuwyEqYFhEuQOutT2ch/y+0= -halkyon.io/plugins v0.0.0-20200102220524-4c27a092f146/go.mod h1:wtTbdCRTF5CJqY7WbxOwzW+VUW8nM5Zhsg2/IIpaoeg= +halkyon.io/operator-framework v1.0.0-beta.1 h1:tJhbC4RHv7cOQk86IJ1Q+aR+iaBxiXR1c5v20Is6Eww= +halkyon.io/operator-framework v1.0.0-beta.1/go.mod h1:vB4euwqnSltCyaAXhiqLCcwyFJ40479HZsohtDW4bLc= +halkyon.io/plugins v1.0.0-beta.1 h1:MUmYb1MUsGRKMav7HizVaGjOw6Kjlra7+gjL3FZt+7A= +halkyon.io/plugins v1.0.0-beta.1/go.mod h1:0mgbA5GIn7/XqNE7bXNzEUDe8LBfKLSxbBwsNdFs4QI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -854,8 +831,6 @@ k8s.io/client-go v11.0.1-0.20190805182715-88a2adca7e76+incompatible/go.mod h1:7v k8s.io/cloud-provider v0.0.0-20190314002645-c892ea32361a/go.mod h1:LlIffnLBu+GG7d4ppPzC8UnA1Ex8S+ntmSRVsnr7Xy4= k8s.io/code-generator v0.0.0-20181117043124-c2090bec4d9b/go.mod h1:MYiN+ZJZ9HkETbgVZdWw2AsuAi9PZ4V80cwfuf2axe8= k8s.io/code-generator v0.0.0-20190311093542-50b561225d70/go.mod h1:MYiN+ZJZ9HkETbgVZdWw2AsuAi9PZ4V80cwfuf2axe8= -k8s.io/code-generator v0.0.0-20191107025440-35a828233ddd h1:t3VKQDFV5yiqx37X7TqjzlSN2YWipwhBOKmnFu/Wc9A= -k8s.io/code-generator v0.0.0-20191107025440-35a828233ddd/go.mod h1:GWj84JAH5M9huodTus4PpRnC33JiW9lEAWF6FZvF2eU= k8s.io/code-generator v0.17.0 h1:y+KWtDWNqlJzJu/kUy8goJZO0X71PGIpAHLX8a0JYk0= k8s.io/code-generator v0.17.0/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= k8s.io/component-base v0.0.0-20190314000054-4a91899592f4/go.mod h1:DMaomcf3j3MM2j1FsvlLVVlc7wA2jPytEur3cP9zRxQ= @@ -881,9 +856,6 @@ k8s.io/kube-openapi v0.0.0-20180629012420-d83b052f768a/go.mod h1:BXM9ceUBTj2QnfH k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503 h1:IrnrEIp9du1SngrzGC1fdYEdos7Il6I6EVxwFQHJwCg= k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503/go.mod h1:iU+ZGYsNlvU9XKUSso6SQfKTCCw7lFduMZy26Mgr2Fw= -k8s.io/kube-openapi v0.0.0-20190722073852-5e22f3d471e6/go.mod h1:RZvgC8MSN6DjiMV6oIfEE9pDL9CYXokkfaCKZeHm3nc= -k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ= -k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kubernetes v1.14.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=