kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #80859 from wojtek-t/fix_selflinks_in_tests 

Fix selflinks in tests

Kubernetes-commit: 3287bf7a3a7108aa9eb3231351257b86c1adfd37
This commit is contained in:
Kubernetes Publisher 2019-08-01 15:01:30 -07:00
parent 223981f9ec 228563cf6c
commit bec651d385
4 changed files with 11 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

@ -412,7 +412,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "739c7f7721ed"
"Rev": "cebe308443c3"
},
{
"ImportPath": "k8s.io/apimachinery",
@ -424,7 +424,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "de47f833b8db"
"Rev": "fdb3fbe99e1d"
},
{
"ImportPath": "k8s.io/code-generator",

8
go.mod
View File

@ -25,10 +25,10 @@ require (
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
gopkg.in/yaml.v2 v2.2.2
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20190731142925-739c7f7721ed
k8s.io/api v0.0.0-20190802020851-cebe308443c3
k8s.io/apimachinery v0.0.0-20190731142807-035e418f1ad9
k8s.io/cli-runtime v0.0.0-20190731144734-e0b53a64da0b
k8s.io/client-go v0.0.0-20190731143132-de47f833b8db
k8s.io/client-go v0.0.0-20190802021151-fdb3fbe99e1d
k8s.io/klog v0.3.1
k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058
k8s.io/metrics v0.0.0-20190731144634-25630f8a23dd
@ -43,10 +43,10 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => k8s.io/api v0.0.0-20190731142925-739c7f7721ed
k8s.io/api => k8s.io/api v0.0.0-20190802020851-cebe308443c3
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190731142807-035e418f1ad9
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190731144734-e0b53a64da0b
k8s.io/client-go => k8s.io/client-go v0.0.0-20190731143132-de47f833b8db
k8s.io/client-go => k8s.io/client-go v0.0.0-20190802021151-fdb3fbe99e1d
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190731142644-68819053f471
k8s.io/metrics => k8s.io/metrics v0.0.0-20190731144634-25630f8a23dd
)

4
go.sum
View File

@ -197,10 +197,10 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
k8s.io/api v0.0.0-20190731142925-739c7f7721ed/go.mod h1:1KBIEXI7qpsZM6s0w+RthBLGH1IYg7JQlerAl+wN1lw=
k8s.io/api v0.0.0-20190802020851-cebe308443c3/go.mod h1:1KBIEXI7qpsZM6s0w+RthBLGH1IYg7JQlerAl+wN1lw=
k8s.io/apimachinery v0.0.0-20190731142807-035e418f1ad9/go.mod h1:+ntn62igV2hyNj7/0brOvXSMONE2KxcePkSxK7/9FFQ=
k8s.io/cli-runtime v0.0.0-20190731144734-e0b53a64da0b/go.mod h1:k2yClQtVRmB9lFUtZlbofKBkRjZObz3gjGmshc2NqB4=
k8s.io/client-go v0.0.0-20190731143132-de47f833b8db/go.mod h1:okI7n8hrqjq964OCm2/3osHOsMLC4GEA+cbc/Fgey34=
k8s.io/client-go v0.0.0-20190802021151-fdb3fbe99e1d/go.mod h1:okI7n8hrqjq964OCm2/3osHOsMLC4GEA+cbc/Fgey34=
k8s.io/code-generator v0.0.0-20190731142644-68819053f471/go.mod h1:+ehOMJCZcDSNlbNnRAoe9wNEPwf0h03MUOmDkq6J1FE=
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=

6
pkg/describe/versioned/describe_test.go
View File

@ -2439,7 +2439,7 @@ func TestDescribeEvents(t *testing.T) {
fake.NewSimpleClientset(&corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "bar",
SelfLink: "url/url/url/url",
SelfLink: "/api/v1/nodes/bar",
},
}, events),
},
@ -2447,7 +2447,7 @@ func TestDescribeEvents(t *testing.T) {
fake.NewSimpleClientset(&corev1.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{
Name: "bar",
SelfLink: "url/url/url/url",
SelfLink: "/api/v1/persistentvolumes/bar",
},
}, events),
},
@ -2456,7 +2456,7 @@ func TestDescribeEvents(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "bar",
Namespace: "foo",
SelfLink: "url/url/url/url",
SelfLink: "/api/v1/namespaces/foo/pods/bar",
},
}, events),
},