Merge pull request #93264 from justaugustus/go115

Update Golang to v1.15.0-rc.1

Kubernetes-commit: 9a20f30745477423e8776bb0d05316c00648f49b
This commit is contained in:
Kubernetes Publisher 2020-07-26 00:26:16 -07:00
parent 318ff3f24c
commit 3c855731f2
3 changed files with 24 additions and 17 deletions

20
Godeps/Godeps.json generated
View File

@ -330,13 +330,17 @@
"ImportPath": "github.com/stretchr/testify",
"Rev": "v1.4.0"
},
{
"ImportPath": "github.com/yuin/goldmark",
"Rev": "v1.1.27"
},
{
"ImportPath": "go.opencensus.io",
"Rev": "v0.22.2"
},
{
"ImportPath": "golang.org/x/crypto",
"Rev": "bac4c82f6975"
"Rev": "75b288015ac9"
},
{
"ImportPath": "golang.org/x/exp",
@ -356,11 +360,11 @@
},
{
"ImportPath": "golang.org/x/mod",
"Rev": "c90efee705ee"
"Rev": "v0.3.0"
},
{
"ImportPath": "golang.org/x/net",
"Rev": "d3edc9973b7e"
"Rev": "ab3426394381"
},
{
"ImportPath": "golang.org/x/oauth2",
@ -384,7 +388,7 @@
},
{
"ImportPath": "golang.org/x/tools",
"Rev": "c00d67ef29d0"
"Rev": "c1934b75d054"
},
{
"ImportPath": "golang.org/x/xerrors",
@ -440,19 +444,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "e4973e079a11"
"Rev": "9540e4cac147"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "b84716e65c7b"
"Rev": "945d4ebf362b"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "554373823da4"
"Rev": "36233866f1c7"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "f8b099915479"
"Rev": "26c52896b75b"
},
{
"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-20200726131424-9540e4cac147
k8s.io/apimachinery v0.0.0-20200726131235-945d4ebf362b
k8s.io/client-go v0.0.0-20200726131703-36233866f1c7
k8s.io/code-generator v0.0.0-20200726131043-26c52896b75b
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-20200726131424-9540e4cac147
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200726131235-945d4ebf362b
k8s.io/client-go => k8s.io/client-go v0.0.0-20200726131703-36233866f1c7
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200726131043-26c52896b75b
)

4
go.sum
View File

@ -353,6 +353,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-20200726131424-9540e4cac147/go.mod h1:dWsX+vGcHv9rDhMoQlwkI/sGwaGI1AZERZK/rETJ3Ao=
k8s.io/apimachinery v0.0.0-20200726131235-945d4ebf362b/go.mod h1:oE8UQU9DqIIc9PyIEYxTj/oJECzZLymCEU9dL0H4F+o=
k8s.io/client-go v0.0.0-20200726131703-36233866f1c7/go.mod h1:b6eb0Vtuu/ugcQeeutl/JYQ3PjjjmrdDi0fGx/S8INA=
k8s.io/code-generator v0.0.0-20200726131043-26c52896b75b/go.mod h1:l+Q5vASED8GWxNspCbHMV4q9mcQ6DhLzqwoZhvWz7wU=
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=