github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18373 from deads2k/gv-codecfor

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-15 19:28:48 -08:00
parent d62318e1e8 6e33403abf
commit fc7c70dba3
25 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/v1/backward_compatibility_test.go
View File

@@ -21,6 +21,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testing/compat"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/validation/field"
@@ -223,6 +224,6 @@ func TestCompatibility_v1_PodSecurityContext(t *testing.T) {
for _, tc := range cases {
t.Logf("Testing 1.0.0 backward compatibility for %v", tc.name)
compat.TestCompatibility(t, "v1", []byte(tc.input), validator, tc.expectedKeys, tc.absentKeys)
compat.TestCompatibility(t, v1.SchemeGroupVersion, []byte(tc.input), validator, tc.expectedKeys, tc.absentKeys)
}
}

2
pkg/api/v1/register.go
View File

@@ -30,7 +30,7 @@ const GroupName = ""
var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1"}
// Codec encodes internal objects to the v1 scheme
var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion.String())
var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion)
func init() {
// Check if v1 is in the list of supported API versions.