github/sample-controller
github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-04-22 20:20:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.18

Browse Source 
Kubernetes-commit: df00300353342181f7930d81c197f52b0d6164de
This commit is contained in:
Kubernetes Publisher 2020-03-06 17:09:23 +00:00
parent 1357d00961
commit 4272ebdfb8
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Godeps/Godeps.json generated
View File

@ -348,19 +348,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "b7e08103f9c2" "Rev": "e4148040f8d3"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "7c34f3d03f36" "Rev": "8323021940bb"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "c2cd954c1a7f" "Rev": "95caa2d638fa"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "f7c31974df11" "Rev": "c3277d42784b"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

16
go.mod
View File

@ -5,18 +5,18 @@ module k8s.io/sample-controller
go 1.13 go 1.13
require ( require (
k8s.io/api v0.0.0-20200304180238-b7e08103f9c2 k8s.io/api v0.0.0-20200306170923-e4148040f8d3
k8s.io/apimachinery v0.0.0-20200304180238-7c34f3d03f36 k8s.io/apimachinery v0.0.0-20200306170923-8323021940bb
k8s.io/client-go v0.0.0-20200304180238-c2cd954c1a7f k8s.io/client-go v0.0.0-20200306170923-95caa2d638fa
k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11 k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
) )
replace ( replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20200304180238-b7e08103f9c2 k8s.io/api => k8s.io/api v0.0.0-20200306170923-e4148040f8d3
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200304180238-7c34f3d03f36 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200306170923-8323021940bb
k8s.io/client-go => k8s.io/client-go v0.0.0-20200304180238-c2cd954c1a7f k8s.io/client-go => k8s.io/client-go v0.0.0-20200306170923-95caa2d638fa
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b
) )

8
go.sum
View File

@ -195,10 +195,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200304180238-b7e08103f9c2/go.mod h1:ogvTJELZYy2wzfYfqlHhPZt86liKP1b5yChkG0bxw7M= k8s.io/api v0.0.0-20200306170923-e4148040f8d3/go.mod h1:waB+1VhfJAYS8AHstyEPqGb0qJ1gJ28CwWQ/aZcx3oY=
k8s.io/apimachinery v0.0.0-20200304180238-7c34f3d03f36/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4= k8s.io/apimachinery v0.0.0-20200306170923-8323021940bb/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4=
k8s.io/client-go v0.0.0-20200304180238-c2cd954c1a7f/go.mod h1:P1yjn1MmuD89IPuodf0iB/AKKlGdTIn/ZzUggEgz2bI= k8s.io/client-go v0.0.0-20200306170923-95caa2d638fa/go.mod h1:+19yC0ykvQ+1t3SVgWjAvIUQIOUgpBZztuk0L+I9dTc=
k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=