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 pull request #89449 from saad-ali/automated-cherry-pick-of-#89444-upstream-release-1.18

Browse Source 
Automated cherry pick of #89444 upstream release 1.18

Kubernetes-commit: 8be33caaf953ac6fdb5e57435363282e3098616c
This commit is contained in:
Kubernetes Publisher 2020-03-24 20:21:03 -07:00
parent efc034341b
commit 167e94f6f4
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -356,7 +356,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "3e3c7a420997"
"Rev": "dc8515ba9674"
},
{
"ImportPath": "k8s.io/code-generator",
@ -376,7 +376,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "327a8059b905"
"Rev": "a9aa75ae1b89"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",

17
go.mod
View File

@ -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-20200316191010-3b4a996260a0
k8s.io/apimachinery v0.0.0-20200321205243-105e0c6d63f1
k8s.io/client-go v0.0.0-20200325044045-dc8515ba9674
k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b
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-20200316191010-3b4a996260a0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200321205243-105e0c6d63f1
k8s.io/client-go => k8s.io/client-go v0.0.0-20200325044045-dc8515ba9674
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b
)

4
go.sum
View File

@ -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-20200316191010-3b4a996260a0/go.mod h1:dQFmApLGF1AzHBoCa9z1a7ftM/1nZEAoknHzuttq6eY=
k8s.io/apimachinery v0.0.0-20200321205243-105e0c6d63f1/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
k8s.io/client-go v0.0.0-20200325044045-dc8515ba9674/go.mod h1:C8sF+wEREX2SwiD/CoyirN/hn5XwmJqlyPtArHDhtbs=
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-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=