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

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

Browse Source 
Kubernetes-commit: 034eb142bf826a667ab01d95b5c09268273b58dd
This commit is contained in:
Kubernetes Publisher 2019-11-16 16:13:30 +00:00
parent beefa56cb8
commit e0cf0d287d
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -376,11 +376,11 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "f4e7d7f24368" "Rev": "89d410bde4ec"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "a4c677cde034" "Rev": "e7b5e74ed4e6"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
@ -400,7 +400,7 @@
}, },
{ {
"ImportPath": "k8s.io/utils", "ImportPath": "k8s.io/utils",
"Rev": "2b95a09bc58d" "Rev": "e782cd3c129f"
}, },
{ {
"ImportPath": "modernc.org/cc", "ImportPath": "modernc.org/cc",

17
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.12 go 1.12
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20191115142644-28bee1a9beb0
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20191116161330-e7b5e74ed4e6
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20191115142644-65da3bb30b8d
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 => ../api k8s.io/api => k8s.io/api v0.0.0-20191115142644-28bee1a9beb0
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20191116161330-e7b5e74ed4e6
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191115142644-65da3bb30b8d
k8s.io/sample-controller => ../sample-controller
) )

4
go.sum
View File

@ -214,6 +214,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/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-20191115142644-28bee1a9beb0/go.mod h1:ZVjGUHSaVjiY2VSFKQpOMtCCSufZWU73UPNKtAURCBQ=
k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
k8s.io/client-go v0.0.0-20191116161330-e7b5e74ed4e6/go.mod h1:2oR1fke65nwa1i7ehLwbPB4jhz4+eC+mKRyq9b83E4U=
k8s.io/code-generator v0.0.0-20191115142644-65da3bb30b8d/go.mod h1:Vh0irzg7dL9pFS4c8hFsali5txtbmse3MFS4zEH7Thg=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
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-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM= k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=