Merge pull request #55396 from sttts/sttts-drop-deepcopy-registration

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. deepcopy: remove unused deepcopy func registration Counterpart to kubernetes/gengo#67. Kubernetes-commit: 7c8596a95fb37e3c1318e25ae505989122bd4e56
sttts · Nov 10, 2017 · 2e9ce9b · 2e9ce9b
2 parents 407b528 + baa253f
commit 2e9ce9b
Show file tree

Hide file tree

Showing 129 changed files with 353 additions and 3,690 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/examples/client-go/pkg/apis/cr/v1/BUILD b/examples/client-go/pkg/apis/cr/v1/BUILD
@@ -17,7 +17,6 @@ go_library(
     deps = [
         "//vendor/k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
     ],

diff --git a/examples/client-go/pkg/apis/cr/v1/doc.go b/examples/client-go/pkg/apis/cr/v1/doc.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
+// +k8s:deepcopy-gen=package
 
 // Package v1 is the v1 version of the API.
 // +groupName=cr.example.apiextensions.k8s.io

diff --git a/examples/client-go/pkg/apis/cr/v1/zz_generated.deepcopy.go b/examples/client-go/pkg/apis/cr/v1/zz_generated.deepcopy.go
@@ -21,40 +21,9 @@ limitations under the License.
 package v1
 
 import (
-	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	reflect "reflect"
 )
 
-func init() {
-	SchemeBuilder.Register(RegisterDeepCopies)
-}
-
-// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
-// to allow building arbitrary schemes.
-//
-// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
-func RegisterDeepCopies(scheme *runtime.Scheme) error {
-	return scheme.AddGeneratedDeepCopyFuncs(
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*Example).DeepCopyInto(out.(*Example))
-			return nil
-		}, InType: reflect.TypeOf(&Example{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ExampleList).DeepCopyInto(out.(*ExampleList))
-			return nil
-		}, InType: reflect.TypeOf(&ExampleList{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ExampleSpec).DeepCopyInto(out.(*ExampleSpec))
-			return nil
-		}, InType: reflect.TypeOf(&ExampleSpec{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ExampleStatus).DeepCopyInto(out.(*ExampleStatus))
-			return nil
-		}, InType: reflect.TypeOf(&ExampleStatus{})},
-	)
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Example) DeepCopyInto(out *Example) {
 	*out = *in

diff --git a/pkg/apis/apiextensions/BUILD b/pkg/apis/apiextensions/BUILD
@@ -20,7 +20,6 @@ go_library(
     importpath = "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions",
     deps = [
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
     ],

diff --git a/pkg/apis/apiextensions/doc.go b/pkg/apis/apiextensions/doc.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
+// +k8s:deepcopy-gen=package
 
 // Package apiextensions is the internal version of the API.
 // +groupName=apiextensions.k8s.io

diff --git a/pkg/apis/apiextensions/v1beta1/doc.go b/pkg/apis/apiextensions/v1beta1/doc.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
+// +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
 // +k8s:defaulter-gen=TypeMeta
 

diff --git a/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go b/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go
@@ -21,76 +21,9 @@ limitations under the License.
 package v1beta1
 
 import (
-	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	reflect "reflect"
 )
 
-func init() {
-	SchemeBuilder.Register(RegisterDeepCopies)
-}
-
-// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
-// to allow building arbitrary schemes.
-//
-// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
-func RegisterDeepCopies(scheme *runtime.Scheme) error {
-	return scheme.AddGeneratedDeepCopyFuncs(
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinition).DeepCopyInto(out.(*CustomResourceDefinition))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinition{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinitionCondition).DeepCopyInto(out.(*CustomResourceDefinitionCondition))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinitionCondition{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinitionList).DeepCopyInto(out.(*CustomResourceDefinitionList))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinitionList{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinitionNames).DeepCopyInto(out.(*CustomResourceDefinitionNames))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinitionNames{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinitionSpec).DeepCopyInto(out.(*CustomResourceDefinitionSpec))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinitionSpec{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinitionStatus).DeepCopyInto(out.(*CustomResourceDefinitionStatus))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinitionStatus{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceValidation).DeepCopyInto(out.(*CustomResourceValidation))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceValidation{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ExternalDocumentation).DeepCopyInto(out.(*ExternalDocumentation))
-			return nil
-		}, InType: reflect.TypeOf(&ExternalDocumentation{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*JSON).DeepCopyInto(out.(*JSON))
-			return nil
-		}, InType: reflect.TypeOf(&JSON{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*JSONSchemaProps).DeepCopyInto(out.(*JSONSchemaProps))
-			return nil
-		}, InType: reflect.TypeOf(&JSONSchemaProps{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*JSONSchemaPropsOrArray).DeepCopyInto(out.(*JSONSchemaPropsOrArray))
-			return nil
-		}, InType: reflect.TypeOf(&JSONSchemaPropsOrArray{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*JSONSchemaPropsOrBool).DeepCopyInto(out.(*JSONSchemaPropsOrBool))
-			return nil
-		}, InType: reflect.TypeOf(&JSONSchemaPropsOrBool{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*JSONSchemaPropsOrStringArray).DeepCopyInto(out.(*JSONSchemaPropsOrStringArray))
-			return nil
-		}, InType: reflect.TypeOf(&JSONSchemaPropsOrStringArray{})},
-	)
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *CustomResourceDefinition) DeepCopyInto(out *CustomResourceDefinition) {
 	*out = *in

diff --git a/pkg/apis/apiextensions/zz_generated.deepcopy.go b/pkg/apis/apiextensions/zz_generated.deepcopy.go
@@ -21,72 +21,9 @@ limitations under the License.
 package apiextensions
 
 import (
-	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	reflect "reflect"
 )
 
-func init() {
-	SchemeBuilder.Register(RegisterDeepCopies)
-}
-
-// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
-// to allow building arbitrary schemes.
-//
-// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
-func RegisterDeepCopies(scheme *runtime.Scheme) error {
-	return scheme.AddGeneratedDeepCopyFuncs(
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinition).DeepCopyInto(out.(*CustomResourceDefinition))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinition{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinitionCondition).DeepCopyInto(out.(*CustomResourceDefinitionCondition))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinitionCondition{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinitionList).DeepCopyInto(out.(*CustomResourceDefinitionList))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinitionList{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinitionNames).DeepCopyInto(out.(*CustomResourceDefinitionNames))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinitionNames{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinitionSpec).DeepCopyInto(out.(*CustomResourceDefinitionSpec))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinitionSpec{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceDefinitionStatus).DeepCopyInto(out.(*CustomResourceDefinitionStatus))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceDefinitionStatus{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*CustomResourceValidation).DeepCopyInto(out.(*CustomResourceValidation))
-			return nil
-		}, InType: reflect.TypeOf(&CustomResourceValidation{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ExternalDocumentation).DeepCopyInto(out.(*ExternalDocumentation))
-			return nil
-		}, InType: reflect.TypeOf(&ExternalDocumentation{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*JSONSchemaProps).DeepCopyInto(out.(*JSONSchemaProps))
-			return nil
-		}, InType: reflect.TypeOf(&JSONSchemaProps{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*JSONSchemaPropsOrArray).DeepCopyInto(out.(*JSONSchemaPropsOrArray))
-			return nil
-		}, InType: reflect.TypeOf(&JSONSchemaPropsOrArray{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*JSONSchemaPropsOrBool).DeepCopyInto(out.(*JSONSchemaPropsOrBool))
-			return nil
-		}, InType: reflect.TypeOf(&JSONSchemaPropsOrBool{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*JSONSchemaPropsOrStringArray).DeepCopyInto(out.(*JSONSchemaPropsOrStringArray))
-			return nil
-		}, InType: reflect.TypeOf(&JSONSchemaPropsOrStringArray{})},
-	)
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *CustomResourceDefinition) DeepCopyInto(out *CustomResourceDefinition) {
 	*out = *in

diff --git a/pkg/apiserver/customresource_handler.go b/pkg/apiserver/customresource_handler.go
@@ -309,7 +309,6 @@ func (r *crdHandler) getServingInfoFor(crd *apiextensions.CustomResourceDefiniti
 		&metav1.GetOptions{},
 		&metav1.DeleteOptions{},
 	)
-	parameterScheme.AddGeneratedDeepCopyFuncs(metav1.GetGeneratedDeepCopyFuncs()...)
 	parameterCodec := runtime.NewParameterCodec(parameterScheme)
 
 	kind := schema.GroupVersionKind{Group: crd.Spec.Group, Version: crd.Spec.Version, Kind: crd.Status.AcceptedNames.Kind}

diff --git a/vendor/k8s.io/api/admission/v1alpha1/BUILD b/vendor/k8s.io/api/admission/v1alpha1/BUILD
diff --git a/vendor/k8s.io/api/admission/v1alpha1/doc.go b/vendor/k8s.io/api/admission/v1alpha1/doc.go
diff --git a/vendor/k8s.io/api/admission/v1alpha1/zz_generated.deepcopy.go b/vendor/k8s.io/api/admission/v1alpha1/zz_generated.deepcopy.go
diff --git a/vendor/k8s.io/api/admissionregistration/v1alpha1/BUILD b/vendor/k8s.io/api/admissionregistration/v1alpha1/BUILD
diff --git a/vendor/k8s.io/api/admissionregistration/v1alpha1/doc.go b/vendor/k8s.io/api/admissionregistration/v1alpha1/doc.go
diff --git a/vendor/k8s.io/api/admissionregistration/v1alpha1/zz_generated.deepcopy.go b/vendor/k8s.io/api/admissionregistration/v1alpha1/zz_generated.deepcopy.go
diff --git a/vendor/k8s.io/api/apps/v1/BUILD b/vendor/k8s.io/api/apps/v1/BUILD