github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Addressed changes

Browse Source
This commit is contained in:
Brendan Burns 2015-08-31 21:11:34 -07:00
parent 855c7cedcc
commit d993b8891d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/master/master_test.go
View File

@ -107,7 +107,7 @@ func initThirdParty(t *testing.T) (*tools.FakeEtcdClient, *httptest.Server) {
Versions: []expapi.APIVersion{ Versions: []expapi.APIVersion{
{ {
APIGroup: "group", APIGroup: "group",
Name: "v1", Name: "v3",
}, },
}, },
} }

8
pkg/registry/thirdpartyresourcedata/codec.go
View File

@ -99,6 +99,14 @@ func (t *thirdPartyResourceDataCodec) populate(objIn *expapi.ThirdPartyResourceD
return fmt.Errorf("unexpected object: %#v", obj) return fmt.Errorf("unexpected object: %#v", obj)
} }
if resourceVersion, ok := metadata["resourceVersion"]; ok {
resourceVersionStr, ok := resourceVersion.(string)
if !ok {
return fmt.Errorf("unexpected object: %v", metadata["resourceVersion"])
}
objIn.ResourceVersion = strconv.Atoi(resourceVersionStr)
}
objIn.Name = name objIn.Name = name
objIn.Data = data objIn.Data = data
return nil return nil