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 ca1337e8e2
commit af1485fcb9
3 changed files with 18 additions and 15 deletions

12
Godeps/Godeps.json generated
View File

@ -372,7 +372,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "08b38378de70"
"Rev": "ab3426394381"
},
{
"ImportPath": "golang.org/x/oauth2",
@ -384,7 +384,7 @@
},
{
"ImportPath": "golang.org/x/sys",
"Rev": "fdedc70b468f"
"Rev": "ed371f2e16b4"
},
{
"ImportPath": "golang.org/x/text",
@ -452,19 +452,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/code-generator",
"Rev": "df96d3ebb5f3"
"Rev": "e7a6809e9fe3"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator 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/code-generator v0.0.0-20201102201853-e7a6809e9fe3
k8s.io/klog/v2 v2.2.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
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/code-generator => k8s.io/code-generator v0.0.0-20201102201853-e7a6809e9fe3
)

4
go.sum
View File

@ -352,6 +352,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/code-generator v0.0.0-20201102201853-e7a6809e9fe3/go.mod h1:oioc17TXBB973K4R+ytm5k9jY1BktboxJc7qu3i29V0=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=