kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Kubernetes Publisher 2020-11-02 11:56:51 -08:00
parent 551b5c8262
commit 40cfadc27d
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

@ -568,7 +568,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "08b38378de70"
"Rev": "ab3426394381"
},
{
"ImportPath": "golang.org/x/oauth2",
@ -580,7 +580,7 @@
},
{
"ImportPath": "golang.org/x/sys",
"Rev": "fdedc70b468f"
"Rev": "ed371f2e16b4"
},
{
"ImportPath": "golang.org/x/text",
@ -676,19 +676,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "14f7c8415b56"
"Rev": "7a95b569f5ff"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "3a3fc754224f"
"Rev": "8046191f3410"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "852de461ed6c"
"Rev": "4ef01cd5e2b2"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "f3fe6e0ff804"
"Rev": "3b346c3e8128"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -41,10 +41,10 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20201102202211-7a95b569f5ff
k8s.io/apimachinery v0.0.0-20201102202032-8046191f3410
k8s.io/client-go v0.0.0-20201102202440-4ef01cd5e2b2
k8s.io/component-base v0.0.0-20201102202913-3b346c3e8128
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
@ -54,9 +54,8 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/api => k8s.io/api v0.0.0-20201102202211-7a95b569f5ff
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201102202032-8046191f3410
k8s.io/client-go => k8s.io/client-go v0.0.0-20201102202440-4ef01cd5e2b2
k8s.io/component-base => k8s.io/component-base v0.0.0-20201102202913-3b346c3e8128
)

4
go.sum
View File

@ -516,6 +516,10 @@ 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/client-go v0.0.0-20201102202440-4ef01cd5e2b2/go.mod h1:q8iYaakKTdWiTaU4ZsW7uUdg++3YOt99MPnpQ4BlG+w=
k8s.io/component-base v0.0.0-20201102202913-3b346c3e8128/go.mod h1:/nWuTBUUN0ayOy6M2gPPEbJLcu3pBzdQG+RvOeE0nr8=
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=