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

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 99fea3314a
commit 3b0c6c6091
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

@ -536,7 +536,7 @@
},
{
"ImportPath": "golang.org/x/crypto",
"Rev": "bac4c82f6975"
"Rev": "75b288015ac9"
},
{
"ImportPath": "golang.org/x/exp",
@ -560,7 +560,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "d3edc9973b7e"
"Rev": "ab3426394381"
},
{
"ImportPath": "golang.org/x/oauth2",
@ -668,19 +668,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "e4973e079a11"
"Rev": "9540e4cac147"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "b84716e65c7b"
"Rev": "945d4ebf362b"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "6b13c5bd95e0"
"Rev": "36233866f1c7"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "bbbd60b9d4a3"
"Rev": "a5fb6b31bf34"
},
{
"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-20200726131424-9540e4cac147
k8s.io/apimachinery v0.0.0-20200726131235-945d4ebf362b
k8s.io/client-go v0.0.0-20200726131703-36233866f1c7
k8s.io/component-base v0.0.0-20200726132252-a5fb6b31bf34
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc
@ -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-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/component-base => k8s.io/component-base v0.0.0-20200726132252-a5fb6b31bf34
)

4
go.sum
View File

@ -507,6 +507,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/component-base v0.0.0-20200726132252-a5fb6b31bf34/go.mod h1:DZZpXJSoibR+hmT1iu2+prtkk6cOXg+DLXL7Tz8Dehs=
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=