github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Applied comments from the review

Browse Source
This commit is contained in:
Piotr Szczesniak 2016-02-18 07:18:37 +01:00
parent 2b614179c7
commit c02e966d65
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/serialization_test.go
View File

@ -180,7 +180,7 @@ func doRoundTripTest(group testapi.TestGroup, kind string, t *testing.T) {
if api.Scheme.Recognizes(group.GroupVersion().WithKind(kind)) { if api.Scheme.Recognizes(group.GroupVersion().WithKind(kind)) {
roundTripSame(t, group, item, nonRoundTrippableTypesByVersion[kind]...) roundTripSame(t, group, item, nonRoundTrippableTypesByVersion[kind]...)
} }
if !nonInternalRoundTrippableTypes.Has(kind) { if !nonInternalRoundTrippableTypes.Has(kind) && api.Scheme.Recognizes(group.GroupVersion().WithKind(kind)) {
roundTrip(t, group.Codec(), fuzzInternalObject(t, group.InternalGroupVersion(), item, rand.Int63())) roundTrip(t, group.Codec(), fuzzInternalObject(t, group.InternalGroupVersion(), item, rand.Int63()))
} }
} }

2
pkg/api/testapi/testapi.go
View File

@ -75,7 +75,7 @@ func init() {
if _, ok := Groups[autoscaling.GroupName]; !ok { if _, ok := Groups[autoscaling.GroupName]; !ok {
Groups[autoscaling.GroupName] = TestGroup{ Groups[autoscaling.GroupName] = TestGroup{
externalGroupVersion: unversioned.GroupVersion{Group: autoscaling.GroupName, Version: registered.GroupOrDie(autoscaling.GroupName).GroupVersion.Version}, externalGroupVersion: unversioned.GroupVersion{Group: autoscaling.GroupName, Version: registered.GroupOrDie(autoscaling.GroupName).GroupVersion.Version},
internalGroupVersion: autoscaling.SchemeGroupVersion, internalGroupVersion: extensions.SchemeGroupVersion,
} }
} }
if _, ok := Groups[extensions.GroupName]; !ok { if _, ok := Groups[extensions.GroupName]; !ok {

1
pkg/runtime/serializer/versioning/versioning.go
View File

@ -168,7 +168,6 @@ func (c *codec) Decode(data []byte, defaultGVK *unversioned.GroupVersionKind, in
targetGV.Group = group targetGV.Group = group
targetGV.Version = runtime.APIVersionInternal targetGV.Version = runtime.APIVersionInternal
} else { } else {
fmt.Printf("looking for %v in %#v\n", group, c.decodeVersion)
gv, ok := c.decodeVersion[group] gv, ok := c.decodeVersion[group]
if !ok { if !ok {
// unknown objects are left in their original version // unknown objects are left in their original version