From e6e7a42480f235949a11e0f14a3b8a60ba43bcb0 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Sat, 18 Dec 2021 15:41:57 -0500 Subject: [PATCH] [go1.18] Bump golang.org/x/... dependencies hack/pin-dependency.sh golang.org/x/crypto master hack/pin-dependency.sh golang.org/x/net master hack/pin-dependency.sh golang.org/x/oauth2 master hack/pin-dependency.sh golang.org/x/sync master hack/pin-dependency.sh golang.org/x/sys master hack/pin-dependency.sh golang.org/x/term master hack/pin-dependency.sh golang.org/x/time master hack/pin-dependency.sh golang.org/x/tools master Signed-off-by: Stephen Augustus --- go.mod | 28 +++++++++---------- go.sum | 10 +++++++ staging/src/k8s.io/apimachinery/go.mod | 8 ++++-- staging/src/k8s.io/apiserver/go.mod | 14 ++++++++-- staging/src/k8s.io/client-go/go.mod | 20 +++++++++---- staging/src/k8s.io/cluster-bootstrap/go.mod | 4 ++- staging/src/k8s.io/code-generator/go.mod | 12 ++++++-- staging/src/k8s.io/component-base/go.mod | 8 ++++-- staging/src/k8s.io/controller-manager/go.mod | 4 ++- staging/src/k8s.io/cri-api/go.mod | 8 ++++-- staging/src/k8s.io/kube-aggregator/go.mod | 4 ++- staging/src/k8s.io/kubectl/go.mod | 4 ++- staging/src/k8s.io/kubelet/go.mod | 4 ++- .../src/k8s.io/legacy-cloud-providers/go.mod | 8 ++++-- 14 files changed, 98 insertions(+), 38 deletions(-) diff --git a/go.mod b/go.mod index 6c4e1f0b00e..cc85f08af42 100644 --- a/go.mod +++ b/go.mod @@ -85,15 +85,15 @@ require ( go.opentelemetry.io/otel/trace v0.20.0 go.opentelemetry.io/proto/otlp v0.7.0 go.uber.org/zap v1.19.0 - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f // indirect - golang.org/x/net v0.0.0-20211209124913-491a49abca63 - golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 - golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b - golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac - golang.org/x/tools v0.1.8 + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 + golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 + golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 gonum.org/v1/gonum v0.6.2 gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // indirect google.golang.org/api v0.46.0 @@ -450,20 +450,20 @@ replace ( go.uber.org/goleak => go.uber.org/goleak v1.1.10 go.uber.org/multierr => go.uber.org/multierr v1.6.0 go.uber.org/zap => go.uber.org/zap v1.19.0 - golang.org/x/crypto => golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 + golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220214200702-86341886e292 golang.org/x/exp => golang.org/x/exp v0.0.0-20210220032938-85be41e4509f golang.org/x/image => golang.org/x/image v0.0.0-20190802002840-cff245a6509b golang.org/x/lint => golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/mobile => golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f golang.org/x/mod => golang.org/x/mod v0.5.1 - golang.org/x/net => golang.org/x/net v0.0.0-20211209124913-491a49abca63 - golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f + golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 golang.org/x/sync => golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys => golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 - golang.org/x/term => golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b + golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 + golang.org/x/term => golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text => golang.org/x/text v0.3.7 - golang.org/x/time => golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac - golang.org/x/tools => golang.org/x/tools v0.1.8 + golang.org/x/time => golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 + golang.org/x/tools => golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 golang.org/x/xerrors => golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 gonum.org/v1/gonum => gonum.org/v1/gonum v0.6.2 gonum.org/v1/netlib => gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e diff --git a/go.sum b/go.sum index 43e924f80b9..d8c6bf1ed0f 100644 --- a/go.sum +++ b/go.sum @@ -531,18 +531,28 @@ golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f h1:Qmd2pbz05z7z6lm0DrgQVVPuBm92jqujBKMHMOlOQEw= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= +golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w= golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= diff --git a/staging/src/k8s.io/apimachinery/go.mod b/staging/src/k8s.io/apimachinery/go.mod index 912713bde57..464c800426a 100644 --- a/staging/src/k8s.io/apimachinery/go.mod +++ b/staging/src/k8s.io/apimachinery/go.mod @@ -24,8 +24,8 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 - golang.org/x/net v0.0.0-20211209124913-491a49abca63 - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect golang.org/x/text v0.3.7 // indirect gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect gopkg.in/inf.v0 v0.9.1 @@ -39,3 +39,7 @@ require ( ) replace k8s.io/apimachinery => ../apimachinery + +replace golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + +replace golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index 7c0493bf455..fd021a4ca48 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -36,10 +36,10 @@ require ( go.opentelemetry.io/otel/sdk v0.20.0 go.opentelemetry.io/otel/trace v0.20.0 go.uber.org/zap v1.19.0 - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 - golang.org/x/net v0.0.0-20211209124913-491a49abca63 + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 google.golang.org/grpc v1.40.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 @@ -63,3 +63,11 @@ replace ( k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base ) + +replace golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220214200702-86341886e292 + +replace golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + +replace golang.org/x/sync => golang.org/x/sync v0.0.0-20210220032951-036812b2e83c + +replace golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod index 53d6168d4d2..4358761d703 100644 --- a/staging/src/k8s.io/client-go/go.mod +++ b/staging/src/k8s.io/client-go/go.mod @@ -24,11 +24,11 @@ require ( github.com/peterbourgon/diskv v2.0.1+incompatible github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect - golang.org/x/net v0.0.0-20211209124913-491a49abca63 - golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f - golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b - golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 + golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/protobuf v1.27.1 k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 @@ -44,3 +44,13 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go ) + +replace golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220214200702-86341886e292 + +replace golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + +replace golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 + +replace golang.org/x/term => golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 + +replace golang.org/x/time => golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 diff --git a/staging/src/k8s.io/cluster-bootstrap/go.mod b/staging/src/k8s.io/cluster-bootstrap/go.mod index 339f1c7f84c..64d73534bf3 100644 --- a/staging/src/k8s.io/cluster-bootstrap/go.mod +++ b/staging/src/k8s.io/cluster-bootstrap/go.mod @@ -6,7 +6,7 @@ go 1.16 require ( github.com/stretchr/testify v1.7.0 - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect gopkg.in/square/go-jose.v2 v2.2.2 k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 @@ -18,3 +18,5 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/cluster-bootstrap => ../cluster-bootstrap ) + +replace golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220214200702-86341886e292 diff --git a/staging/src/k8s.io/code-generator/go.mod b/staging/src/k8s.io/code-generator/go.mod index 24019c5cc29..00668c6cba0 100644 --- a/staging/src/k8s.io/code-generator/go.mod +++ b/staging/src/k8s.io/code-generator/go.mod @@ -14,9 +14,9 @@ require ( github.com/onsi/ginkgo v1.14.0 // indirect github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 // indirect - golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect - golang.org/x/tools v0.1.8 + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect + golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 gopkg.in/yaml.v2 v2.4.0 k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 k8s.io/klog/v2 v2.40.1 @@ -25,3 +25,9 @@ require ( ) replace k8s.io/code-generator => ../code-generator + +replace golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + +replace golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 + +replace golang.org/x/tools => golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod index ab50350ad30..8dae8fd8feb 100644 --- a/staging/src/k8s.io/component-base/go.mod +++ b/staging/src/k8s.io/component-base/go.mod @@ -24,8 +24,8 @@ require ( go.opentelemetry.io/otel/sdk v0.20.0 go.opentelemetry.io/otel/trace v0.20.0 go.uber.org/zap v1.19.0 - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 - golang.org/x/tools v0.1.8 // indirect + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 + golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect gotest.tools/v3 v3.0.3 // indirect k8s.io/apimachinery v0.0.0 @@ -40,3 +40,7 @@ replace ( k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base ) + +replace golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 + +replace golang.org/x/tools => golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 diff --git a/staging/src/k8s.io/controller-manager/go.mod b/staging/src/k8s.io/controller-manager/go.mod index a2c3a4484f3..a685b3148d7 100644 --- a/staging/src/k8s.io/controller-manager/go.mod +++ b/staging/src/k8s.io/controller-manager/go.mod @@ -7,7 +7,7 @@ go 1.16 require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 - golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f + golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 k8s.io/apiserver v0.0.0 @@ -25,3 +25,5 @@ replace ( k8s.io/component-base => ../component-base k8s.io/controller-manager => ../controller-manager ) + +replace golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 diff --git a/staging/src/k8s.io/cri-api/go.mod b/staging/src/k8s.io/cri-api/go.mod index 9bbfc6d98b4..570f5dc5aed 100644 --- a/staging/src/k8s.io/cri-api/go.mod +++ b/staging/src/k8s.io/cri-api/go.mod @@ -10,8 +10,8 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/stretchr/testify v1.7.0 - golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect golang.org/x/text v0.3.7 // indirect google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect google.golang.org/grpc v1.40.0 @@ -20,3 +20,7 @@ require ( ) replace k8s.io/cri-api => ../cri-api + +replace golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + +replace golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod index f67694a8778..7dfb56023fe 100644 --- a/staging/src/k8s.io/kube-aggregator/go.mod +++ b/staging/src/k8s.io/kube-aggregator/go.mod @@ -11,7 +11,7 @@ require ( github.com/spf13/cobra v1.2.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 - golang.org/x/net v0.0.0-20211209124913-491a49abca63 + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 k8s.io/apiserver v0.0.0 @@ -33,3 +33,5 @@ replace ( k8s.io/component-base => ../component-base k8s.io/kube-aggregator => ../kube-aggregator ) + +replace golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index 416ba40738c..e5f6f0a8528 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -29,7 +29,7 @@ require ( github.com/spf13/cobra v1.2.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 @@ -58,3 +58,5 @@ replace ( k8s.io/kubectl => ../kubectl k8s.io/metrics => ../metrics ) + +replace golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/kubelet/go.mod b/staging/src/k8s.io/kubelet/go.mod index 43ed8015fbd..8bfafb7f78c 100644 --- a/staging/src/k8s.io/kubelet/go.mod +++ b/staging/src/k8s.io/kubelet/go.mod @@ -6,7 +6,7 @@ go 1.16 require ( github.com/gogo/protobuf v1.3.2 - golang.org/x/net v0.0.0-20211209124913-491a49abca63 + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd google.golang.org/grpc v1.40.0 k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 @@ -20,3 +20,5 @@ replace ( k8s.io/component-base => ../component-base k8s.io/kubelet => ../kubelet ) + +replace golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.mod b/staging/src/k8s.io/legacy-cloud-providers/go.mod index a066d577ac0..3226271c098 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/go.mod +++ b/staging/src/k8s.io/legacy-cloud-providers/go.mod @@ -25,8 +25,8 @@ require ( github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.7.0 github.com/vmware/govmomi v0.20.3 - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 - golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 + golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 google.golang.org/api v0.46.0 gopkg.in/gcfg.v1 v1.2.0 gopkg.in/warnings.v0 v0.1.1 // indirect @@ -56,3 +56,7 @@ replace ( k8s.io/legacy-cloud-providers => ../legacy-cloud-providers k8s.io/mount-utils => ../mount-utils ) + +replace golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220214200702-86341886e292 + +replace golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8