Merge pull request #70929 from mikedanese/cmp

migrate everything to unify diff.Diff method using cmp

Kubernetes-commit: 1ae09a371faccfc193f9b8d82a9ef77bf3e7fb14
This commit is contained in:
Kubernetes Publisher 2019-05-14 18:24:30 -07:00
parent 73417f1c72
commit 567c0e89da
3 changed files with 21 additions and 12 deletions

10
Godeps/Godeps.json generated
View File

@ -58,6 +58,10 @@
"ImportPath": "github.com/google/btree",
"Rev": "7d79101e329e"
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.3.0"
},
{
"ImportPath": "github.com/google/gofuzz",
"Rev": "24818f796faf"
@ -212,15 +216,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "e63b5755afac"
"Rev": "db5a9d1c40eb"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "ad85901afca0"
"Rev": "b74e4c97951f"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "c6f3777976ad"
"Rev": "78e94f51a042"
},
{
"ImportPath": "k8s.io/code-generator",

19
go.mod
View File

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.12
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-20190515023547-db5a9d1c40eb
k8s.io/apimachinery v0.0.0-20190515023456-b74e4c97951f
k8s.io/client-go v0.0.0-20190515023709-78e94f51a042
k8s.io/code-generator v0.0.0-20190511023357-639c964206c2
k8s.io/klog v0.3.0
)
@ -16,9 +16,10 @@ replace (
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
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-20190515023547-db5a9d1c40eb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190515023456-b74e4c97951f
k8s.io/client-go => k8s.io/client-go v0.0.0-20190515023709-78e94f51a042
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190511023357-639c964206c2
)
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190515024022-2354f2393ad4

4
go.sum
View File

@ -94,6 +94,10 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.0.0-20190515023547-db5a9d1c40eb/go.mod h1:fbdFiGtx7GQ3+vkBAYto3QsSImiYIJdpH3YfaclST/U=
k8s.io/apimachinery v0.0.0-20190515023456-b74e4c97951f/go.mod h1:Ew3b/24/JSgJdn4RsnrLskv3LvMZDlZ1Fl1xopsJftY=
k8s.io/client-go v0.0.0-20190515023709-78e94f51a042/go.mod h1:Ucfy225uJpWBtWGDwTtqUZmmgR/AzYM0vge2iB/bTQ4=
k8s.io/code-generator v0.0.0-20190511023357-639c964206c2/go.mod h1:YMQ7Lt97nW/I6nHACDccgS/sPAyrHQNans96RwPaSb8=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=