Merge pull request #89165 from apelisse/tag-smd-properly

Tag smd properly for kubernetes 1.17

Kubernetes-commit: 125977452af7918d3aef090555252f66d9fe386a
This commit is contained in:
Kubernetes Publisher
2020-04-03 19:31:46 -07:00
parent 7e5a0c583e
commit 9ffc329553
3 changed files with 11 additions and 10 deletions

10
Godeps/Godeps.json generated
View File

@@ -348,11 +348,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "d9adff57e763"
"Rev": "2a93acf49b83"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "731dcecc2054"
"Rev": "491fc9063aba"
},
{
"ImportPath": "k8s.io/gengo",
@@ -364,15 +364,15 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "30be4d16710a"
"Rev": "82d701f24f9d"
},
{
"ImportPath": "k8s.io/utils",
"Rev": "e782cd3c129f"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff",
"Rev": "15d366b2352e"
"ImportPath": "sigs.k8s.io/structured-merge-diff/v2",
"Rev": "v2.0.1"
},
{
"ImportPath": "sigs.k8s.io/yaml",

9
go.mod
View File

@@ -28,8 +28,8 @@ require (
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
google.golang.org/appengine v1.5.0 // indirect
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20200404061942-2a93acf49b83
k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba
k8s.io/klog v1.0.0
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
sigs.k8s.io/yaml v1.1.0
@@ -38,7 +38,6 @@ require (
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/api => k8s.io/api v0.0.0-20200404061942-2a93acf49b83
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba
)

2
go.sum
View File

@@ -188,6 +188,8 @@ 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-20200404061942-2a93acf49b83/go.mod h1:9kJrdiqYr6QQVO1OhJlqhEFfJnC0bdfwa8VwazjeL+U=
k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba/go.mod h1:ioIo1G/a+uONV7Tv+ZmCbMG1/a3kVw5YcDdncd8ugQ0=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=