github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-12-25 06:02:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101179 from apelisse/cherrypick-smd-version

Browse Source 
Pin sigs.k8s.io/structured-merged-diff/v3 at v3.0.1

Kubernetes-commit: a5d842bef97260d07eb54cc6e0ad57b64f6cd51b
This commit is contained in:
Kubernetes Publisher
2021-04-20 15:26:34 -07:00
parent 00131ab7d1
commit fa3acefe68
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@@ -352,11 +352,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "b13e135d81e8"
"Rev": "53468e23a787"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "937f6a48eb33"
"Rev": "44f1264f7b6b"
},
{
"ImportPath": "k8s.io/gengo",
@@ -376,7 +376,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
"Rev": "v3.0.0"
"Rev": "v3.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-20210518101910-53468e23a787
k8s.io/apimachinery v0.0.0-20210518100737-44f1264f7b6b
k8s.io/klog v1.0.0
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
sigs.k8s.io/yaml v1.2.0
@@ -39,7 +39,6 @@ replace (
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/text => golang.org/x/text v0.3.2
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-20210518101910-53468e23a787
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100737-44f1264f7b6b
)

2
go.sum
View File

@@ -186,6 +186,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-20210518101910-53468e23a787/go.mod h1:LlUnNse6BQx63yz6yMZOGvzQcVws1/bcjOsbAi7uZPc=
k8s.io/apimachinery v0.0.0-20210518100737-44f1264f7b6b/go.mod h1:70HIRzSveORLKbatTlXzI2B2UUhbWzbq8Vqyf+HbdUQ=
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=