Merge pull request #96108 from liggitt/revert-sys
Revert "Updated golang/x/net. Also updated golang.org/x/sys" Kubernetes-commit: 770525fd3d47a1ef86aab886b62b73b3557457d5
This commit is contained in:
parent
beda755b18
commit
87f03c9bb4
|
|
@ -656,7 +656,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net",
|
||||
"Rev": "08b38378de70"
|
||||
"Rev": "ab3426394381"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/oauth2",
|
||||
|
|
@ -668,7 +668,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/sys",
|
||||
"Rev": "fdedc70b468f"
|
||||
"Rev": "ed371f2e16b4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/text",
|
||||
|
|
@ -764,31 +764,31 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "14f7c8415b56"
|
||||
"Rev": "7a95b569f5ff"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
"Rev": "3a3fc754224f"
|
||||
"Rev": "8046191f3410"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apiserver",
|
||||
"Rev": "76ca60f3fed4"
|
||||
"Rev": "40cfadc27dfd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go",
|
||||
"Rev": "852de461ed6c"
|
||||
"Rev": "4ef01cd5e2b2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/cloud-provider",
|
||||
"Rev": "631fad1ebd90"
|
||||
"Rev": "4849ec29541d"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/component-base",
|
||||
"Rev": "f3fe6e0ff804"
|
||||
"Rev": "3b346c3e8128"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/controller-manager",
|
||||
"Rev": "d1cb694c1486"
|
||||
"Rev": "dcbe4c1f77bb"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/gengo",
|
||||
|
|
|
|||
21
go.mod
21
go.mod
|
|
@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
|
|||
go 1.15
|
||||
|
||||
require (
|
||||
k8s.io/apimachinery v0.0.0
|
||||
k8s.io/cloud-provider v0.0.0
|
||||
k8s.io/controller-manager v0.0.0
|
||||
k8s.io/apimachinery v0.0.0-20201102202032-8046191f3410
|
||||
k8s.io/cloud-provider v0.0.0-20201102204744-4849ec29541d
|
||||
k8s.io/controller-manager v0.0.0-20201102204650-dcbe4c1f77bb
|
||||
)
|
||||
|
||||
replace (
|
||||
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
|
||||
k8s.io/api => k8s.io/api v0.0.0-20201102202211-7a95b569f5ff
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201102202032-8046191f3410
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20201102203206-40cfadc27dfd
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20201102202440-4ef01cd5e2b2
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201102204744-4849ec29541d
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20201102202913-3b346c3e8128
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20201102204650-dcbe4c1f77bb
|
||||
)
|
||||
|
|
|
|||
7
go.sum
7
go.sum
|
|
@ -528,6 +528,13 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
|
|||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
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=
|
||||
k8s.io/api v0.0.0-20201102202211-7a95b569f5ff/go.mod h1:DvHvdeQUPLTohsRVYB2Fd49FYz7l0WWEnJBD4BrP9Pc=
|
||||
k8s.io/apimachinery v0.0.0-20201102202032-8046191f3410/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI=
|
||||
k8s.io/apiserver v0.0.0-20201102203206-40cfadc27dfd/go.mod h1:lbcfAhbmnY6rz1g7dkxCnutqL1q0aNRazF6HWv7ErqU=
|
||||
k8s.io/client-go v0.0.0-20201102202440-4ef01cd5e2b2/go.mod h1:q8iYaakKTdWiTaU4ZsW7uUdg++3YOt99MPnpQ4BlG+w=
|
||||
k8s.io/cloud-provider v0.0.0-20201102204744-4849ec29541d/go.mod h1:pRmy3jvy8UcXQ4vm4Wia37LgxY2D+pFqIzSamv2xFr4=
|
||||
k8s.io/component-base v0.0.0-20201102202913-3b346c3e8128/go.mod h1:/nWuTBUUN0ayOy6M2gPPEbJLcu3pBzdQG+RvOeE0nr8=
|
||||
k8s.io/controller-manager v0.0.0-20201102204650-dcbe4c1f77bb/go.mod h1:/zSdIPSjG5kVgcQnZ07yt+r80TGbttG84oTiyCxdgxQ=
|
||||
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.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
|
||||
|
|
|
|||
Loading…
Reference in New Issue