From ebadc53f50219112c3d80039de7b13779f9d4f63 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Tue, 13 Aug 2019 17:45:53 -0700 Subject: [PATCH] Pin golang.org/x/net to cdfb69a --- go.mod | 4 ++-- go.sum | 1 + staging/src/k8s.io/apimachinery/go.mod | 4 ++-- staging/src/k8s.io/apiserver/go.mod | 4 ++-- staging/src/k8s.io/client-go/go.mod | 4 ++-- staging/src/k8s.io/cri-api/go.mod | 4 ++-- staging/src/k8s.io/kube-aggregator/go.mod | 4 ++-- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 7bf515efe39..0542d433bd4 100644 --- a/go.mod +++ b/go.mod @@ -128,7 +128,7 @@ require ( github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 - golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 + golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f golang.org/x/time v0.0.0-20161028155119-f51c12702a4d @@ -402,7 +402,7 @@ replace ( golang.org/x/image => golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 golang.org/x/mobile => golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6 - golang.org/x/net => golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 + golang.org/x/net => golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 diff --git a/go.sum b/go.sum index 629397dd67d..5d8dba7bbde 100644 --- a/go.sum +++ b/go.sum @@ -425,6 +425,7 @@ golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 h1:bfLnR+k0tq5Lqt6dflRLcZiz6UaXCMt3vhYJ1l4FQ80= golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= diff --git a/staging/src/k8s.io/apimachinery/go.mod b/staging/src/k8s.io/apimachinery/go.mod index a8db54beeec..f20305de3f2 100644 --- a/staging/src/k8s.io/apimachinery/go.mod +++ b/staging/src/k8s.io/apimachinery/go.mod @@ -25,7 +25,7 @@ require ( github.com/onsi/gomega v1.5.0 // indirect github.com/spf13/pflag v1.0.3 github.com/stretchr/testify v1.3.0 - golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 + golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f // indirect golang.org/x/text v0.3.2 // indirect @@ -38,7 +38,7 @@ require ( ) replace ( - golang.org/x/net => golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 + golang.org/x/net => golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index 4ece3bd6dea..d962f705b4d 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -45,7 +45,7 @@ require ( go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df // indirect go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15 // indirect golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 - golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 + golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 // indirect google.golang.org/grpc v1.13.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 @@ -65,7 +65,7 @@ require ( replace ( golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 - golang.org/x/net => golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 + golang.org/x/net => golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod index aef4d48a078..8d6216ad04d 100644 --- a/staging/src/k8s.io/client-go/go.mod +++ b/staging/src/k8s.io/client-go/go.mod @@ -22,7 +22,7 @@ require ( github.com/spf13/pflag v1.0.3 github.com/stretchr/testify v1.3.0 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 - golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 + golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a golang.org/x/time v0.0.0-20161028155119-f51c12702a4d google.golang.org/appengine v1.5.0 // indirect @@ -35,7 +35,7 @@ require ( replace ( golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 - golang.org/x/net => golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 + golang.org/x/net => golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db diff --git a/staging/src/k8s.io/cri-api/go.mod b/staging/src/k8s.io/cri-api/go.mod index 525c99cdb13..d3f41f3ecd6 100644 --- a/staging/src/k8s.io/cri-api/go.mod +++ b/staging/src/k8s.io/cri-api/go.mod @@ -10,7 +10,7 @@ require ( github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/protobuf v1.2.0 // indirect github.com/stretchr/testify v1.3.0 - golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 // indirect + golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc // indirect golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect golang.org/x/text v0.3.2 // indirect google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 // indirect @@ -18,7 +18,7 @@ require ( ) replace ( - golang.org/x/net => golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 + golang.org/x/net => golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod index 09220fda27e..0a56c5fcf11 100644 --- a/staging/src/k8s.io/kube-aggregator/go.mod +++ b/staging/src/k8s.io/kube-aggregator/go.mod @@ -13,7 +13,7 @@ require ( github.com/spf13/cobra v0.0.4 github.com/spf13/pflag v1.0.3 github.com/stretchr/testify v1.3.0 - golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 + golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 k8s.io/apiserver v0.0.0 @@ -27,7 +27,7 @@ require ( replace ( golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 - golang.org/x/net => golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 + golang.org/x/net => golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db