diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 0d1f661972..d50e51e244 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -372,323 +372,323 @@ }, { "ImportPath": "k8s.io/api/admissionregistration/v1alpha1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/apps/v1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/apps/v1beta1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/apps/v1beta2", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/authentication/v1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/authentication/v1beta1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/authorization/v1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/authorization/v1beta1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/autoscaling/v1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/autoscaling/v2beta1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/batch/v1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/batch/v1beta1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/batch/v2alpha1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/certificates/v1beta1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/core/v1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/extensions/v1beta1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/imagepolicy/v1alpha1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/networking/v1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/policy/v1beta1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/rbac/v1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/rbac/v1alpha1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/rbac/v1beta1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/scheduling/v1alpha1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/settings/v1alpha1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/storage/v1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/api/storage/v1beta1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/equality", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/errors", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/meta", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/cache", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/clock", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/diff", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/framer", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/yaml", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/version", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "62df9d3cab4ccdca4b3b364f8c8cf519ccfaba72" + "Rev": "d7d6cc8aad1752679f4022961328c1d29cc02ed1" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", diff --git a/rest/BUILD b/rest/BUILD index d3d730fff6..44958631da 100644 --- a/rest/BUILD +++ b/rest/BUILD @@ -65,7 +65,6 @@ go_library( "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors: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", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer/streaming:go_default_library", diff --git a/rest/zz_generated.deepcopy.go b/rest/zz_generated.deepcopy.go index 1632e1efe3..59050fc491 100644 --- a/rest/zz_generated.deepcopy.go +++ b/rest/zz_generated.deepcopy.go @@ -20,23 +20,6 @@ limitations under the License. package rest -import ( - conversion "k8s.io/apimachinery/pkg/conversion" - 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.(*TLSClientConfig).DeepCopyInto(out.(*TLSClientConfig)) - return nil - }, InType: reflect.TypeOf(&TLSClientConfig{})}, - } -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TLSClientConfig) DeepCopyInto(out *TLSClientConfig) { *out = *in diff --git a/scale/scheme/BUILD b/scale/scheme/BUILD index 8537aeb6ff..74bd976a1f 100644 --- a/scale/scheme/BUILD +++ b/scale/scheme/BUILD @@ -13,7 +13,6 @@ go_library( deps = [ "//vendor/k8s.io/api/autoscaling/v1: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/scale/scheme/doc.go b/scale/scheme/doc.go index 8a050ce47b..0203d6d5a2 100644 --- a/scale/scheme/doc.go +++ b/scale/scheme/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 scheme contains a runtime.Scheme to be used for serializing // and deserializing different versions of Scale, and for converting diff --git a/scale/scheme/zz_generated.deepcopy.go b/scale/scheme/zz_generated.deepcopy.go index ec9f5f95ed..19b6795835 100644 --- a/scale/scheme/zz_generated.deepcopy.go +++ b/scale/scheme/zz_generated.deepcopy.go @@ -22,36 +22,9 @@ package scheme 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.(*Scale).DeepCopyInto(out.(*Scale)) - return nil - }, InType: reflect.TypeOf(&Scale{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ScaleSpec).DeepCopyInto(out.(*ScaleSpec)) - return nil - }, InType: reflect.TypeOf(&ScaleSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ScaleStatus).DeepCopyInto(out.(*ScaleStatus)) - return nil - }, InType: reflect.TypeOf(&ScaleStatus{})}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Scale) DeepCopyInto(out *Scale) { *out = *in diff --git a/tools/clientcmd/api/BUILD b/tools/clientcmd/api/BUILD index ea77ceabdb..d46f4e28fb 100644 --- a/tools/clientcmd/api/BUILD +++ b/tools/clientcmd/api/BUILD @@ -28,7 +28,6 @@ go_library( ], importpath = "k8s.io/client-go/tools/clientcmd/api", deps = [ - "//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/tools/clientcmd/api/doc.go b/tools/clientcmd/api/doc.go index 93a891e954..0a081871ac 100644 --- a/tools/clientcmd/api/doc.go +++ b/tools/clientcmd/api/doc.go @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:deepcopy-gen=package,register +// +k8s:deepcopy-gen=package package api diff --git a/tools/clientcmd/api/v1/doc.go b/tools/clientcmd/api/v1/doc.go index c8ede58a34..9750cf73ac 100644 --- a/tools/clientcmd/api/v1/doc.go +++ b/tools/clientcmd/api/v1/doc.go @@ -14,5 +14,5 @@ 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 diff --git a/tools/clientcmd/api/v1/zz_generated.deepcopy.go b/tools/clientcmd/api/v1/zz_generated.deepcopy.go index b123a9fbe2..8d634671b0 100644 --- a/tools/clientcmd/api/v1/zz_generated.deepcopy.go +++ b/tools/clientcmd/api/v1/zz_generated.deepcopy.go @@ -21,64 +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.(*AuthInfo).DeepCopyInto(out.(*AuthInfo)) - return nil - }, InType: reflect.TypeOf(&AuthInfo{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AuthProviderConfig).DeepCopyInto(out.(*AuthProviderConfig)) - return nil - }, InType: reflect.TypeOf(&AuthProviderConfig{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Cluster).DeepCopyInto(out.(*Cluster)) - return nil - }, InType: reflect.TypeOf(&Cluster{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Config).DeepCopyInto(out.(*Config)) - return nil - }, InType: reflect.TypeOf(&Config{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Context).DeepCopyInto(out.(*Context)) - return nil - }, InType: reflect.TypeOf(&Context{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NamedAuthInfo).DeepCopyInto(out.(*NamedAuthInfo)) - return nil - }, InType: reflect.TypeOf(&NamedAuthInfo{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NamedCluster).DeepCopyInto(out.(*NamedCluster)) - return nil - }, InType: reflect.TypeOf(&NamedCluster{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NamedContext).DeepCopyInto(out.(*NamedContext)) - return nil - }, InType: reflect.TypeOf(&NamedContext{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NamedExtension).DeepCopyInto(out.(*NamedExtension)) - return nil - }, InType: reflect.TypeOf(&NamedExtension{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Preferences).DeepCopyInto(out.(*Preferences)) - return nil - }, InType: reflect.TypeOf(&Preferences{})}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AuthInfo) DeepCopyInto(out *AuthInfo) { *out = *in diff --git a/tools/clientcmd/api/zz_generated.deepcopy.go b/tools/clientcmd/api/zz_generated.deepcopy.go index b787f0ddf8..51668f05bb 100644 --- a/tools/clientcmd/api/zz_generated.deepcopy.go +++ b/tools/clientcmd/api/zz_generated.deepcopy.go @@ -21,48 +21,9 @@ limitations under the License. package api 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.(*AuthInfo).DeepCopyInto(out.(*AuthInfo)) - return nil - }, InType: reflect.TypeOf(&AuthInfo{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AuthProviderConfig).DeepCopyInto(out.(*AuthProviderConfig)) - return nil - }, InType: reflect.TypeOf(&AuthProviderConfig{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Cluster).DeepCopyInto(out.(*Cluster)) - return nil - }, InType: reflect.TypeOf(&Cluster{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Config).DeepCopyInto(out.(*Config)) - return nil - }, InType: reflect.TypeOf(&Config{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Context).DeepCopyInto(out.(*Context)) - return nil - }, InType: reflect.TypeOf(&Context{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Preferences).DeepCopyInto(out.(*Preferences)) - return nil - }, InType: reflect.TypeOf(&Preferences{})}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AuthInfo) DeepCopyInto(out *AuthInfo) { *out = *in