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
k8s-publishing-bot · Nov 29, 2017 · 9a27228 · 9a27228
2 parents 16b44af + 1a2c1c7
commit 9a27228
Show file tree

Hide file tree

Showing 26 changed files with 236 additions and 560 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/pkg/apis/apiserver/BUILD b/pkg/apis/apiserver/BUILD
@@ -16,7 +16,6 @@ go_library(
     importpath = "k8s.io/apiserver/pkg/apis/apiserver",
     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/apiserver/doc.go b/pkg/apis/apiserver/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 apiserver is the internal version of the API.
 // +groupName=apiserver.k8s.io

diff --git a/pkg/apis/apiserver/v1alpha1/doc.go b/pkg/apis/apiserver/v1alpha1/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/apiserver/pkg/apis/apiserver
 // +k8s:defaulter-gen=TypeMeta
 

diff --git a/pkg/apis/apiserver/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/apiserver/v1alpha1/zz_generated.deepcopy.go
@@ -21,32 +21,9 @@ limitations under the License.
 package v1alpha1
 
 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.(*AdmissionConfiguration).DeepCopyInto(out.(*AdmissionConfiguration))
-			return nil
-		}, InType: reflect.TypeOf(&AdmissionConfiguration{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*AdmissionPluginConfiguration).DeepCopyInto(out.(*AdmissionPluginConfiguration))
-			return nil
-		}, InType: reflect.TypeOf(&AdmissionPluginConfiguration{})},
-	)
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AdmissionConfiguration) DeepCopyInto(out *AdmissionConfiguration) {
 	*out = *in

diff --git a/pkg/apis/apiserver/zz_generated.deepcopy.go b/pkg/apis/apiserver/zz_generated.deepcopy.go
@@ -21,32 +21,9 @@ limitations under the License.
 package apiserver
 
 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.(*AdmissionConfiguration).DeepCopyInto(out.(*AdmissionConfiguration))
-			return nil
-		}, InType: reflect.TypeOf(&AdmissionConfiguration{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*AdmissionPluginConfiguration).DeepCopyInto(out.(*AdmissionPluginConfiguration))
-			return nil
-		}, InType: reflect.TypeOf(&AdmissionPluginConfiguration{})},
-	)
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AdmissionConfiguration) DeepCopyInto(out *AdmissionConfiguration) {
 	*out = *in

diff --git a/pkg/apis/audit/BUILD b/pkg/apis/audit/BUILD
@@ -17,7 +17,6 @@ go_library(
     importpath = "k8s.io/apiserver/pkg/apis/audit",
     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",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",

diff --git a/pkg/apis/audit/register.go b/pkg/apis/audit/register.go
@@ -49,6 +49,5 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&Policy{},
 		&PolicyList{},
 	)
-	scheme.AddGeneratedDeepCopyFuncs(GetGeneratedDeepCopyFuncs()...)
 	return nil
 }
diff --git a/pkg/apis/audit/v1alpha1/doc.go b/pkg/apis/audit/v1alpha1/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/apiserver/pkg/apis/audit
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta

diff --git a/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go
@@ -23,52 +23,9 @@ package v1alpha1
 import (
 	v1 "k8s.io/api/authentication/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	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.(*Event).DeepCopyInto(out.(*Event))
-			return nil
-		}, InType: reflect.TypeOf(&Event{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*EventList).DeepCopyInto(out.(*EventList))
-			return nil
-		}, InType: reflect.TypeOf(&EventList{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*GroupResources).DeepCopyInto(out.(*GroupResources))
-			return nil
-		}, InType: reflect.TypeOf(&GroupResources{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ObjectReference).DeepCopyInto(out.(*ObjectReference))
-			return nil
-		}, InType: reflect.TypeOf(&ObjectReference{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*Policy).DeepCopyInto(out.(*Policy))
-			return nil
-		}, InType: reflect.TypeOf(&Policy{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PolicyList).DeepCopyInto(out.(*PolicyList))
-			return nil
-		}, InType: reflect.TypeOf(&PolicyList{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PolicyRule).DeepCopyInto(out.(*PolicyRule))
-			return nil
-		}, InType: reflect.TypeOf(&PolicyRule{})},
-	)
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Event) DeepCopyInto(out *Event) {
 	*out = *in

diff --git a/pkg/apis/audit/v1beta1/doc.go b/pkg/apis/audit/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/apiserver/pkg/apis/audit
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta

diff --git a/pkg/apis/audit/v1beta1/zz_generated.deepcopy.go b/pkg/apis/audit/v1beta1/zz_generated.deepcopy.go
@@ -23,52 +23,9 @@ package v1beta1
 import (
 	v1 "k8s.io/api/authentication/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	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.(*Event).DeepCopyInto(out.(*Event))
-			return nil
-		}, InType: reflect.TypeOf(&Event{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*EventList).DeepCopyInto(out.(*EventList))
-			return nil
-		}, InType: reflect.TypeOf(&EventList{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*GroupResources).DeepCopyInto(out.(*GroupResources))
-			return nil
-		}, InType: reflect.TypeOf(&GroupResources{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ObjectReference).DeepCopyInto(out.(*ObjectReference))
-			return nil
-		}, InType: reflect.TypeOf(&ObjectReference{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*Policy).DeepCopyInto(out.(*Policy))
-			return nil
-		}, InType: reflect.TypeOf(&Policy{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PolicyList).DeepCopyInto(out.(*PolicyList))
-			return nil
-		}, InType: reflect.TypeOf(&PolicyList{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PolicyRule).DeepCopyInto(out.(*PolicyRule))
-			return nil
-		}, InType: reflect.TypeOf(&PolicyRule{})},
-	)
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Event) DeepCopyInto(out *Event) {
 	*out = *in

diff --git a/pkg/apis/audit/zz_generated.deepcopy.go b/pkg/apis/audit/zz_generated.deepcopy.go
@@ -22,51 +22,9 @@ package audit
 
 import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	reflect "reflect"
 )
 
-// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them.
-//
-// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
-func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc {
-	return []conversion.GeneratedDeepCopyFunc{
-		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*Event).DeepCopyInto(out.(*Event))
-			return nil
-		}, InType: reflect.TypeOf(&Event{})},
-		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*EventList).DeepCopyInto(out.(*EventList))
-			return nil
-		}, InType: reflect.TypeOf(&EventList{})},
-		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*GroupResources).DeepCopyInto(out.(*GroupResources))
-			return nil
-		}, InType: reflect.TypeOf(&GroupResources{})},
-		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ObjectReference).DeepCopyInto(out.(*ObjectReference))
-			return nil
-		}, InType: reflect.TypeOf(&ObjectReference{})},
-		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*Policy).DeepCopyInto(out.(*Policy))
-			return nil
-		}, InType: reflect.TypeOf(&Policy{})},
-		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PolicyList).DeepCopyInto(out.(*PolicyList))
-			return nil
-		}, InType: reflect.TypeOf(&PolicyList{})},
-		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PolicyRule).DeepCopyInto(out.(*PolicyRule))
-			return nil
-		}, InType: reflect.TypeOf(&PolicyRule{})},
-		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*UserInfo).DeepCopyInto(out.(*UserInfo))
-			return nil
-		}, InType: reflect.TypeOf(&UserInfo{})},
-	}
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Event) DeepCopyInto(out *Event) {
 	*out = *in

diff --git a/pkg/apis/example/BUILD b/pkg/apis/example/BUILD
@@ -16,7 +16,6 @@ go_library(
     importpath = "k8s.io/apiserver/pkg/apis/example",
     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/example/doc.go b/pkg/apis/example/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
 // +groupName=example.k8s.io
 //
 // package example contains an example API used to demonstrate how to create api groups. Moreover, this is

diff --git a/pkg/apis/example/v1/doc.go b/pkg/apis/example/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
 // +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/example
 // +k8s:openapi-gen=false
 // +k8s:defaulter-gen=TypeMeta

diff --git a/pkg/apis/example/v1/zz_generated.deepcopy.go b/pkg/apis/example/v1/zz_generated.deepcopy.go
@@ -22,44 +22,9 @@ package v1
 
 import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	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.(*Pod).DeepCopyInto(out.(*Pod))
-			return nil
-		}, InType: reflect.TypeOf(&Pod{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PodCondition).DeepCopyInto(out.(*PodCondition))
-			return nil
-		}, InType: reflect.TypeOf(&PodCondition{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PodList).DeepCopyInto(out.(*PodList))
-			return nil
-		}, InType: reflect.TypeOf(&PodList{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PodSpec).DeepCopyInto(out.(*PodSpec))
-			return nil
-		}, InType: reflect.TypeOf(&PodSpec{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PodStatus).DeepCopyInto(out.(*PodStatus))
-			return nil
-		}, InType: reflect.TypeOf(&PodStatus{})},
-	)
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Pod) DeepCopyInto(out *Pod) {
 	*out = *in

diff --git a/pkg/apis/example/zz_generated.deepcopy.go b/pkg/apis/example/zz_generated.deepcopy.go
@@ -22,44 +22,9 @@ package example
 
 import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	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.(*Pod).DeepCopyInto(out.(*Pod))
-			return nil
-		}, InType: reflect.TypeOf(&Pod{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PodCondition).DeepCopyInto(out.(*PodCondition))
-			return nil
-		}, InType: reflect.TypeOf(&PodCondition{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PodList).DeepCopyInto(out.(*PodList))
-			return nil
-		}, InType: reflect.TypeOf(&PodList{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PodSpec).DeepCopyInto(out.(*PodSpec))
-			return nil
-		}, InType: reflect.TypeOf(&PodSpec{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*PodStatus).DeepCopyInto(out.(*PodStatus))
-			return nil
-		}, InType: reflect.TypeOf(&PodStatus{})},
-	)
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Pod) DeepCopyInto(out *Pod) {
 	*out = *in