diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/install/install.go b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/install/install.go index 19f17e3fdca..8ce6da33f86 100644 --- a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/install/install.go +++ b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/install/install.go @@ -97,12 +97,12 @@ func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, e func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) { // add the internal version to Scheme - testgroup.AddToScheme() + testgroup.AddToScheme(api.Scheme) // add the enabled external versions to Scheme for _, v := range externalVersions { switch v { case v1.SchemeGroupVersion: - v1.AddToScheme() + v1.AddToScheme(api.Scheme) } } } diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/register.go b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/register.go index ccdc6dba5e0..ec99f0cfe45 100644 --- a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/register.go +++ b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/register.go @@ -19,23 +19,24 @@ package testgroup import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/runtime" ) var SchemeGroupVersion = unversioned.GroupVersion{Group: "testgroup", Version: ""} -func AddToScheme() { +func AddToScheme(scheme *runtime.Scheme) { // Add the API to Scheme. - addKnownTypes() + addKnownTypes(scheme) } // Adds the list of known types to api.Scheme. -func addKnownTypes() { - api.Scheme.AddKnownTypes(SchemeGroupVersion, +func addKnownTypes(scheme *runtime.Scheme) { + scheme.AddKnownTypes(SchemeGroupVersion, &TestType{}, &TestTypeList{}, ) - api.Scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes(SchemeGroupVersion, &api.ListOptions{}) } diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go index fd578fbb691..9f6e96ae0a7 100644 --- a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go +++ b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go @@ -27,19 +27,19 @@ var SchemeGroupVersion = unversioned.GroupVersion{Group: "testgroup", Version: " var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion) -func AddToScheme() { +func AddToScheme(scheme *runtime.Scheme) { // Add the API to Scheme. - addKnownTypes() + addKnownTypes(scheme) } // Adds the list of known types to api.Scheme. -func addKnownTypes() { - api.Scheme.AddKnownTypes(SchemeGroupVersion, +func addKnownTypes(scheme *runtime.Scheme) { + scheme.AddKnownTypes(SchemeGroupVersion, &TestType{}, &TestTypeList{}, ) - api.Scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes(SchemeGroupVersion, &v1.ListOptions{}) } diff --git a/pkg/api/install/install.go b/pkg/api/install/install.go index cebaccd757d..d52224916fb 100644 --- a/pkg/api/install/install.go +++ b/pkg/api/install/install.go @@ -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) } } } diff --git a/pkg/api/register.go b/pkg/api/register.go index e80421c7060..c1e9e9157aa 100644 --- a/pkg/api/register.go +++ b/pkg/api/register.go @@ -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 } diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go index c480cbca378..3ec145240df 100644 --- a/pkg/api/v1/conversion.go +++ b/pkg/api/v1/conversion.go @@ -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, diff --git a/pkg/api/v1/defaults.go b/pkg/api/v1/defaults.go index 4359a70defb..aadad513a66 100644 --- a/pkg/api/v1/defaults.go +++ b/pkg/api/v1/defaults.go @@ -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 diff --git a/pkg/api/v1/register.go b/pkg/api/v1/register.go index f238aa0d94d..14b2e5adfe2 100644 --- a/pkg/api/v1/register.go +++ b/pkg/api/v1/register.go @@ -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 } diff --git a/pkg/apis/componentconfig/install/install.go b/pkg/apis/componentconfig/install/install.go index f0163550f79..febc3eeec42 100644 --- a/pkg/apis/componentconfig/install/install.go +++ b/pkg/apis/componentconfig/install/install.go @@ -119,7 +119,7 @@ func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, e func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) { // add the internal version to Scheme - componentconfig.AddToScheme() + componentconfig.AddToScheme(api.Scheme) // add the enabled external versions to Scheme for _, v := range externalVersions { if !registered.IsEnabledVersion(v) { @@ -128,7 +128,7 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) { } switch v { case v1alpha1.SchemeGroupVersion: - v1alpha1.AddToScheme() + v1alpha1.AddToScheme(api.Scheme) } } } diff --git a/pkg/apis/componentconfig/register.go b/pkg/apis/componentconfig/register.go index cf4467ce56c..ce29ed8baf4 100644 --- a/pkg/apis/componentconfig/register.go +++ b/pkg/apis/componentconfig/register.go @@ -17,12 +17,12 @@ limitations under the License. package componentconfig import ( - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/runtime" ) -func AddToScheme() { - addKnownTypes() +func AddToScheme(scheme *runtime.Scheme) { + addKnownTypes(scheme) } // GroupName is the group name use in this package @@ -41,9 +41,9 @@ func Resource(resource string) unversioned.GroupResource { return SchemeGroupVersion.WithResource(resource).GroupResource() } -func addKnownTypes() { +func addKnownTypes(scheme *runtime.Scheme) { // TODO this will get cleaned up with the scheme types are fixed - api.Scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes(SchemeGroupVersion, &KubeProxyConfiguration{}, ) } diff --git a/pkg/apis/componentconfig/v1alpha1/defaults.go b/pkg/apis/componentconfig/v1alpha1/defaults.go index 32938babe64..2731771de15 100644 --- a/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -17,12 +17,12 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/kubelet/qos" + "k8s.io/kubernetes/pkg/runtime" ) -func addDefaultingFuncs() { - api.Scheme.AddDefaultingFuncs( +func addDefaultingFuncs(scheme *runtime.Scheme) { + scheme.AddDefaultingFuncs( func(obj *KubeProxyConfiguration) { if obj.BindAddress == "" { obj.BindAddress = "0.0.0.0" diff --git a/pkg/apis/componentconfig/v1alpha1/register.go b/pkg/apis/componentconfig/v1alpha1/register.go index 449c3281bfc..aeec8975ab4 100644 --- a/pkg/apis/componentconfig/v1alpha1/register.go +++ b/pkg/apis/componentconfig/v1alpha1/register.go @@ -30,13 +30,13 @@ var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1 var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion) -func AddToScheme() { - addKnownTypes() - addDefaultingFuncs() +func AddToScheme(scheme *runtime.Scheme) { + addKnownTypes(scheme) + addDefaultingFuncs(scheme) } -func addKnownTypes() { - api.Scheme.AddKnownTypes(SchemeGroupVersion, +func addKnownTypes(scheme *runtime.Scheme) { + scheme.AddKnownTypes(SchemeGroupVersion, &KubeProxyConfiguration{}, ) } diff --git a/pkg/apis/extensions/install/install.go b/pkg/apis/extensions/install/install.go index d6f1ef4b0e2..9b82a9962df 100644 --- a/pkg/apis/extensions/install/install.go +++ b/pkg/apis/extensions/install/install.go @@ -119,7 +119,7 @@ func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, e func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) { // add the internal version to Scheme - extensions.AddToScheme() + extensions.AddToScheme(api.Scheme) // add the enabled external versions to Scheme for _, v := range externalVersions { if !registered.IsEnabledVersion(v) { @@ -128,7 +128,7 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) { } switch v { case v1beta1.SchemeGroupVersion: - v1beta1.AddToScheme() + v1beta1.AddToScheme(api.Scheme) } } } diff --git a/pkg/apis/extensions/register.go b/pkg/apis/extensions/register.go index f4cd7573be6..60038753bd8 100644 --- a/pkg/apis/extensions/register.go +++ b/pkg/apis/extensions/register.go @@ -19,6 +19,7 @@ package extensions import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/runtime" ) // GroupName is the group name use in this package @@ -37,15 +38,15 @@ func Resource(resource string) unversioned.GroupResource { return SchemeGroupVersion.WithResource(resource).GroupResource() } -func AddToScheme() { +func AddToScheme(scheme *runtime.Scheme) { // Add the API to Scheme. - addKnownTypes() + addKnownTypes(scheme) } // Adds the list of known types to api.Scheme. -func addKnownTypes() { +func addKnownTypes(scheme *runtime.Scheme) { // TODO this gets cleaned up when the types are fixed - api.Scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes(SchemeGroupVersion, &ClusterAutoscaler{}, &ClusterAutoscalerList{}, &Deployment{}, diff --git a/pkg/apis/extensions/v1beta1/conversion.go b/pkg/apis/extensions/v1beta1/conversion.go index 1d7da2a0b2c..0f104ef2cdc 100644 --- a/pkg/apis/extensions/v1beta1/conversion.go +++ b/pkg/apis/extensions/v1beta1/conversion.go @@ -23,12 +23,13 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" ) -func addConversionFuncs() { +func addConversionFuncs(scheme *runtime.Scheme) { // Add non-generated conversion functions - err := api.Scheme.AddConversionFuncs( + err := scheme.AddConversionFuncs( convert_api_PodSpec_To_v1_PodSpec, convert_v1_PodSpec_To_api_PodSpec, convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec, diff --git a/pkg/apis/extensions/v1beta1/defaults.go b/pkg/apis/extensions/v1beta1/defaults.go index 3344df1217b..adb72f6a35b 100644 --- a/pkg/apis/extensions/v1beta1/defaults.go +++ b/pkg/apis/extensions/v1beta1/defaults.go @@ -17,12 +17,12 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" ) -func addDefaultingFuncs() { - api.Scheme.AddDefaultingFuncs( +func addDefaultingFuncs(scheme *runtime.Scheme) { + scheme.AddDefaultingFuncs( func(obj *APIVersion) { if len(obj.APIGroup) == 0 { obj.APIGroup = GroupName diff --git a/pkg/apis/extensions/v1beta1/register.go b/pkg/apis/extensions/v1beta1/register.go index 178546bb523..36cde91321f 100644 --- a/pkg/apis/extensions/v1beta1/register.go +++ b/pkg/apis/extensions/v1beta1/register.go @@ -31,15 +31,15 @@ var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1 var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion) -func AddToScheme() { - addKnownTypes() - addDefaultingFuncs() - addConversionFuncs() +func AddToScheme(scheme *runtime.Scheme) { + addKnownTypes(scheme) + addDefaultingFuncs(scheme) + addConversionFuncs(scheme) } // Adds the list of known types to api.Scheme. -func addKnownTypes() { - api.Scheme.AddKnownTypes(SchemeGroupVersion, +func addKnownTypes(scheme *runtime.Scheme) { + scheme.AddKnownTypes(SchemeGroupVersion, &ClusterAutoscaler{}, &ClusterAutoscalerList{}, &Deployment{}, diff --git a/pkg/apis/metrics/install/install.go b/pkg/apis/metrics/install/install.go index 0fa5e86af4c..c74d59260d5 100644 --- a/pkg/apis/metrics/install/install.go +++ b/pkg/apis/metrics/install/install.go @@ -119,7 +119,7 @@ func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, e func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) { // add the internal version to Scheme - metrics.AddToScheme() + metrics.AddToScheme(api.Scheme) // add the enabled external versions to Scheme for _, v := range externalVersions { if !registered.IsEnabledVersion(v) { @@ -128,7 +128,7 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) { } switch v { case v1alpha1.SchemeGroupVersion: - v1alpha1.AddToScheme() + v1alpha1.AddToScheme(api.Scheme) } } } diff --git a/pkg/apis/metrics/register.go b/pkg/apis/metrics/register.go index 5639768c73c..99bcb529c14 100644 --- a/pkg/apis/metrics/register.go +++ b/pkg/apis/metrics/register.go @@ -17,13 +17,13 @@ limitations under the License. package metrics import ( - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/runtime" ) -func AddToScheme() { +func AddToScheme(scheme *runtime.Scheme) { // Add the API to Scheme. - addKnownTypes() + addKnownTypes(scheme) } // GroupName is the group name use in this package @@ -43,9 +43,9 @@ func Resource(resource string) unversioned.GroupResource { } // Adds the list of known types to api.Scheme. -func addKnownTypes() { +func addKnownTypes(scheme *runtime.Scheme) { // TODO this will get cleaned up with the scheme types are fixed - api.Scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes(SchemeGroupVersion, &RawNode{}, &RawPod{}, ) diff --git a/pkg/apis/metrics/v1alpha1/register.go b/pkg/apis/metrics/v1alpha1/register.go index 7f4c4b7549d..1643f6e7e47 100644 --- a/pkg/apis/metrics/v1alpha1/register.go +++ b/pkg/apis/metrics/v1alpha1/register.go @@ -31,14 +31,14 @@ var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1 var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion) -func AddToScheme() { +func AddToScheme(scheme *runtime.Scheme) { // Add the API to Scheme. - addKnownTypes() + addKnownTypes(scheme) } // Adds the list of known types to api.Scheme. -func addKnownTypes() { - api.Scheme.AddKnownTypes(SchemeGroupVersion, +func addKnownTypes(scheme *runtime.Scheme) { + scheme.AddKnownTypes(SchemeGroupVersion, &RawNode{}, &RawPod{}, &v1.DeleteOptions{},