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

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

Browse Source 
Kubernetes-commit: ee5e5d216da4d3ec8106e3cfc1507599b8787b7b
This commit is contained in:
Kubernetes Publisher 2020-03-04 18:02:38 +00:00
parent 43ac6031e7
commit 331469446e
3 changed files with 16 additions and 13 deletions

8
Godeps/Godeps.json generated

@ -348,15 +348,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "026463abc787"
"Rev": "b7e08103f9c2"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "2373d029717c"
"Rev": "7c34f3d03f36"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "39a9bc1d5a52"
"Rev": "c2cd954c1a7f"
},
{
"ImportPath": "k8s.io/code-generator",
@ -376,7 +376,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "5f6fbceb4c31"
"Rev": "0a110f9eb7ab"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",

17
go.mod

@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.13
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-20200304180238-b7e08103f9c2
k8s.io/apimachinery v0.0.0-20200304180238-7c34f3d03f36
k8s.io/client-go v0.0.0-20200304180238-c2cd954c1a7f
k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11
k8s.io/klog v1.0.0
)
replace (
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
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-20200304180238-b7e08103f9c2
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200304180238-7c34f3d03f36
k8s.io/client-go => k8s.io/client-go v0.0.0-20200304180238-c2cd954c1a7f
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11
)

4
go.sum

@ -195,6 +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=
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=
k8s.io/api v0.0.0-20200304180238-b7e08103f9c2/go.mod h1:ogvTJELZYy2wzfYfqlHhPZt86liKP1b5yChkG0bxw7M=
k8s.io/apimachinery v0.0.0-20200304180238-7c34f3d03f36/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4=
k8s.io/client-go v0.0.0-20200304180238-c2cd954c1a7f/go.mod h1:P1yjn1MmuD89IPuodf0iB/AKKlGdTIn/ZzUggEgz2bI=
k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
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/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=