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

pass runtime.Scheme as parameter to AddToScheme

Browse Source
This commit is contained in:
Chao Xu
2015-12-23 22:55:06 -08:00
parent 2b5b708b70
commit ad484c79f7
20 changed files with 82 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/install/install.go
View File

@@ -142,7 +142,7 @@ func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, e
func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) {
// add the internal version to Scheme
api.AddToScheme()
api.AddToScheme(api.Scheme)
// add the enabled external versions to Scheme
for _, v := range externalVersions {
if !registered.IsEnabledVersion(v) {
@@ -151,7 +151,7 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) {
}
switch v {
case v1.SchemeGroupVersion:
v1.AddToScheme()
v1.AddToScheme(api.Scheme)
}
}
}

18
pkg/api/register.go
View File

@@ -41,8 +41,8 @@ func Resource(resource string) unversioned.GroupResource {
return SchemeGroupVersion.WithResource(resource).GroupResource()
}
func AddToScheme() {
Scheme.AddKnownTypes(SchemeGroupVersion,
func AddToScheme(scheme *runtime.Scheme) {
scheme.AddKnownTypes(SchemeGroupVersion,
&Pod{},
&PodList{},
&PodStatusResult{},
@@ -86,14 +86,14 @@ func AddToScheme() {
&RangeAllocation{},
)
// Add the Unversioned types to Scheme.
// Add the Unversioned types to scheme.
// TODO this should not be done here
Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.ExportOptions{})
Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.Status{})
Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.APIVersions{})
Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.APIGroupList{})
Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.APIGroup{})
Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.APIResourceList{})
scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.ExportOptions{})
scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.Status{})
scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.APIVersions{})
scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.APIGroupList{})
scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.APIGroup{})
scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.APIResourceList{})
}
func (obj *Pod) GetObjectMeta() meta.Object { return &obj.ObjectMeta }

5
pkg/api/v1/conversion.go
View File

@@ -22,6 +22,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/runtime"
)
const (
@@ -32,9 +33,9 @@ const (
mirrorAnnotationValue_1_0 = "mirror"
)
func addConversionFuncs() {
func addConversionFuncs(scheme *runtime.Scheme) {
// Add non-generated conversion functions
err := api.Scheme.AddConversionFuncs(
err := scheme.AddConversionFuncs(
convert_api_Pod_To_v1_Pod,
convert_api_PodSpec_To_v1_PodSpec,
convert_api_ReplicationControllerSpec_To_v1_ReplicationControllerSpec,

6
pkg/api/v1/defaults.go
View File

@@ -17,14 +17,14 @@ limitations under the License.
package v1
import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/intstr"
"k8s.io/kubernetes/pkg/util/parsers"
)
func addDefaultingFuncs() {
api.Scheme.AddDefaultingFuncs(
func addDefaultingFuncs(scheme *runtime.Scheme) {
scheme.AddDefaultingFuncs(
func(obj *PodExecOptions) {
obj.Stdout = true
obj.Stderr = true

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

@@ -31,16 +31,16 @@ var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1
// Codec encodes internal objects to the v1 scheme
var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion)
func AddToScheme() {
func AddToScheme(scheme *runtime.Scheme) {
// Add the API to Scheme.
addKnownTypes()
addConversionFuncs()
addDefaultingFuncs()
addKnownTypes(scheme)
addConversionFuncs(scheme)
addDefaultingFuncs(scheme)
}
// Adds the list of known types to api.Scheme.
func addKnownTypes() {
api.Scheme.AddKnownTypes(SchemeGroupVersion,
func addKnownTypes(scheme *runtime.Scheme) {
scheme.AddKnownTypes(SchemeGroupVersion,
&Pod{},
&PodList{},
&PodStatusResult{},
@@ -86,7 +86,7 @@ func addKnownTypes() {
)
// Add common types
api.Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.Status{})
scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.Status{})
}
func (obj *Pod) GetObjectKind() unversioned.ObjectKind { return &obj.TypeMeta }