Merge pull request #99171 from jkh52/release-1.20

Bump konnectivity-client to v0.0.15 in release-1.20

Kubernetes-commit: 19c6bfe464c2aaf1aeeff968f93f2a858b4ea05e
This commit is contained in:
Kubernetes Publisher 2021-03-02 05:47:20 -08:00
parent c5ee7513f2
commit 1370929e3c
3 changed files with 16 additions and 13 deletions

8
Godeps/Godeps.json generated
View File

@ -468,19 +468,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "4a626d306b98" "Rev": "3e193e6ee6c8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "859536f6dc9b" "Rev": "dd12c7a65e7f"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "77eda6a9395b" "Rev": "f511eef1254d"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "0843e0f44fb3" "Rev": "3f1cbd4ff5a7"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15 go 1.15
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20210303092452-3e193e6ee6c8
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20210303092143-dd12c7a65e7f
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20210303093615-f511eef1254d
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20210303091831-3f1cbd4ff5a7
k8s.io/klog/v2 v2.4.0 k8s.io/klog/v2 v2.4.0
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20210303092452-3e193e6ee6c8
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210303092143-dd12c7a65e7f
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20210303093615-f511eef1254d
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210303091831-3f1cbd4ff5a7
k8s.io/sample-controller => ../sample-controller
) )

4
go.sum
View File

@ -421,6 +421,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/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= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210303092452-3e193e6ee6c8/go.mod h1:eEDViTagXbwAnsfsR7xYzzamqv2yfCO3TLexDXBqVdI=
k8s.io/apimachinery v0.0.0-20210303092143-dd12c7a65e7f/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/client-go v0.0.0-20210303093615-f511eef1254d/go.mod h1:jlCsiqsuASnmUd0BZQGCUgjd6hqpQvoeVRj4yNlZlH8=
k8s.io/code-generator v0.0.0-20210303091831-3f1cbd4ff5a7/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE= k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=