github/sample-controller
github/sample-controller
3
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2024-10-05 15:25:39 +08:00
Code Issues Packages 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 65790b010c
commit b6204ba891
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Godeps/Godeps.json generated
View File

@ -352,15 +352,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "b13e135d81e8"
"Rev": "53468e23a787"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "937f6a48eb33"
"Rev": "44f1264f7b6b"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "08715c7129b4"
"Rev": "fa3acefe68f3"
},
{
"ImportPath": "k8s.io/code-generator",
@ -384,7 +384,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
"Rev": "v3.0.0"
"Rev": "v3.0.1"
},
{
"ImportPath": "sigs.k8s.io/yaml",

17
go.mod
View File

@ -5,10 +5,10 @@ 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-20210518101910-53468e23a787
k8s.io/apimachinery v0.0.0-20210518100737-44f1264f7b6b
k8s.io/client-go v0.0.0-20210518104342-fa3acefe68f3
k8s.io/code-generator v0.0.0-20210329191452-2558db0b36b5
k8s.io/klog v1.0.0
)
@ -16,9 +16,8 @@ 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/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20210518101910-53468e23a787
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100737-44f1264f7b6b
k8s.io/client-go => k8s.io/client-go v0.0.0-20210518104342-fa3acefe68f3
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210329191452-2558db0b36b5
)

4
go.sum
View File

@ -199,6 +199,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-20210518101910-53468e23a787/go.mod h1:LlUnNse6BQx63yz6yMZOGvzQcVws1/bcjOsbAi7uZPc=
k8s.io/apimachinery v0.0.0-20210518100737-44f1264f7b6b/go.mod h1:70HIRzSveORLKbatTlXzI2B2UUhbWzbq8Vqyf+HbdUQ=
k8s.io/client-go v0.0.0-20210518104342-fa3acefe68f3/go.mod h1:iz844/ci7WdL3N4fc5gnhI6K7kff7GRRSIJQ6koCHHw=
k8s.io/code-generator v0.0.0-20210329191452-2558db0b36b5/go.mod h1:l5yJd8cLSvkIb0ZJMsQdWuDOx5rWfLNpgmHQyl3LmBE=
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=