Skip to content

Commit 62d602d

Browse files
k8s-publish-robotk8s-publish-robot
committed
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
2 parents 0d9be77 + d625e67 commit 62d602d

File tree

11 files changed

+83
-224
lines changed

11 files changed

+83
-224
lines changed

‎Godeps/Godeps.json

Lines changed: 80 additions & 80 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rest/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ go_library(
6565
"//vendor/k8s.io/api/core/v1:go_default_library",
6666
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
6767
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
68-
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
6968
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
7069
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
7170
"//vendor/k8s.io/apimachinery/pkg/runtime/serializer/streaming:go_default_library",

‎rest/zz_generated.deepcopy.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,6 @@ limitations under the License.
2020

2121
package rest
2222

23-
import (
24-
conversion "k8s.io/apimachinery/pkg/conversion"
25-
reflect "reflect"
26-
)
27-
28-
// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them.
29-
//
30-
// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
31-
func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc {
32-
return []conversion.GeneratedDeepCopyFunc{
33-
{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
34-
in.(*TLSClientConfig).DeepCopyInto(out.(*TLSClientConfig))
35-
return nil
36-
}, InType: reflect.TypeOf(&TLSClientConfig{})},
37-
}
38-
}
39-
4023
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
4124
func (in *TLSClientConfig) DeepCopyInto(out *TLSClientConfig) {
4225
*out = *in

‎scale/scheme/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ go_library(
1313
deps = [
1414
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
1515
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
16-
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
1716
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
1817
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
1918
],

‎scale/scheme/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// +k8s:deepcopy-gen=package,register
17+
// +k8s:deepcopy-gen=package
1818

1919
// Package scheme contains a runtime.Scheme to be used for serializing
2020
// and deserializing different versions of Scale, and for converting

‎scale/scheme/zz_generated.deepcopy.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,9 @@ package scheme
2222

2323
import (
2424
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25-
conversion "k8s.io/apimachinery/pkg/conversion"
2625
runtime "k8s.io/apimachinery/pkg/runtime"
27-
reflect "reflect"
2826
)
2927

30-
func init() {
31-
SchemeBuilder.Register(RegisterDeepCopies)
32-
}
33-
34-
// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
35-
// to allow building arbitrary schemes.
36-
//
37-
// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
38-
func RegisterDeepCopies(scheme *runtime.Scheme) error {
39-
return scheme.AddGeneratedDeepCopyFuncs(
40-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
41-
in.(*Scale).DeepCopyInto(out.(*Scale))
42-
return nil
43-
}, InType: reflect.TypeOf(&Scale{})},
44-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
45-
in.(*ScaleSpec).DeepCopyInto(out.(*ScaleSpec))
46-
return nil
47-
}, InType: reflect.TypeOf(&ScaleSpec{})},
48-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
49-
in.(*ScaleStatus).DeepCopyInto(out.(*ScaleStatus))
50-
return nil
51-
}, InType: reflect.TypeOf(&ScaleStatus{})},
52-
)
53-
}
54-
5528
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
5629
func (in *Scale) DeepCopyInto(out *Scale) {
5730
*out = *in

‎tools/clientcmd/api/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ go_library(
2828
],
2929
importpath = "k8s.io/client-go/tools/clientcmd/api",
3030
deps = [
31-
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
3231
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
3332
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
3433
],

‎tools/clientcmd/api/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// +k8s:deepcopy-gen=package,register
17+
// +k8s:deepcopy-gen=package
1818
package api

‎tools/clientcmd/api/v1/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// +k8s:deepcopy-gen=package,register
17+
// +k8s:deepcopy-gen=package
1818
package v1

‎tools/clientcmd/api/v1/zz_generated.deepcopy.go

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -21,64 +21,9 @@ limitations under the License.
2121
package v1
2222

2323
import (
24-
conversion "k8s.io/apimachinery/pkg/conversion"
2524
runtime "k8s.io/apimachinery/pkg/runtime"
26-
reflect "reflect"
2725
)
2826

29-
func init() {
30-
SchemeBuilder.Register(RegisterDeepCopies)
31-
}
32-
33-
// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
34-
// to allow building arbitrary schemes.
35-
//
36-
// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
37-
func RegisterDeepCopies(scheme *runtime.Scheme) error {
38-
return scheme.AddGeneratedDeepCopyFuncs(
39-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
40-
in.(*AuthInfo).DeepCopyInto(out.(*AuthInfo))
41-
return nil
42-
}, InType: reflect.TypeOf(&AuthInfo{})},
43-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
44-
in.(*AuthProviderConfig).DeepCopyInto(out.(*AuthProviderConfig))
45-
return nil
46-
}, InType: reflect.TypeOf(&AuthProviderConfig{})},
47-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
48-
in.(*Cluster).DeepCopyInto(out.(*Cluster))
49-
return nil
50-
}, InType: reflect.TypeOf(&Cluster{})},
51-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
52-
in.(*Config).DeepCopyInto(out.(*Config))
53-
return nil
54-
}, InType: reflect.TypeOf(&Config{})},
55-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
56-
in.(*Context).DeepCopyInto(out.(*Context))
57-
return nil
58-
}, InType: reflect.TypeOf(&Context{})},
59-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
60-
in.(*NamedAuthInfo).DeepCopyInto(out.(*NamedAuthInfo))
61-
return nil
62-
}, InType: reflect.TypeOf(&NamedAuthInfo{})},
63-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
64-
in.(*NamedCluster).DeepCopyInto(out.(*NamedCluster))
65-
return nil
66-
}, InType: reflect.TypeOf(&NamedCluster{})},
67-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
68-
in.(*NamedContext).DeepCopyInto(out.(*NamedContext))
69-
return nil
70-
}, InType: reflect.TypeOf(&NamedContext{})},
71-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
72-
in.(*NamedExtension).DeepCopyInto(out.(*NamedExtension))
73-
return nil
74-
}, InType: reflect.TypeOf(&NamedExtension{})},
75-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
76-
in.(*Preferences).DeepCopyInto(out.(*Preferences))
77-
return nil
78-
}, InType: reflect.TypeOf(&Preferences{})},
79-
)
80-
}
81-
8227
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
8328
func (in *AuthInfo) DeepCopyInto(out *AuthInfo) {
8429
*out = *in

‎tools/clientcmd/api/zz_generated.deepcopy.go

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,48 +21,9 @@ limitations under the License.
2121
package api
2222

2323
import (
24-
conversion "k8s.io/apimachinery/pkg/conversion"
2524
runtime "k8s.io/apimachinery/pkg/runtime"
26-
reflect "reflect"
2725
)
2826

29-
func init() {
30-
SchemeBuilder.Register(RegisterDeepCopies)
31-
}
32-
33-
// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
34-
// to allow building arbitrary schemes.
35-
//
36-
// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
37-
func RegisterDeepCopies(scheme *runtime.Scheme) error {
38-
return scheme.AddGeneratedDeepCopyFuncs(
39-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
40-
in.(*AuthInfo).DeepCopyInto(out.(*AuthInfo))
41-
return nil
42-
}, InType: reflect.TypeOf(&AuthInfo{})},
43-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
44-
in.(*AuthProviderConfig).DeepCopyInto(out.(*AuthProviderConfig))
45-
return nil
46-
}, InType: reflect.TypeOf(&AuthProviderConfig{})},
47-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
48-
in.(*Cluster).DeepCopyInto(out.(*Cluster))
49-
return nil
50-
}, InType: reflect.TypeOf(&Cluster{})},
51-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
52-
in.(*Config).DeepCopyInto(out.(*Config))
53-
return nil
54-
}, InType: reflect.TypeOf(&Config{})},
55-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
56-
in.(*Context).DeepCopyInto(out.(*Context))
57-
return nil
58-
}, InType: reflect.TypeOf(&Context{})},
59-
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
60-
in.(*Preferences).DeepCopyInto(out.(*Preferences))
61-
return nil
62-
}, InType: reflect.TypeOf(&Preferences{})},
63-
)
64-
}
65-
6627
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
6728
func (in *AuthInfo) DeepCopyInto(out *AuthInfo) {
6829
*out = *in

0 commit comments

Comments
 (0)