Add support for manually defined DeepCopy methods

In bringing back Clayton's PR piece-by-piece this was almost as easy to
implement as his version, and is much more like what I think we should be
doing.

Specifically, any time which defines a .DeepCopy() method will have that method
called preferentially.  Otherwise we generate our own functions for
deep-copying.  This affected exactly one type - resource.Quantity.  In applying
this heuristic, several places in the generated code were simplified.

To achieve this I had to convert types.Type.Methods from a slice to a map,
which seems correct anyway (to do by-name lookups).

cmd/libs/go2idl/conversion-gen/generators/conversion.go

@@ -613,9 +613,9 @@ func (g *genConversion) doBuiltin(inType, outType *types.Type, sw *generator.Sni
 
 func (g *genConversion) doMap(inType, outType *types.Type, sw *generator.SnippetWriter) {
 	sw.Do("*out = make($.|raw$, len(*in))\n", outType)
-	if outType.Key.IsAssignable() {
+	if isDirectlyAssignable(inType.Key, outType.Key) {
 		sw.Do("for key, val := range *in {\n", nil)
-		if outType.Elem.IsAssignable() {
+		if isDirectlyAssignable(inType.Elem, outType.Elem) {
 			if inType.Key == outType.Key {
 				sw.Do("(*out)[key] = ", nil)
 			} else {
@@ -659,7 +659,7 @@ func (g *genConversion) doSlice(inType, outType *types.Type, sw *generator.Snipp
 		sw.Do("copy(*out, *in)\n", nil)
 	} else {
 		sw.Do("for i := range *in {\n", nil)
-		if outType.Elem.IsAssignable() {
+		if isDirectlyAssignable(inType.Elem, outType.Elem) {
 			if inType.Elem == outType.Elem {
 				sw.Do("(*out)[i] = (*in)[i]\n", nil)
 			} else {
@@ -750,7 +750,7 @@ func (g *genConversion) doStruct(inType, outType *types.Type, sw *generator.Snip
 			sw.Do("return err\n", nil)
 			sw.Do("}\n", nil)
 		case types.Alias:
-			if outT.IsAssignable() {
+			if isDirectlyAssignable(t, outT) {
 				if t == outT {
 					sw.Do("out.$.name$ = in.$.name$\n", args)
 				} else {
@@ -787,7 +787,7 @@ func (g *genConversion) isDirectlyAssignable(inType, outType *types.Type) bool {
 
 func (g *genConversion) doPointer(inType, outType *types.Type, sw *generator.SnippetWriter) {
 	sw.Do("*out = new($.Elem|raw$)\n", outType)
-	if outType.Elem.IsAssignable() {
+	if isDirectlyAssignable(inType.Elem, outType.Elem) {
 		if inType.Elem == outType.Elem {
 			sw.Do("**out = **in\n", nil)
 		} else {
@@ -816,3 +816,14 @@ func (g *genConversion) doAlias(inType, outType *types.Type, sw *generator.Snipp
 func (g *genConversion) doUnknown(inType, outType *types.Type, sw *generator.SnippetWriter) {
 	sw.Do("// FIXME: Type $.|raw$ is unsupported.\n", inType)
 }
+
+func isDirectlyAssignable(inType, outType *types.Type) bool {
+	// TODO: This should maybe check for actual assignability between the two
+	// types, rather than superficial traits that happen to indicate it is
+	// assignable in the ways we currently use this code.
+	return inType.IsAssignable() && (inType.IsPrimitive() || isSamePackage(inType, outType))
+}
+
+func isSamePackage(inType, outType *types.Type) bool {
+	return inType.Name.Package == outType.Name.Package
+}

cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go

@@ -163,6 +163,29 @@ func (g *genDeepCopy) copyableWithinPackage(t *types.Type) bool {
 	return copyableWithinPackage(t, g.boundingDirs)
 }
 
+// hasDeepCopyMethod returns true if an appropriate DeepCopy() method is
+// defined for the given type.  This allows more efficient deep copy
+// implementations to be defined by the type's author.  The correct signature
+// for a type T is:
+//    func (t T) DeepCopy() T
+// or:
+//    func (t *T) DeepCopyt() T
+func hasDeepCopyMethod(t *types.Type) bool {
+	for mn, mt := range t.Methods {
+		if mn != "DeepCopy" {
+			continue
+		}
+		if len(mt.Signature.Parameters) != 0 {
+			return false
+		}
+		if len(mt.Signature.Results) != 1 || mt.Signature.Results[0].Name != t.Name {
+			return false
+		}
+		return true
+	}
+	return false
+}
+
 func isRootedUnder(pkg string, roots []string) bool {
 	// Add trailing / to avoid false matches, e.g. foo/bar vs foo/barn.  This
 	// assumes that bounding dirs do not have trailing slashes.
@@ -176,6 +199,7 @@ func isRootedUnder(pkg string, roots []string) bool {
 }
 
 func copyableWithinPackage(t *types.Type, boundingDirs []string) bool {
+	// If the type opts out of copy-generation, stop.
 	if types.ExtractCommentTags("+", t.CommentLines)["gencopy"] == "false" {
 		return false
 	}
@@ -314,6 +338,10 @@ func (g *genDeepCopy) doMap(t *types.Type, sw *generator.SnippetWriter) {
 	sw.Do("*out = make($.|raw$)\n", t)
 	if t.Key.IsAssignable() {
 		switch {
+		case hasDeepCopyMethod(t.Elem):
+			sw.Do("for key, val := range in {\n", nil)
+			sw.Do("(*out)[key] = val.DeepCopy()\n", nil)
+			sw.Do("}\n", nil)
 		case t.Elem.IsAnonymousStruct():
 			sw.Do("for key := range in {\n", nil)
 			sw.Do("(*out)[key] = struct{}{}\n", nil)
@@ -354,7 +382,9 @@ func (g *genDeepCopy) doSlice(t *types.Type, sw *generator.SnippetWriter) {
 		sw.Do("copy(*out, in)\n", nil)
 	} else {
 		sw.Do("for i := range in {\n", nil)
-		if t.Elem.IsAssignable() {
+		if hasDeepCopyMethod(t.Elem) {
+			sw.Do("(*out)[i] = in[i].DeepCopy()\n", nil)
+		} else if t.Elem.IsAssignable() {
 			sw.Do("(*out)[i] = in[i]\n", nil)
 		} else if g.copyableWithinPackage(t.Elem) {
 			funcName := g.funcNameTmpl(t.Elem)
@@ -395,7 +425,11 @@ func (g *genDeepCopy) doStruct(t *types.Type, sw *generator.SnippetWriter) {
 			sw.Do("out.$.name$ = nil\n", args)
 			sw.Do("}\n", nil)
 		case types.Struct:
-			if g.copyableWithinPackage(t) {
+			if hasDeepCopyMethod(t) {
+				sw.Do("out.$.name$ = in.$.name$.DeepCopy()\n", args)
+			} else if t.IsAssignable() {
+				sw.Do("out.$.name$ = in.$.name$\n", args)
+			} else if g.copyableWithinPackage(t) {
 				funcName := g.funcNameTmpl(t)
 				sw.Do(fmt.Sprintf("if err := %s(in.$.name$, &out.$.name$, c); err != nil {\n", funcName), args)
 				sw.Do("return err\n", nil)
@@ -426,7 +460,9 @@ func (g *genDeepCopy) doInterface(t *types.Type, sw *generator.SnippetWriter) {
 
 func (g *genDeepCopy) doPointer(t *types.Type, sw *generator.SnippetWriter) {
 	sw.Do("*out = new($.Elem|raw$)\n", t)
-	if t.Elem.Kind == types.Builtin {
+	if hasDeepCopyMethod(t.Elem) {
+		sw.Do("**out = in.DeepCopy()\n", nil)
+	} else if t.Elem.IsAssignable() {
 		sw.Do("**out = *in", nil)
 	} else if g.copyableWithinPackage(t.Elem) {
 		funcName := g.funcNameTmpl(t.Elem)

cmd/libs/go2idl/deepcopy-gen/generators/deepcopy_test.go

@@ -16,7 +16,11 @@ limitations under the License.
 
 package generators
 
-import "testing"
+import (
+	"testing"
+
+	"k8s.io/kubernetes/cmd/libs/go2idl/types"
+)
 
 func Test_isRootedUnder(t *testing.T) {
 	testCases := []struct {
@@ -100,3 +104,164 @@ func Test_isRootedUnder(t *testing.T) {
 		}
 	}
 }
+
+func Test_hasDeepCopyMethod(t *testing.T) {
+	testCases := []struct {
+		typ    types.Type
+		expect bool
+	}{
+		{
+			typ: types.Type{
+				Name: types.Name{Package: "pkgname", Name: "typename"},
+				Kind: types.Builtin,
+				// No DeepCopy method.
+				Methods: map[string]*types.Type{},
+			},
+			expect: false,
+		},
+		{
+			typ: types.Type{
+				Name: types.Name{Package: "pkgname", Name: "typename"},
+				Kind: types.Builtin,
+				Methods: map[string]*types.Type{
+					// No DeepCopy method.
+					"method": {
+						Name: types.Name{Package: "pkgname", Name: "func()"},
+						Kind: types.Func,
+						Signature: &types.Signature{
+							Parameters: []*types.Type{},
+							Results:    []*types.Type{},
+						},
+					},
+				},
+			},
+			expect: false,
+		},
+		{
+			typ: types.Type{
+				Name: types.Name{Package: "pkgname", Name: "typename"},
+				Kind: types.Builtin,
+				Methods: map[string]*types.Type{
+					// Wrong signature (no result).
+					"DeepCopy": {
+						Name: types.Name{Package: "pkgname", Name: "func()"},
+						Kind: types.Func,
+						Signature: &types.Signature{
+							Parameters: []*types.Type{},
+							Results:    []*types.Type{},
+						},
+					},
+				},
+			},
+			expect: false,
+		},
+		{
+			typ: types.Type{
+				Name: types.Name{Package: "pkgname", Name: "typename"},
+				Kind: types.Builtin,
+				Methods: map[string]*types.Type{
+					// Wrong signature (wrong result).
+					"DeepCopy": {
+						Name: types.Name{Package: "pkgname", Name: "func() int"},
+						Kind: types.Func,
+						Signature: &types.Signature{
+							Parameters: []*types.Type{},
+							Results: []*types.Type{
+								{
+									Name: types.Name{Name: "int"},
+									Kind: types.Builtin,
+								},
+							},
+						},
+					},
+				},
+			},
+			expect: false,
+		},
+		{
+			typ: types.Type{
+				Name: types.Name{Package: "pkgname", Name: "typename"},
+				Kind: types.Builtin,
+				Methods: map[string]*types.Type{
+					// Correct signature.
+					"DeepCopy": {
+						Name: types.Name{Package: "pkgname", Name: "func() pkgname.typename"},
+						Kind: types.Func,
+						Signature: &types.Signature{
+							Parameters: []*types.Type{},
+							Results: []*types.Type{
+								{
+									Name: types.Name{Package: "pkgname", Name: "typename"},
+									Kind: types.Builtin,
+								},
+							},
+						},
+					},
+				},
+			},
+			expect: true,
+		},
+		{
+			typ: types.Type{
+				Name: types.Name{Package: "pkgname", Name: "typename"},
+				Kind: types.Builtin,
+				Methods: map[string]*types.Type{
+					// Wrong signature (has params).
+					"DeepCopy": {
+						Name: types.Name{Package: "pkgname", Name: "func(int) pkgname.typename"},
+						Kind: types.Func,
+						Signature: &types.Signature{
+							Parameters: []*types.Type{
+								{
+									Name: types.Name{Name: "int"},
+									Kind: types.Builtin,
+								},
+							},
+							Results: []*types.Type{
+								{
+									Name: types.Name{Package: "pkgname", Name: "typename"},
+									Kind: types.Builtin,
+								},
+							},
+						},
+					},
+				},
+			},
+			expect: false,
+		},
+		{
+			typ: types.Type{
+				Name: types.Name{Package: "pkgname", Name: "typename"},
+				Kind: types.Builtin,
+				Methods: map[string]*types.Type{
+					// Wrong signature (extra results).
+					"DeepCopy": {
+						Name: types.Name{Package: "pkgname", Name: "func() (pkgname.typename, int)"},
+						Kind: types.Func,
+						Signature: &types.Signature{
+							Parameters: []*types.Type{},
+							Results: []*types.Type{
+								{
+									Name: types.Name{Package: "pkgname", Name: "typename"},
+									Kind: types.Builtin,
+								},
+								{
+									Name: types.Name{Name: "int"},
+									Kind: types.Builtin,
+								},
+							},
+						},
+					},
+				},
+			},
+			expect: false,
+		},
+	}
+
+	for i, tc := range testCases {
+		r := hasDeepCopyMethod(&tc.typ)
+		if r != tc.expect {
+			t.Errorf("case[%d]: expected %t, got %t", i, tc.expect, r)
+		}
+	}
+}

cmd/libs/go2idl/parser/parse.go

@@ -570,7 +570,10 @@ func (b *Builder) walkType(u types.Universe, useName *types.Name, in tc.Type) *t
 		out.Kind = types.Interface
 		t.Complete()
 		for i := 0; i < t.NumMethods(); i++ {
-			out.Methods = append(out.Methods, b.walkType(u, nil, t.Method(i).Type()))
+			if out.Methods == nil {
+				out.Methods = map[string]*types.Type{}
+			}
+			out.Methods[t.Method(i).Name()] = b.walkType(u, nil, t.Method(i).Type())
 		}
 		return out
 	case *tc.Named:
@@ -599,7 +602,10 @@ func (b *Builder) walkType(u types.Universe, useName *types.Name, in tc.Type) *t
 				// methods, add them. (Interface types will
 				// have already added methods.)
 				for i := 0; i < t.NumMethods(); i++ {
-					out.Methods = append(out.Methods, b.walkType(u, nil, t.Method(i).Type()))
+					if out.Methods == nil {
+						out.Methods = map[string]*types.Type{}
+					}
+					out.Methods[t.Method(i).Name()] = b.walkType(u, nil, t.Method(i).Type())
 				}
 			}
 			return out

cmd/libs/go2idl/types/types.go

@@ -267,10 +267,10 @@ type Type struct {
 	// If Kind == DeclarationOf, this is the type of the declaration.
 	Underlying *Type
 
-	// If Kind == Interface, this is the list of all required functions.
+	// If Kind == Interface, this is the set of all required functions.
 	// Otherwise, if this is a named type, this is the list of methods that
 	// type has. (All elements will have Kind=="Func")
-	Methods []*Type
+	Methods map[string]*Type
 
 	// If Kind == func, this is the signature of the function.
 	Signature *Signature
@@ -285,9 +285,32 @@ func (t *Type) String() string {
 	return t.Name.String()
 }
 
-// IsAssignable returns whether the type is assignable.
+// IsPrimitive returns whether the type is a built-in type or is an alias to a
+// built-in type.  For example: strings and aliases of strings are primitives,
+// structs are not.
+func (t *Type) IsPrimitive() bool {
+	if t.Kind == Builtin || (t.Kind == Alias && t.Underlying.Kind == Builtin) {
+		return true
+	}
+	return false
+}
+
+// IsAssignable returns whether the type is deep-assignable.  For example,
+// slices and maps and pointers are shallow copies, but ints and strings are
+// complete.
 func (t *Type) IsAssignable() bool {
-	return t.Kind == Builtin || (t.Kind == Alias && t.Underlying.Kind == Builtin)
+	if t.IsPrimitive() {
+		return true
+	}
+	if t.Kind == Struct {
+		for _, m := range t.Members {
+			if !m.Type.IsAssignable() {
+				return false
+			}
+		}
+		return true
+	}
+	return false
 }
 
 // IsAnonymousStruct returns true if the type is an anonymous struct or an alias

cmd/libs/go2idl/types/types_test.go

@@ -45,3 +45,166 @@ func TestGetMarker(t *testing.T) {
 		t.Errorf("Expected marker type.")
 	}
 }
+
+func Test_Type_IsPrimitive(t *testing.T) {
+	testCases := []struct {
+		typ    Type
+		expect bool
+	}{
+		{
+			typ: Type{
+				Name: Name{Package: "pkgname", Name: "typename"},
+				Kind: Builtin,
+			},
+			expect: true,
+		},
+		{
+			typ: Type{
+				Name: Name{Package: "pkgname", Name: "typename"},
+				Kind: Alias,
+				Underlying: &Type{
+					Name: Name{Package: "pkgname", Name: "underlying"},
+					Kind: Builtin,
+				},
+			},
+			expect: true,
+		},
+		{
+			typ: Type{
+				Name: Name{Package: "pkgname", Name: "typename"},
+				Kind: Pointer,
+				Elem: &Type{
+					Name: Name{Package: "pkgname", Name: "pointee"},
+					Kind: Builtin,
+				},
+			},
+			expect: false,
+		},
+		{
+			typ: Type{
+				Name: Name{Package: "pkgname", Name: "typename"},
+				Kind: Struct,
+			},
+			expect: false,
+		},
+	}
+
+	for i, tc := range testCases {
+		r := tc.typ.IsPrimitive()
+		if r != tc.expect {
+			t.Errorf("case[%d]: expected %t, got %t", i, tc.expect, r)
+		}
+	}
+}
+
+func Test_Type_IsAssignable(t *testing.T) {
+	testCases := []struct {
+		typ    Type
+		expect bool
+	}{
+		{
+			typ: Type{
+				Name: Name{Package: "pkgname", Name: "typename"},
+				Kind: Builtin,
+			},
+			expect: true,
+		},
+		{
+			typ: Type{
+				Name: Name{Package: "pkgname", Name: "typename"},
+				Kind: Alias,
+				Underlying: &Type{
+					Name: Name{Package: "pkgname", Name: "underlying"},
+					Kind: Builtin,
+				},
+			},
+			expect: true,
+		},
+		{
+			typ: Type{
+				Name: Name{Package: "pkgname", Name: "typename"},
+				Kind: Pointer,
+				Elem: &Type{
+					Name: Name{Package: "pkgname", Name: "pointee"},
+					Kind: Builtin,
+				},
+			},
+			expect: false,
+		},
+		{
+			typ: Type{
+				Name: Name{Package: "pkgname", Name: "typename"},
+				Kind: Struct, // Empty struct
+			},
+			expect: true,
+		},
+		{
+			typ: Type{
+				Name: Name{Package: "pkgname", Name: "typename"},
+				Kind: Struct,
+				Members: []Member{
+					{
+						Name: "m1",
+						Type: &Type{
+							Name: Name{Package: "pkgname", Name: "typename"},
+							Kind: Builtin,
+						},
+					},
+					{
+						Name: "m2",
+						Type: &Type{
+							Name: Name{Package: "pkgname", Name: "typename"},
+							Kind: Alias,
+							Underlying: &Type{
+								Name: Name{Package: "pkgname", Name: "underlying"},
+								Kind: Builtin,
+							},
+						},
+					},
+					{
+						Name: "m3",
+						Type: &Type{
+							Name: Name{Package: "pkgname", Name: "typename"},
+							Kind: Struct, // Empty struct
+						},
+					},
+				},
+			},
+			expect: true,
+		},
+		{
+			typ: Type{
+				Name: Name{Package: "pkgname", Name: "typename"},
+				Kind: Struct,
+				Members: []Member{
+					{
+						Name: "m1",
+						Type: &Type{
+							Name: Name{Package: "pkgname", Name: "typename"},
+							Kind: Builtin,
+						},
+					},
+					{
+						Name: "m2",
+						Type: &Type{
+							Name: Name{Package: "pkgname", Name: "typename"},
+							Kind: Pointer,
+							Elem: &Type{
+								Name: Name{Package: "pkgname", Name: "pointee"},
+								Kind: Builtin,
+							},
+						},
+					},
+				},
+			},
+			expect: false,
+		},
+	}
+
+	for i, tc := range testCases {
+		r := tc.typ.IsAssignable()
+		if r != tc.expect {
+			t.Errorf("case[%d]: expected %t, got %t", i, tc.expect, r)
+		}
+	}
+}

federation/apis/federation/deep_copy_generated.go

@@ -22,7 +22,6 @@ package federation
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
 
@@ -41,9 +40,7 @@ func init() {
 }
 
 func DeepCopy_federation_Cluster(in Cluster, out *Cluster, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -59,24 +56,16 @@ func DeepCopy_federation_Cluster(in Cluster, out *Cluster, c *conversion.Cloner)
 func DeepCopy_federation_ClusterCondition(in ClusterCondition, out *ClusterCondition, c *conversion.Cloner) error {
 	out.Type = in.Type
 	out.Status = in.Status
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil {
+	out.LastProbeTime = in.LastProbeTime.DeepCopy()
-		return err
+	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
-	}
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastTransitionTime, &out.LastTransitionTime, c); err != nil {
-		return err
-	}
 	out.Reason = in.Reason
 	out.Message = in.Message
 	return nil
 }
 
 func DeepCopy_federation_ClusterList(in ClusterList, out *ClusterList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Cluster, len(in))
@@ -96,9 +85,7 @@ func DeepCopy_federation_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conver
 		in, out := in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
 		*out = make([]ServerAddressByClientCIDR, len(in))
 		for i := range in {
-			if err := DeepCopy_federation_ServerAddressByClientCIDR(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.ServerAddressByClientCIDRs = nil
@@ -106,9 +93,7 @@ func DeepCopy_federation_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conver
 	if in.SecretRef != nil {
 		in, out := in.SecretRef, &out.SecretRef
 		*out = new(api.LocalObjectReference)
-		if err := api.DeepCopy_api_LocalObjectReference(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.SecretRef = nil
 	}

federation/apis/federation/v1beta1/deep_copy_generated.go

@@ -22,7 +22,6 @@ package v1beta1
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
@@ -42,9 +41,7 @@ func init() {
 }
 
 func DeepCopy_v1beta1_Cluster(in Cluster, out *Cluster, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -60,24 +57,16 @@ func DeepCopy_v1beta1_Cluster(in Cluster, out *Cluster, c *conversion.Cloner) er
 func DeepCopy_v1beta1_ClusterCondition(in ClusterCondition, out *ClusterCondition, c *conversion.Cloner) error {
 	out.Type = in.Type
 	out.Status = in.Status
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil {
+	out.LastProbeTime = in.LastProbeTime.DeepCopy()
-		return err
+	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
-	}
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastTransitionTime, &out.LastTransitionTime, c); err != nil {
-		return err
-	}
 	out.Reason = in.Reason
 	out.Message = in.Message
 	return nil
 }
 
 func DeepCopy_v1beta1_ClusterList(in ClusterList, out *ClusterList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Cluster, len(in))
@@ -97,9 +86,7 @@ func DeepCopy_v1beta1_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conversio
 		in, out := in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
 		*out = make([]ServerAddressByClientCIDR, len(in))
 		for i := range in {
-			if err := DeepCopy_v1beta1_ServerAddressByClientCIDR(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.ServerAddressByClientCIDRs = nil
@@ -107,9 +94,7 @@ func DeepCopy_v1beta1_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conversio
 	if in.SecretRef != nil {
 		in, out := in.SecretRef, &out.SecretRef
 		*out = new(v1.LocalObjectReference)
-		if err := v1.DeepCopy_v1_LocalObjectReference(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.SecretRef = nil
 	}

pkg/api/resource/deep_copy.go

@@ -1,32 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package resource
-
-import (
-	inf "gopkg.in/inf.v0"
-
-	conversion "k8s.io/kubernetes/pkg/conversion"
-)
-
-func DeepCopy_resource_Quantity(in Quantity, out *Quantity, c *conversion.Cloner) error {
-	*out = in
-	if in.d.Dec != nil {
-		tmp := &inf.Dec{}
-		out.d.Dec = tmp.Set(in.d.Dec)
-	}
-	return nil
-}

pkg/api/resource/quantity.go

@@ -385,6 +385,16 @@ func ParseQuantity(str string) (Quantity, error) {
 	return Quantity{d: infDecAmount{amount}, Format: format}, nil
 }
 
+// DeepCopy returns a deep-copy of the Quantity value.  Note that the method
+// receiver is a value, so we can mutate it in-place and return it.
+func (q Quantity) DeepCopy() Quantity {
+	if q.d.Dec != nil {
+		tmp := &inf.Dec{}
+		q.d.Dec = tmp.Set(q.d.Dec)
+	}
+	return q
+}
+
 // CanonicalizeBytes returns the canonical form of q and its suffix (see comment on Quantity).
 //
 // Note about BinarySI:

pkg/api/unversioned/time.go

@@ -33,6 +33,13 @@ type Time struct {
 	time.Time `protobuf:"-"`
 }
 
+// DeepCopy returns a deep-copy of the Time value.  The underlying time.Time
+// type is effectively immutable in the time API, so it is safe to
+// copy-by-assign, despite the presence of (unexported) Pointer fields.
+func (t Time) DeepCopy() Time {
+	return t
+}
+
 // NewTime returns a wrapped instance of the provided time
 func NewTime(time time.Time) Time {
 	return Time{time}

pkg/apis/apps/deep_copy_generated.go

@@ -39,9 +39,7 @@ func init() {
 }
 
 func DeepCopy_apps_PetSet(in PetSet, out *PetSet, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -55,12 +53,8 @@ func DeepCopy_apps_PetSet(in PetSet, out *PetSet, c *conversion.Cloner) error {
 }
 
 func DeepCopy_apps_PetSetList(in PetSetList, out *PetSetList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]PetSet, len(in))

pkg/apis/apps/v1alpha1/deep_copy_generated.go

@@ -40,9 +40,7 @@ func init() {
 }
 
 func DeepCopy_v1alpha1_PetSet(in PetSet, out *PetSet, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -56,12 +54,8 @@ func DeepCopy_v1alpha1_PetSet(in PetSet, out *PetSet, c *conversion.Cloner) erro
 }
 
 func DeepCopy_v1alpha1_PetSetList(in PetSetList, out *PetSetList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]PetSet, len(in))

pkg/apis/authentication.k8s.io/deep_copy_generated.go

@@ -22,7 +22,6 @@ package authentication
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
 
@@ -39,12 +38,8 @@ func init() {
 }
 
 func DeepCopy_authenticationk8sio_TokenReview(in TokenReview, out *TokenReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.Spec = in.Spec
-	}
-	if err := DeepCopy_authenticationk8sio_TokenReviewSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
 	if err := DeepCopy_authenticationk8sio_TokenReviewStatus(in.Status, &out.Status, c); err != nil {
 		return err
 	}

pkg/apis/authentication.k8s.io/v1beta1/deep_copy_generated.go

@@ -22,7 +22,6 @@ package v1beta1
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
 
@@ -39,12 +38,8 @@ func init() {
 }
 
 func DeepCopy_v1beta1_TokenReview(in TokenReview, out *TokenReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.Spec = in.Spec
-	}
-	if err := DeepCopy_v1beta1_TokenReviewSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
 	if err := DeepCopy_v1beta1_TokenReviewStatus(in.Status, &out.Status, c); err != nil {
 		return err
 	}

pkg/apis/authorization/deep_copy_generated.go

@@ -22,7 +22,6 @@ package authorization
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
 
@@ -43,15 +42,11 @@ func init() {
 }
 
 func DeepCopy_authorization_LocalSubjectAccessReview(in LocalSubjectAccessReview, out *LocalSubjectAccessReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := DeepCopy_authorization_SubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_authorization_SubjectAccessReviewStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
@@ -73,15 +68,11 @@ func DeepCopy_authorization_ResourceAttributes(in ResourceAttributes, out *Resou
 }
 
 func DeepCopy_authorization_SelfSubjectAccessReview(in SelfSubjectAccessReview, out *SelfSubjectAccessReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := DeepCopy_authorization_SelfSubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_authorization_SubjectAccessReviewStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
@@ -89,18 +80,14 @@ func DeepCopy_authorization_SelfSubjectAccessReviewSpec(in SelfSubjectAccessRevi
 	if in.ResourceAttributes != nil {
 		in, out := in.ResourceAttributes, &out.ResourceAttributes
 		*out = new(ResourceAttributes)
-		if err := DeepCopy_authorization_ResourceAttributes(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.ResourceAttributes = nil
 	}
 	if in.NonResourceAttributes != nil {
 		in, out := in.NonResourceAttributes, &out.NonResourceAttributes
 		*out = new(NonResourceAttributes)
-		if err := DeepCopy_authorization_NonResourceAttributes(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.NonResourceAttributes = nil
 	}
@@ -108,15 +95,11 @@ func DeepCopy_authorization_SelfSubjectAccessReviewSpec(in SelfSubjectAccessRevi
 }
 
 func DeepCopy_authorization_SubjectAccessReview(in SubjectAccessReview, out *SubjectAccessReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := DeepCopy_authorization_SubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_authorization_SubjectAccessReviewStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
@@ -124,18 +107,14 @@ func DeepCopy_authorization_SubjectAccessReviewSpec(in SubjectAccessReviewSpec,
 	if in.ResourceAttributes != nil {
 		in, out := in.ResourceAttributes, &out.ResourceAttributes
 		*out = new(ResourceAttributes)
-		if err := DeepCopy_authorization_ResourceAttributes(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.ResourceAttributes = nil
 	}
 	if in.NonResourceAttributes != nil {
 		in, out := in.NonResourceAttributes, &out.NonResourceAttributes
 		*out = new(NonResourceAttributes)
-		if err := DeepCopy_authorization_NonResourceAttributes(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.NonResourceAttributes = nil
 	}

pkg/apis/authorization/v1beta1/deep_copy_generated.go

@@ -22,7 +22,6 @@ package v1beta1
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
 
@@ -43,15 +42,11 @@ func init() {
 }
 
 func DeepCopy_v1beta1_LocalSubjectAccessReview(in LocalSubjectAccessReview, out *LocalSubjectAccessReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := DeepCopy_v1beta1_SubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_v1beta1_SubjectAccessReviewStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
@@ -73,15 +68,11 @@ func DeepCopy_v1beta1_ResourceAttributes(in ResourceAttributes, out *ResourceAtt
 }
 
 func DeepCopy_v1beta1_SelfSubjectAccessReview(in SelfSubjectAccessReview, out *SelfSubjectAccessReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_v1beta1_SubjectAccessReviewStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
@@ -89,18 +80,14 @@ func DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(in SelfSubjectAccessReviewSpec
 	if in.ResourceAttributes != nil {
 		in, out := in.ResourceAttributes, &out.ResourceAttributes
 		*out = new(ResourceAttributes)
-		if err := DeepCopy_v1beta1_ResourceAttributes(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.ResourceAttributes = nil
 	}
 	if in.NonResourceAttributes != nil {
 		in, out := in.NonResourceAttributes, &out.NonResourceAttributes
 		*out = new(NonResourceAttributes)
-		if err := DeepCopy_v1beta1_NonResourceAttributes(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.NonResourceAttributes = nil
 	}
@@ -108,15 +95,11 @@ func DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(in SelfSubjectAccessReviewSpec
 }
 
 func DeepCopy_v1beta1_SubjectAccessReview(in SubjectAccessReview, out *SubjectAccessReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := DeepCopy_v1beta1_SubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_v1beta1_SubjectAccessReviewStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
@@ -124,18 +107,14 @@ func DeepCopy_v1beta1_SubjectAccessReviewSpec(in SubjectAccessReviewSpec, out *S
 	if in.ResourceAttributes != nil {
 		in, out := in.ResourceAttributes, &out.ResourceAttributes
 		*out = new(ResourceAttributes)
-		if err := DeepCopy_v1beta1_ResourceAttributes(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.ResourceAttributes = nil
 	}
 	if in.NonResourceAttributes != nil {
 		in, out := in.NonResourceAttributes, &out.NonResourceAttributes
 		*out = new(NonResourceAttributes)
-		if err := DeepCopy_v1beta1_NonResourceAttributes(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.NonResourceAttributes = nil
 	}

pkg/apis/autoscaling/deep_copy_generated.go

@@ -50,9 +50,7 @@ func DeepCopy_autoscaling_CrossVersionObjectReference(in CrossVersionObjectRefer
 }
 
 func DeepCopy_autoscaling_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -66,12 +64,8 @@ func DeepCopy_autoscaling_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, ou
 }
 
 func DeepCopy_autoscaling_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]HorizontalPodAutoscaler, len(in))
@@ -87,9 +81,7 @@ func DeepCopy_autoscaling_HorizontalPodAutoscalerList(in HorizontalPodAutoscaler
 }
 
 func DeepCopy_autoscaling_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error {
-	if err := DeepCopy_autoscaling_CrossVersionObjectReference(in.ScaleTargetRef, &out.ScaleTargetRef, c); err != nil {
+	out.ScaleTargetRef = in.ScaleTargetRef
-		return err
-	}
 	if in.MinReplicas != nil {
 		in, out := in.MinReplicas, &out.MinReplicas
 		*out = new(int32)
@@ -119,9 +111,7 @@ func DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscal
 	if in.LastScaleTime != nil {
 		in, out := in.LastScaleTime, &out.LastScaleTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.LastScaleTime = nil
 	}
@@ -138,18 +128,12 @@ func DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscal
 }
 
 func DeepCopy_autoscaling_Scale(in Scale, out *Scale, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_autoscaling_ScaleSpec(in.Spec, &out.Spec, c); err != nil {
+	out.Spec = in.Spec
-		return err
+	out.Status = in.Status
-	}
-	if err := DeepCopy_autoscaling_ScaleStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
 	return nil
 }
 

pkg/apis/autoscaling/v1/deep_copy_generated.go

@@ -51,9 +51,7 @@ func DeepCopy_v1_CrossVersionObjectReference(in CrossVersionObjectReference, out
 }
 
 func DeepCopy_v1_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api_v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -67,12 +65,8 @@ func DeepCopy_v1_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *Horizo
 }
 
 func DeepCopy_v1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]HorizontalPodAutoscaler, len(in))
@@ -88,9 +82,7 @@ func DeepCopy_v1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out
 }
 
 func DeepCopy_v1_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error {
-	if err := DeepCopy_v1_CrossVersionObjectReference(in.ScaleTargetRef, &out.ScaleTargetRef, c); err != nil {
+	out.ScaleTargetRef = in.ScaleTargetRef
-		return err
-	}
 	if in.MinReplicas != nil {
 		in, out := in.MinReplicas, &out.MinReplicas
 		*out = new(int32)
@@ -120,9 +112,7 @@ func DeepCopy_v1_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus,
 	if in.LastScaleTime != nil {
 		in, out := in.LastScaleTime, &out.LastScaleTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.LastScaleTime = nil
 	}
@@ -139,18 +129,12 @@ func DeepCopy_v1_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus,
 }
 
 func DeepCopy_v1_Scale(in Scale, out *Scale, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api_v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_v1_ScaleSpec(in.Spec, &out.Spec, c); err != nil {
+	out.Spec = in.Spec
-		return err
+	out.Status = in.Status
-	}
-	if err := DeepCopy_v1_ScaleStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
 	return nil
 }
 

pkg/apis/batch/deep_copy_generated.go

@@ -46,9 +46,7 @@ func init() {
 }
 
 func DeepCopy_batch_Job(in Job, out *Job, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -64,24 +62,16 @@ func DeepCopy_batch_Job(in Job, out *Job, c *conversion.Cloner) error {
 func DeepCopy_batch_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error {
 	out.Type = in.Type
 	out.Status = in.Status
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil {
+	out.LastProbeTime = in.LastProbeTime.DeepCopy()
-		return err
+	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
-	}
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastTransitionTime, &out.LastTransitionTime, c); err != nil {
-		return err
-	}
 	out.Reason = in.Reason
 	out.Message = in.Message
 	return nil
 }
 
 func DeepCopy_batch_JobList(in JobList, out *JobList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Job, len(in))
@@ -155,18 +145,14 @@ func DeepCopy_batch_JobStatus(in JobStatus, out *JobStatus, c *conversion.Cloner
 	if in.StartTime != nil {
 		in, out := in.StartTime, &out.StartTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.StartTime = nil
 	}
 	if in.CompletionTime != nil {
 		in, out := in.CompletionTime, &out.CompletionTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.CompletionTime = nil
 	}
@@ -177,9 +163,7 @@ func DeepCopy_batch_JobStatus(in JobStatus, out *JobStatus, c *conversion.Cloner
 }
 
 func DeepCopy_batch_JobTemplate(in JobTemplate, out *JobTemplate, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -200,9 +184,7 @@ func DeepCopy_batch_JobTemplateSpec(in JobTemplateSpec, out *JobTemplateSpec, c
 }
 
 func DeepCopy_batch_ScheduledJob(in ScheduledJob, out *ScheduledJob, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -216,12 +198,8 @@ func DeepCopy_batch_ScheduledJob(in ScheduledJob, out *ScheduledJob, c *conversi
 }
 
 func DeepCopy_batch_ScheduledJobList(in ScheduledJobList, out *ScheduledJobList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ScheduledJob, len(in))
@@ -264,9 +242,7 @@ func DeepCopy_batch_ScheduledJobStatus(in ScheduledJobStatus, out *ScheduledJobS
 		in, out := in.Active, &out.Active
 		*out = make([]api.ObjectReference, len(in))
 		for i := range in {
-			if err := api.DeepCopy_api_ObjectReference(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Active = nil
@@ -274,9 +250,7 @@ func DeepCopy_batch_ScheduledJobStatus(in ScheduledJobStatus, out *ScheduledJobS
 	if in.LastScheduleTime != nil {
 		in, out := in.LastScheduleTime, &out.LastScheduleTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.LastScheduleTime = nil
 	}

pkg/apis/batch/v1/deep_copy_generated.go

@@ -43,9 +43,7 @@ func init() {
 }
 
 func DeepCopy_v1_Job(in Job, out *Job, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api_v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -61,24 +59,16 @@ func DeepCopy_v1_Job(in Job, out *Job, c *conversion.Cloner) error {
 func DeepCopy_v1_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error {
 	out.Type = in.Type
 	out.Status = in.Status
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil {
+	out.LastProbeTime = in.LastProbeTime.DeepCopy()
-		return err
+	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
-	}
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastTransitionTime, &out.LastTransitionTime, c); err != nil {
-		return err
-	}
 	out.Reason = in.Reason
 	out.Message = in.Message
 	return nil
 }
 
 func DeepCopy_v1_JobList(in JobList, out *JobList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Job, len(in))
@@ -152,18 +142,14 @@ func DeepCopy_v1_JobStatus(in JobStatus, out *JobStatus, c *conversion.Cloner) e
 	if in.StartTime != nil {
 		in, out := in.StartTime, &out.StartTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.StartTime = nil
 	}
 	if in.CompletionTime != nil {
 		in, out := in.CompletionTime, &out.CompletionTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.CompletionTime = nil
 	}

pkg/apis/batch/v2alpha1/deep_copy_generated.go

@@ -49,9 +49,7 @@ func init() {
 }
 
 func DeepCopy_v2alpha1_Job(in Job, out *Job, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -67,24 +65,16 @@ func DeepCopy_v2alpha1_Job(in Job, out *Job, c *conversion.Cloner) error {
 func DeepCopy_v2alpha1_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error {
 	out.Type = in.Type
 	out.Status = in.Status
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil {
+	out.LastProbeTime = in.LastProbeTime.DeepCopy()
-		return err
+	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
-	}
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastTransitionTime, &out.LastTransitionTime, c); err != nil {
-		return err
-	}
 	out.Reason = in.Reason
 	out.Message = in.Message
 	return nil
 }
 
 func DeepCopy_v2alpha1_JobList(in JobList, out *JobList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Job, len(in))
@@ -158,18 +148,14 @@ func DeepCopy_v2alpha1_JobStatus(in JobStatus, out *JobStatus, c *conversion.Clo
 	if in.StartTime != nil {
 		in, out := in.StartTime, &out.StartTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.StartTime = nil
 	}
 	if in.CompletionTime != nil {
 		in, out := in.CompletionTime, &out.CompletionTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.CompletionTime = nil
 	}
@@ -180,9 +166,7 @@ func DeepCopy_v2alpha1_JobStatus(in JobStatus, out *JobStatus, c *conversion.Clo
 }
 
 func DeepCopy_v2alpha1_JobTemplate(in JobTemplate, out *JobTemplate, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -240,9 +224,7 @@ func DeepCopy_v2alpha1_LabelSelectorRequirement(in LabelSelectorRequirement, out
 }
 
 func DeepCopy_v2alpha1_ScheduledJob(in ScheduledJob, out *ScheduledJob, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -256,12 +238,8 @@ func DeepCopy_v2alpha1_ScheduledJob(in ScheduledJob, out *ScheduledJob, c *conve
 }
 
 func DeepCopy_v2alpha1_ScheduledJobList(in ScheduledJobList, out *ScheduledJobList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ScheduledJob, len(in))
@@ -304,9 +282,7 @@ func DeepCopy_v2alpha1_ScheduledJobStatus(in ScheduledJobStatus, out *ScheduledJ
 		in, out := in.Active, &out.Active
 		*out = make([]v1.ObjectReference, len(in))
 		for i := range in {
-			if err := v1.DeepCopy_v1_ObjectReference(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Active = nil
@@ -314,9 +290,7 @@ func DeepCopy_v2alpha1_ScheduledJobStatus(in ScheduledJobStatus, out *ScheduledJ
 	if in.LastScheduleTime != nil {
 		in, out := in.LastScheduleTime, &out.LastScheduleTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.LastScheduleTime = nil
 	}

pkg/apis/certificates/deep_copy_generated.go

@@ -22,7 +22,6 @@ package certificates
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
 
@@ -40,9 +39,7 @@ func init() {
 }
 
 func DeepCopy_certificates_CertificateSigningRequest(in CertificateSigningRequest, out *CertificateSigningRequest, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -59,19 +56,13 @@ func DeepCopy_certificates_CertificateSigningRequestCondition(in CertificateSign
 	out.Type = in.Type
 	out.Reason = in.Reason
 	out.Message = in.Message
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastUpdateTime, &out.LastUpdateTime, c); err != nil {
+	out.LastUpdateTime = in.LastUpdateTime.DeepCopy()
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_certificates_CertificateSigningRequestList(in CertificateSigningRequestList, out *CertificateSigningRequestList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]CertificateSigningRequest, len(in))

pkg/apis/certificates/v1alpha1/deep_copy_generated.go

@@ -22,7 +22,6 @@ package v1alpha1
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
@@ -41,9 +40,7 @@ func init() {
 }
 
 func DeepCopy_v1alpha1_CertificateSigningRequest(in CertificateSigningRequest, out *CertificateSigningRequest, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -60,19 +57,13 @@ func DeepCopy_v1alpha1_CertificateSigningRequestCondition(in CertificateSigningR
 	out.Type = in.Type
 	out.Reason = in.Reason
 	out.Message = in.Message
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastUpdateTime, &out.LastUpdateTime, c); err != nil {
+	out.LastUpdateTime = in.LastUpdateTime.DeepCopy()
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_v1alpha1_CertificateSigningRequestList(in CertificateSigningRequestList, out *CertificateSigningRequestList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]CertificateSigningRequest, len(in))

pkg/apis/componentconfig/deep_copy_generated.go

@@ -22,7 +22,6 @@ package componentconfig
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
 
@@ -55,9 +54,7 @@ func DeepCopy_componentconfig_IPVar(in IPVar, out *IPVar, c *conversion.Cloner)
 }
 
 func DeepCopy_componentconfig_KubeControllerManagerConfiguration(in KubeControllerManagerConfiguration, out *KubeControllerManagerConfiguration, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	out.Port = in.Port
 	out.Address = in.Address
 	out.CloudProvider = in.CloudProvider
@@ -74,46 +71,22 @@ func DeepCopy_componentconfig_KubeControllerManagerConfiguration(in KubeControll
 	out.LookupCacheSizeForRC = in.LookupCacheSizeForRC
 	out.LookupCacheSizeForRS = in.LookupCacheSizeForRS
 	out.LookupCacheSizeForDaemonSet = in.LookupCacheSizeForDaemonSet
-	if err := unversioned.DeepCopy_unversioned_Duration(in.ServiceSyncPeriod, &out.ServiceSyncPeriod, c); err != nil {
+	out.ServiceSyncPeriod = in.ServiceSyncPeriod
-		return err
+	out.NodeSyncPeriod = in.NodeSyncPeriod
-	}
+	out.ResourceQuotaSyncPeriod = in.ResourceQuotaSyncPeriod
-	if err := unversioned.DeepCopy_unversioned_Duration(in.NodeSyncPeriod, &out.NodeSyncPeriod, c); err != nil {
+	out.NamespaceSyncPeriod = in.NamespaceSyncPeriod
-		return err
+	out.PVClaimBinderSyncPeriod = in.PVClaimBinderSyncPeriod
-	}
+	out.MinResyncPeriod = in.MinResyncPeriod
-	if err := unversioned.DeepCopy_unversioned_Duration(in.ResourceQuotaSyncPeriod, &out.ResourceQuotaSyncPeriod, c); err != nil {
-		return err
-	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.NamespaceSyncPeriod, &out.NamespaceSyncPeriod, c); err != nil {
-		return err
-	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.PVClaimBinderSyncPeriod, &out.PVClaimBinderSyncPeriod, c); err != nil {
-		return err
-	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.MinResyncPeriod, &out.MinResyncPeriod, c); err != nil {
-		return err
-	}
 	out.TerminatedPodGCThreshold = in.TerminatedPodGCThreshold
-	if err := unversioned.DeepCopy_unversioned_Duration(in.HorizontalPodAutoscalerSyncPeriod, &out.HorizontalPodAutoscalerSyncPeriod, c); err != nil {
+	out.HorizontalPodAutoscalerSyncPeriod = in.HorizontalPodAutoscalerSyncPeriod
-		return err
+	out.DeploymentControllerSyncPeriod = in.DeploymentControllerSyncPeriod
-	}
+	out.PodEvictionTimeout = in.PodEvictionTimeout
-	if err := unversioned.DeepCopy_unversioned_Duration(in.DeploymentControllerSyncPeriod, &out.DeploymentControllerSyncPeriod, c); err != nil {
-		return err
-	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.PodEvictionTimeout, &out.PodEvictionTimeout, c); err != nil {
-		return err
-	}
 	out.DeletingPodsQps = in.DeletingPodsQps
 	out.DeletingPodsBurst = in.DeletingPodsBurst
-	if err := unversioned.DeepCopy_unversioned_Duration(in.NodeMonitorGracePeriod, &out.NodeMonitorGracePeriod, c); err != nil {
+	out.NodeMonitorGracePeriod = in.NodeMonitorGracePeriod
-		return err
-	}
 	out.RegisterRetryCount = in.RegisterRetryCount
-	if err := unversioned.DeepCopy_unversioned_Duration(in.NodeStartupGracePeriod, &out.NodeStartupGracePeriod, c); err != nil {
+	out.NodeStartupGracePeriod = in.NodeStartupGracePeriod
-		return err
+	out.NodeMonitorPeriod = in.NodeMonitorPeriod
-	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.NodeMonitorPeriod, &out.NodeMonitorPeriod, c); err != nil {
-		return err
-	}
 	out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
 	out.EnableProfiling = in.EnableProfiling
 	out.ClusterName = in.ClusterName
@@ -126,23 +99,15 @@ func DeepCopy_componentconfig_KubeControllerManagerConfiguration(in KubeControll
 	out.ContentType = in.ContentType
 	out.KubeAPIQPS = in.KubeAPIQPS
 	out.KubeAPIBurst = in.KubeAPIBurst
-	if err := DeepCopy_componentconfig_LeaderElectionConfiguration(in.LeaderElection, &out.LeaderElection, c); err != nil {
+	out.LeaderElection = in.LeaderElection
-		return err
+	out.VolumeConfiguration = in.VolumeConfiguration
-	}
+	out.ControllerStartInterval = in.ControllerStartInterval
-	if err := DeepCopy_componentconfig_VolumeConfiguration(in.VolumeConfiguration, &out.VolumeConfiguration, c); err != nil {
-		return err
-	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.ControllerStartInterval, &out.ControllerStartInterval, c); err != nil {
-		return err
-	}
 	out.EnableGarbageCollector = in.EnableGarbageCollector
 	return nil
 }
 
 func DeepCopy_componentconfig_KubeProxyConfiguration(in KubeProxyConfiguration, out *KubeProxyConfiguration, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	out.BindAddress = in.BindAddress
 	out.ClusterCIDR = in.ClusterCIDR
 	out.HealthzBindAddress = in.HealthzBindAddress
@@ -155,9 +120,7 @@ func DeepCopy_componentconfig_KubeProxyConfiguration(in KubeProxyConfiguration,
 	} else {
 		out.IPTablesMasqueradeBit = nil
 	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.IPTablesSyncPeriod, &out.IPTablesSyncPeriod, c); err != nil {
+	out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
-		return err
-	}
 	out.KubeconfigPath = in.KubeconfigPath
 	out.MasqueradeAll = in.MasqueradeAll
 	out.Master = in.Master
@@ -171,20 +134,14 @@ func DeepCopy_componentconfig_KubeProxyConfiguration(in KubeProxyConfiguration,
 	out.Mode = in.Mode
 	out.PortRange = in.PortRange
 	out.ResourceContainer = in.ResourceContainer
-	if err := unversioned.DeepCopy_unversioned_Duration(in.UDPIdleTimeout, &out.UDPIdleTimeout, c); err != nil {
+	out.UDPIdleTimeout = in.UDPIdleTimeout
-		return err
-	}
 	out.ConntrackMax = in.ConntrackMax
-	if err := unversioned.DeepCopy_unversioned_Duration(in.ConntrackTCPEstablishedTimeout, &out.ConntrackTCPEstablishedTimeout, c); err != nil {
+	out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_componentconfig_KubeSchedulerConfiguration(in KubeSchedulerConfiguration, out *KubeSchedulerConfiguration, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	out.Port = in.Port
 	out.Address = in.Address
 	out.AlgorithmProvider = in.AlgorithmProvider
@@ -196,23 +153,15 @@ func DeepCopy_componentconfig_KubeSchedulerConfiguration(in KubeSchedulerConfigu
 	out.SchedulerName = in.SchedulerName
 	out.HardPodAffinitySymmetricWeight = in.HardPodAffinitySymmetricWeight
 	out.FailureDomains = in.FailureDomains
-	if err := DeepCopy_componentconfig_LeaderElectionConfiguration(in.LeaderElection, &out.LeaderElection, c); err != nil {
+	out.LeaderElection = in.LeaderElection
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_componentconfig_KubeletConfiguration(in KubeletConfiguration, out *KubeletConfiguration, c *conversion.Cloner) error {
 	out.Config = in.Config
-	if err := unversioned.DeepCopy_unversioned_Duration(in.SyncFrequency, &out.SyncFrequency, c); err != nil {
+	out.SyncFrequency = in.SyncFrequency
-		return err
+	out.FileCheckFrequency = in.FileCheckFrequency
-	}
+	out.HTTPCheckFrequency = in.HTTPCheckFrequency
-	if err := unversioned.DeepCopy_unversioned_Duration(in.FileCheckFrequency, &out.FileCheckFrequency, c); err != nil {
-		return err
-	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.HTTPCheckFrequency, &out.HTTPCheckFrequency, c); err != nil {
-		return err
-	}
 	out.ManifestURL = in.ManifestURL
 	out.ManifestURLHeader = in.ManifestURLHeader
 	out.EnableServer = in.EnableServer
@@ -236,9 +185,7 @@ func DeepCopy_componentconfig_KubeletConfiguration(in KubeletConfiguration, out
 	out.EventRecordQPS = in.EventRecordQPS
 	out.EventBurst = in.EventBurst
 	out.EnableDebuggingHandlers = in.EnableDebuggingHandlers
-	if err := unversioned.DeepCopy_unversioned_Duration(in.MinimumGCAge, &out.MinimumGCAge, c); err != nil {
+	out.MinimumGCAge = in.MinimumGCAge
-		return err
-	}
 	out.MaxPerPodContainerCount = in.MaxPerPodContainerCount
 	out.MaxContainerCount = in.MaxContainerCount
 	out.CAdvisorPort = in.CAdvisorPort
@@ -249,21 +196,13 @@ func DeepCopy_componentconfig_KubeletConfiguration(in KubeletConfiguration, out
 	out.ClusterDomain = in.ClusterDomain
 	out.MasterServiceNamespace = in.MasterServiceNamespace
 	out.ClusterDNS = in.ClusterDNS
-	if err := unversioned.DeepCopy_unversioned_Duration(in.StreamingConnectionIdleTimeout, &out.StreamingConnectionIdleTimeout, c); err != nil {
+	out.StreamingConnectionIdleTimeout = in.StreamingConnectionIdleTimeout
-		return err
+	out.NodeStatusUpdateFrequency = in.NodeStatusUpdateFrequency
-	}
+	out.ImageMinimumGCAge = in.ImageMinimumGCAge
-	if err := unversioned.DeepCopy_unversioned_Duration(in.NodeStatusUpdateFrequency, &out.NodeStatusUpdateFrequency, c); err != nil {
-		return err
-	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.ImageMinimumGCAge, &out.ImageMinimumGCAge, c); err != nil {
-		return err
-	}
 	out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
 	out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
 	out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB
-	if err := unversioned.DeepCopy_unversioned_Duration(in.VolumeStatsAggPeriod, &out.VolumeStatsAggPeriod, c); err != nil {
+	out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod
-		return err
-	}
 	out.NetworkPluginName = in.NetworkPluginName
 	out.NetworkPluginDir = in.NetworkPluginDir
 	out.VolumePluginDir = in.VolumePluginDir
@@ -274,9 +213,7 @@ func DeepCopy_componentconfig_KubeletConfiguration(in KubeletConfiguration, out
 	out.SystemCgroups = in.SystemCgroups
 	out.CgroupRoot = in.CgroupRoot
 	out.ContainerRuntime = in.ContainerRuntime
-	if err := unversioned.DeepCopy_unversioned_Duration(in.RuntimeRequestTimeout, &out.RuntimeRequestTimeout, c); err != nil {
+	out.RuntimeRequestTimeout = in.RuntimeRequestTimeout
-		return err
-	}
 	out.RktPath = in.RktPath
 	out.RktAPIEndpoint = in.RktAPIEndpoint
 	out.RktStage1Image = in.RktStage1Image
@@ -300,9 +237,7 @@ func DeepCopy_componentconfig_KubeletConfiguration(in KubeletConfiguration, out
 	out.KubeAPIBurst = in.KubeAPIBurst
 	out.SerializeImagePulls = in.SerializeImagePulls
 	out.ExperimentalFlannelOverlay = in.ExperimentalFlannelOverlay
-	if err := unversioned.DeepCopy_unversioned_Duration(in.OutOfDiskTransitionFrequency, &out.OutOfDiskTransitionFrequency, c); err != nil {
+	out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency
-		return err
-	}
 	out.NodeIP = in.NodeIP
 	if in.NodeLabels != nil {
 		in, out := in.NodeLabels, &out.NodeLabels
@@ -318,9 +253,7 @@ func DeepCopy_componentconfig_KubeletConfiguration(in KubeletConfiguration, out
 	out.EvictionHard = in.EvictionHard
 	out.EvictionSoft = in.EvictionSoft
 	out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod
-	if err := unversioned.DeepCopy_unversioned_Duration(in.EvictionPressureTransitionPeriod, &out.EvictionPressureTransitionPeriod, c); err != nil {
+	out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod
-		return err
-	}
 	out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod
 	out.PodsPerCore = in.PodsPerCore
 	out.EnableControllerAttachDetach = in.EnableControllerAttachDetach
@@ -329,15 +262,9 @@ func DeepCopy_componentconfig_KubeletConfiguration(in KubeletConfiguration, out
 
 func DeepCopy_componentconfig_LeaderElectionConfiguration(in LeaderElectionConfiguration, out *LeaderElectionConfiguration, c *conversion.Cloner) error {
 	out.LeaderElect = in.LeaderElect
-	if err := unversioned.DeepCopy_unversioned_Duration(in.LeaseDuration, &out.LeaseDuration, c); err != nil {
+	out.LeaseDuration = in.LeaseDuration
-		return err
+	out.RenewDeadline = in.RenewDeadline
-	}
+	out.RetryPeriod = in.RetryPeriod
-	if err := unversioned.DeepCopy_unversioned_Duration(in.RenewDeadline, &out.RenewDeadline, c); err != nil {
-		return err
-	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.RetryPeriod, &out.RetryPeriod, c); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -366,9 +293,7 @@ func DeepCopy_componentconfig_PortRangeVar(in PortRangeVar, out *PortRangeVar, c
 func DeepCopy_componentconfig_VolumeConfiguration(in VolumeConfiguration, out *VolumeConfiguration, c *conversion.Cloner) error {
 	out.EnableHostPathProvisioning = in.EnableHostPathProvisioning
 	out.EnableDynamicProvisioning = in.EnableDynamicProvisioning
-	if err := DeepCopy_componentconfig_PersistentVolumeRecyclerConfiguration(in.PersistentVolumeRecyclerConfiguration, &out.PersistentVolumeRecyclerConfiguration, c); err != nil {
+	out.PersistentVolumeRecyclerConfiguration = in.PersistentVolumeRecyclerConfiguration
-		return err
-	}
 	out.FlexVolumePluginDir = in.FlexVolumePluginDir
 	return nil
 }

pkg/apis/componentconfig/v1alpha1/deep_copy_generated.go

@@ -22,7 +22,6 @@ package v1alpha1
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
 
@@ -38,9 +37,7 @@ func init() {
 }
 
 func DeepCopy_v1alpha1_KubeProxyConfiguration(in KubeProxyConfiguration, out *KubeProxyConfiguration, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	out.BindAddress = in.BindAddress
 	out.ClusterCIDR = in.ClusterCIDR
 	out.HealthzBindAddress = in.HealthzBindAddress
@@ -53,9 +50,7 @@ func DeepCopy_v1alpha1_KubeProxyConfiguration(in KubeProxyConfiguration, out *Ku
 	} else {
 		out.IPTablesMasqueradeBit = nil
 	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.IPTablesSyncPeriod, &out.IPTablesSyncPeriod, c); err != nil {
+	out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
-		return err
-	}
 	out.KubeconfigPath = in.KubeconfigPath
 	out.MasqueradeAll = in.MasqueradeAll
 	out.Master = in.Master
@@ -69,20 +64,14 @@ func DeepCopy_v1alpha1_KubeProxyConfiguration(in KubeProxyConfiguration, out *Ku
 	out.Mode = in.Mode
 	out.PortRange = in.PortRange
 	out.ResourceContainer = in.ResourceContainer
-	if err := unversioned.DeepCopy_unversioned_Duration(in.UDPIdleTimeout, &out.UDPIdleTimeout, c); err != nil {
+	out.UDPIdleTimeout = in.UDPIdleTimeout
-		return err
-	}
 	out.ConntrackMax = in.ConntrackMax
-	if err := unversioned.DeepCopy_unversioned_Duration(in.ConntrackTCPEstablishedTimeout, &out.ConntrackTCPEstablishedTimeout, c); err != nil {
+	out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_v1alpha1_KubeSchedulerConfiguration(in KubeSchedulerConfiguration, out *KubeSchedulerConfiguration, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	out.Port = in.Port
 	out.Address = in.Address
 	out.AlgorithmProvider = in.AlgorithmProvider
@@ -114,14 +103,8 @@ func DeepCopy_v1alpha1_LeaderElectionConfiguration(in LeaderElectionConfiguratio
 	} else {
 		out.LeaderElect = nil
 	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.LeaseDuration, &out.LeaseDuration, c); err != nil {
+	out.LeaseDuration = in.LeaseDuration
-		return err
+	out.RenewDeadline = in.RenewDeadline
-	}
+	out.RetryPeriod = in.RetryPeriod
-	if err := unversioned.DeepCopy_unversioned_Duration(in.RenewDeadline, &out.RenewDeadline, c); err != nil {
-		return err
-	}
-	if err := unversioned.DeepCopy_unversioned_Duration(in.RetryPeriod, &out.RetryPeriod, c); err != nil {
-		return err
-	}
 	return nil
 }

pkg/apis/extensions/deep_copy_generated.go

@@ -22,7 +22,6 @@ package extensions
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	resource "k8s.io/kubernetes/pkg/api/resource"
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 	intstr "k8s.io/kubernetes/pkg/util/intstr"
@@ -97,9 +96,7 @@ func DeepCopy_extensions_APIVersion(in APIVersion, out *APIVersion, c *conversio
 
 func DeepCopy_extensions_CustomMetricCurrentStatus(in CustomMetricCurrentStatus, out *CustomMetricCurrentStatus, c *conversion.Cloner) error {
 	out.Name = in.Name
-	if err := resource.DeepCopy_resource_Quantity(in.CurrentValue, &out.CurrentValue, c); err != nil {
+	out.CurrentValue = in.CurrentValue.DeepCopy()
-		return err
-	}
 	return nil
 }
 
@@ -120,9 +117,7 @@ func DeepCopy_extensions_CustomMetricCurrentStatusList(in CustomMetricCurrentSta
 
 func DeepCopy_extensions_CustomMetricTarget(in CustomMetricTarget, out *CustomMetricTarget, c *conversion.Cloner) error {
 	out.Name = in.Name
-	if err := resource.DeepCopy_resource_Quantity(in.TargetValue, &out.TargetValue, c); err != nil {
+	out.TargetValue = in.TargetValue.DeepCopy()
-		return err
-	}
 	return nil
 }
 
@@ -142,28 +137,20 @@ func DeepCopy_extensions_CustomMetricTargetList(in CustomMetricTargetList, out *
 }
 
 func DeepCopy_extensions_DaemonSet(in DaemonSet, out *DaemonSet, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_extensions_DaemonSetSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_extensions_DaemonSetStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_extensions_DaemonSetList(in DaemonSetList, out *DaemonSetList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]DaemonSet, len(in))
@@ -202,28 +189,20 @@ func DeepCopy_extensions_DaemonSetStatus(in DaemonSetStatus, out *DaemonSetStatu
 }
 
 func DeepCopy_extensions_Deployment(in Deployment, out *Deployment, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_extensions_DeploymentSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_extensions_DeploymentStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_extensions_DeploymentList(in DeploymentList, out *DeploymentList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Deployment, len(in))
@@ -239,9 +218,7 @@ func DeepCopy_extensions_DeploymentList(in DeploymentList, out *DeploymentList,
 }
 
 func DeepCopy_extensions_DeploymentRollback(in DeploymentRollback, out *DeploymentRollback, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	out.Name = in.Name
 	if in.UpdatedAnnotations != nil {
 		in, out := in.UpdatedAnnotations, &out.UpdatedAnnotations
@@ -252,9 +229,7 @@ func DeepCopy_extensions_DeploymentRollback(in DeploymentRollback, out *Deployme
 	} else {
 		out.UpdatedAnnotations = nil
 	}
-	if err := DeepCopy_extensions_RollbackConfig(in.RollbackTo, &out.RollbackTo, c); err != nil {
+	out.RollbackTo = in.RollbackTo
-		return err
-	}
 	return nil
 }
 
@@ -287,9 +262,7 @@ func DeepCopy_extensions_DeploymentSpec(in DeploymentSpec, out *DeploymentSpec,
 	if in.RollbackTo != nil {
 		in, out := in.RollbackTo, &out.RollbackTo
 		*out = new(RollbackConfig)
-		if err := DeepCopy_extensions_RollbackConfig(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.RollbackTo = nil
 	}
@@ -310,9 +283,7 @@ func DeepCopy_extensions_DeploymentStrategy(in DeploymentStrategy, out *Deployme
 	if in.RollingUpdate != nil {
 		in, out := in.RollingUpdate, &out.RollingUpdate
 		*out = new(RollingUpdateDeployment)
-		if err := DeepCopy_extensions_RollingUpdateDeployment(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.RollingUpdate = nil
 	}
@@ -325,9 +296,7 @@ func DeepCopy_extensions_FSGroupStrategyOptions(in FSGroupStrategyOptions, out *
 		in, out := in.Ranges, &out.Ranges
 		*out = make([]IDRange, len(in))
 		for i := range in {
-			if err := DeepCopy_extensions_IDRange(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Ranges = nil
@@ -337,9 +306,7 @@ func DeepCopy_extensions_FSGroupStrategyOptions(in FSGroupStrategyOptions, out *
 
 func DeepCopy_extensions_HTTPIngressPath(in HTTPIngressPath, out *HTTPIngressPath, c *conversion.Cloner) error {
 	out.Path = in.Path
-	if err := DeepCopy_extensions_IngressBackend(in.Backend, &out.Backend, c); err != nil {
+	out.Backend = in.Backend
-		return err
-	}
 	return nil
 }
 
@@ -348,9 +315,7 @@ func DeepCopy_extensions_HTTPIngressRuleValue(in HTTPIngressRuleValue, out *HTTP
 		in, out := in.Paths, &out.Paths
 		*out = make([]HTTPIngressPath, len(in))
 		for i := range in {
-			if err := DeepCopy_extensions_HTTPIngressPath(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Paths = nil
@@ -371,9 +336,7 @@ func DeepCopy_extensions_IDRange(in IDRange, out *IDRange, c *conversion.Cloner)
 }
 
 func DeepCopy_extensions_Ingress(in Ingress, out *Ingress, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -388,19 +351,13 @@ func DeepCopy_extensions_Ingress(in Ingress, out *Ingress, c *conversion.Cloner)
 
 func DeepCopy_extensions_IngressBackend(in IngressBackend, out *IngressBackend, c *conversion.Cloner) error {
 	out.ServiceName = in.ServiceName
-	if err := intstr.DeepCopy_intstr_IntOrString(in.ServicePort, &out.ServicePort, c); err != nil {
+	out.ServicePort = in.ServicePort
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_extensions_IngressList(in IngressList, out *IngressList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Ingress, len(in))
@@ -440,9 +397,7 @@ func DeepCopy_extensions_IngressSpec(in IngressSpec, out *IngressSpec, c *conver
 	if in.Backend != nil {
 		in, out := in.Backend, &out.Backend
 		*out = new(IngressBackend)
-		if err := DeepCopy_extensions_IngressBackend(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.Backend = nil
 	}
@@ -491,9 +446,7 @@ func DeepCopy_extensions_IngressTLS(in IngressTLS, out *IngressTLS, c *conversio
 }
 
 func DeepCopy_extensions_NetworkPolicy(in NetworkPolicy, out *NetworkPolicy, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -530,12 +483,8 @@ func DeepCopy_extensions_NetworkPolicyIngressRule(in NetworkPolicyIngressRule, o
 }
 
 func DeepCopy_extensions_NetworkPolicyList(in NetworkPolicyList, out *NetworkPolicyList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]NetworkPolicy, len(in))
@@ -576,20 +525,14 @@ func DeepCopy_extensions_NetworkPolicyPort(in NetworkPolicyPort, out *NetworkPol
 	if in.Protocol != nil {
 		in, out := in.Protocol, &out.Protocol
 		*out = new(api.Protocol)
-		if newVal, err := c.DeepCopy(*in); err != nil {
+		**out = *in
-			return err
-		} else {
-			**out = newVal.(api.Protocol)
-		}
 	} else {
 		out.Protocol = nil
 	}
 	if in.Port != nil {
 		in, out := in.Port, &out.Port
 		*out = new(intstr.IntOrString)
-		if err := intstr.DeepCopy_intstr_IntOrString(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.Port = nil
 	}
@@ -615,9 +558,7 @@ func DeepCopy_extensions_NetworkPolicySpec(in NetworkPolicySpec, out *NetworkPol
 }
 
 func DeepCopy_extensions_PodSecurityPolicy(in PodSecurityPolicy, out *PodSecurityPolicy, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -628,12 +569,8 @@ func DeepCopy_extensions_PodSecurityPolicy(in PodSecurityPolicy, out *PodSecurit
 }
 
 func DeepCopy_extensions_PodSecurityPolicyList(in PodSecurityPolicyList, out *PodSecurityPolicyList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]PodSecurityPolicy, len(in))
@@ -691,9 +628,7 @@ func DeepCopy_extensions_PodSecurityPolicySpec(in PodSecurityPolicySpec, out *Po
 		in, out := in.HostPorts, &out.HostPorts
 		*out = make([]HostPortRange, len(in))
 		for i := range in {
-			if err := DeepCopy_extensions_HostPortRange(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.HostPorts = nil
@@ -717,28 +652,20 @@ func DeepCopy_extensions_PodSecurityPolicySpec(in PodSecurityPolicySpec, out *Po
 }
 
 func DeepCopy_extensions_ReplicaSet(in ReplicaSet, out *ReplicaSet, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_extensions_ReplicaSetSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_extensions_ReplicaSetStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_extensions_ReplicaSetList(in ReplicaSetList, out *ReplicaSetList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ReplicaSet, len(in))
@@ -778,9 +705,7 @@ func DeepCopy_extensions_ReplicaSetStatus(in ReplicaSetStatus, out *ReplicaSetSt
 }
 
 func DeepCopy_extensions_ReplicationControllerDummy(in ReplicationControllerDummy, out *ReplicationControllerDummy, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	return nil
 }
 
@@ -790,12 +715,8 @@ func DeepCopy_extensions_RollbackConfig(in RollbackConfig, out *RollbackConfig,
 }
 
 func DeepCopy_extensions_RollingUpdateDeployment(in RollingUpdateDeployment, out *RollingUpdateDeployment, c *conversion.Cloner) error {
-	if err := intstr.DeepCopy_intstr_IntOrString(in.MaxUnavailable, &out.MaxUnavailable, c); err != nil {
+	out.MaxUnavailable = in.MaxUnavailable
-		return err
+	out.MaxSurge = in.MaxSurge
-	}
-	if err := intstr.DeepCopy_intstr_IntOrString(in.MaxSurge, &out.MaxSurge, c); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -805,9 +726,7 @@ func DeepCopy_extensions_RunAsUserStrategyOptions(in RunAsUserStrategyOptions, o
 		in, out := in.Ranges, &out.Ranges
 		*out = make([]IDRange, len(in))
 		for i := range in {
-			if err := DeepCopy_extensions_IDRange(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Ranges = nil
@@ -820,9 +739,7 @@ func DeepCopy_extensions_SELinuxStrategyOptions(in SELinuxStrategyOptions, out *
 	if in.SELinuxOptions != nil {
 		in, out := in.SELinuxOptions, &out.SELinuxOptions
 		*out = new(api.SELinuxOptions)
-		if err := api.DeepCopy_api_SELinuxOptions(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.SELinuxOptions = nil
 	}
@@ -830,15 +747,11 @@ func DeepCopy_extensions_SELinuxStrategyOptions(in SELinuxStrategyOptions, out *
 }
 
 func DeepCopy_extensions_Scale(in Scale, out *Scale, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_extensions_ScaleSpec(in.Spec, &out.Spec, c); err != nil {
+	out.Spec = in.Spec
-		return err
-	}
 	if err := DeepCopy_extensions_ScaleStatus(in.Status, &out.Status, c); err != nil {
 		return err
 	}
@@ -870,9 +783,7 @@ func DeepCopy_extensions_SupplementalGroupsStrategyOptions(in SupplementalGroups
 		in, out := in.Ranges, &out.Ranges
 		*out = make([]IDRange, len(in))
 		for i := range in {
-			if err := DeepCopy_extensions_IDRange(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Ranges = nil
@@ -881,9 +792,7 @@ func DeepCopy_extensions_SupplementalGroupsStrategyOptions(in SupplementalGroups
 }
 
 func DeepCopy_extensions_ThirdPartyResource(in ThirdPartyResource, out *ThirdPartyResource, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -892,9 +801,7 @@ func DeepCopy_extensions_ThirdPartyResource(in ThirdPartyResource, out *ThirdPar
 		in, out := in.Versions, &out.Versions
 		*out = make([]APIVersion, len(in))
 		for i := range in {
-			if err := DeepCopy_extensions_APIVersion(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Versions = nil
@@ -903,9 +810,7 @@ func DeepCopy_extensions_ThirdPartyResource(in ThirdPartyResource, out *ThirdPar
 }
 
 func DeepCopy_extensions_ThirdPartyResourceData(in ThirdPartyResourceData, out *ThirdPartyResourceData, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -920,12 +825,8 @@ func DeepCopy_extensions_ThirdPartyResourceData(in ThirdPartyResourceData, out *
 }
 
 func DeepCopy_extensions_ThirdPartyResourceDataList(in ThirdPartyResourceDataList, out *ThirdPartyResourceDataList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ThirdPartyResourceData, len(in))
@@ -941,12 +842,8 @@ func DeepCopy_extensions_ThirdPartyResourceDataList(in ThirdPartyResourceDataLis
 }
 
 func DeepCopy_extensions_ThirdPartyResourceList(in ThirdPartyResourceList, out *ThirdPartyResourceList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ThirdPartyResource, len(in))

pkg/apis/extensions/v1beta1/deep_copy_generated.go

@@ -22,7 +22,6 @@ package v1beta1
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	resource "k8s.io/kubernetes/pkg/api/resource"
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
@@ -118,9 +117,7 @@ func DeepCopy_v1beta1_CPUTargetUtilization(in CPUTargetUtilization, out *CPUTarg
 
 func DeepCopy_v1beta1_CustomMetricCurrentStatus(in CustomMetricCurrentStatus, out *CustomMetricCurrentStatus, c *conversion.Cloner) error {
 	out.Name = in.Name
-	if err := resource.DeepCopy_resource_Quantity(in.CurrentValue, &out.CurrentValue, c); err != nil {
+	out.CurrentValue = in.CurrentValue.DeepCopy()
-		return err
-	}
 	return nil
 }
 
@@ -141,9 +138,7 @@ func DeepCopy_v1beta1_CustomMetricCurrentStatusList(in CustomMetricCurrentStatus
 
 func DeepCopy_v1beta1_CustomMetricTarget(in CustomMetricTarget, out *CustomMetricTarget, c *conversion.Cloner) error {
 	out.Name = in.Name
-	if err := resource.DeepCopy_resource_Quantity(in.TargetValue, &out.TargetValue, c); err != nil {
+	out.TargetValue = in.TargetValue.DeepCopy()
-		return err
-	}
 	return nil
 }
 
@@ -163,28 +158,20 @@ func DeepCopy_v1beta1_CustomMetricTargetList(in CustomMetricTargetList, out *Cus
 }
 
 func DeepCopy_v1beta1_DaemonSet(in DaemonSet, out *DaemonSet, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_v1beta1_DaemonSetSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_v1beta1_DaemonSetStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_v1beta1_DaemonSetList(in DaemonSetList, out *DaemonSetList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]DaemonSet, len(in))
@@ -223,28 +210,20 @@ func DeepCopy_v1beta1_DaemonSetStatus(in DaemonSetStatus, out *DaemonSetStatus,
 }
 
 func DeepCopy_v1beta1_Deployment(in Deployment, out *Deployment, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_v1beta1_DeploymentSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_v1beta1_DeploymentStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_v1beta1_DeploymentList(in DeploymentList, out *DeploymentList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Deployment, len(in))
@@ -260,9 +239,7 @@ func DeepCopy_v1beta1_DeploymentList(in DeploymentList, out *DeploymentList, c *
 }
 
 func DeepCopy_v1beta1_DeploymentRollback(in DeploymentRollback, out *DeploymentRollback, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	out.Name = in.Name
 	if in.UpdatedAnnotations != nil {
 		in, out := in.UpdatedAnnotations, &out.UpdatedAnnotations
@@ -273,9 +250,7 @@ func DeepCopy_v1beta1_DeploymentRollback(in DeploymentRollback, out *DeploymentR
 	} else {
 		out.UpdatedAnnotations = nil
 	}
-	if err := DeepCopy_v1beta1_RollbackConfig(in.RollbackTo, &out.RollbackTo, c); err != nil {
+	out.RollbackTo = in.RollbackTo
-		return err
-	}
 	return nil
 }
 
@@ -314,9 +289,7 @@ func DeepCopy_v1beta1_DeploymentSpec(in DeploymentSpec, out *DeploymentSpec, c *
 	if in.RollbackTo != nil {
 		in, out := in.RollbackTo, &out.RollbackTo
 		*out = new(RollbackConfig)
-		if err := DeepCopy_v1beta1_RollbackConfig(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.RollbackTo = nil
 	}
@@ -347,9 +320,7 @@ func DeepCopy_v1beta1_DeploymentStrategy(in DeploymentStrategy, out *DeploymentS
 }
 
 func DeepCopy_v1beta1_ExportOptions(in ExportOptions, out *ExportOptions, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	out.Export = in.Export
 	out.Exact = in.Exact
 	return nil
@@ -361,9 +332,7 @@ func DeepCopy_v1beta1_FSGroupStrategyOptions(in FSGroupStrategyOptions, out *FSG
 		in, out := in.Ranges, &out.Ranges
 		*out = make([]IDRange, len(in))
 		for i := range in {
-			if err := DeepCopy_v1beta1_IDRange(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Ranges = nil
@@ -373,9 +342,7 @@ func DeepCopy_v1beta1_FSGroupStrategyOptions(in FSGroupStrategyOptions, out *FSG
 
 func DeepCopy_v1beta1_HTTPIngressPath(in HTTPIngressPath, out *HTTPIngressPath, c *conversion.Cloner) error {
 	out.Path = in.Path
-	if err := DeepCopy_v1beta1_IngressBackend(in.Backend, &out.Backend, c); err != nil {
+	out.Backend = in.Backend
-		return err
-	}
 	return nil
 }
 
@@ -384,9 +351,7 @@ func DeepCopy_v1beta1_HTTPIngressRuleValue(in HTTPIngressRuleValue, out *HTTPIng
 		in, out := in.Paths, &out.Paths
 		*out = make([]HTTPIngressPath, len(in))
 		for i := range in {
-			if err := DeepCopy_v1beta1_HTTPIngressPath(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Paths = nil
@@ -395,9 +360,7 @@ func DeepCopy_v1beta1_HTTPIngressRuleValue(in HTTPIngressRuleValue, out *HTTPIng
 }
 
 func DeepCopy_v1beta1_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -411,12 +374,8 @@ func DeepCopy_v1beta1_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *H
 }
 
 func DeepCopy_v1beta1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]HorizontalPodAutoscaler, len(in))
@@ -432,9 +391,7 @@ func DeepCopy_v1beta1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList
 }
 
 func DeepCopy_v1beta1_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error {
-	if err := DeepCopy_v1beta1_SubresourceReference(in.ScaleRef, &out.ScaleRef, c); err != nil {
+	out.ScaleRef = in.ScaleRef
-		return err
-	}
 	if in.MinReplicas != nil {
 		in, out := in.MinReplicas, &out.MinReplicas
 		*out = new(int32)
@@ -446,9 +403,7 @@ func DeepCopy_v1beta1_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec
 	if in.CPUUtilization != nil {
 		in, out := in.CPUUtilization, &out.CPUUtilization
 		*out = new(CPUTargetUtilization)
-		if err := DeepCopy_v1beta1_CPUTargetUtilization(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.CPUUtilization = nil
 	}
@@ -466,9 +421,7 @@ func DeepCopy_v1beta1_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerSt
 	if in.LastScaleTime != nil {
 		in, out := in.LastScaleTime, &out.LastScaleTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.LastScaleTime = nil
 	}
@@ -497,9 +450,7 @@ func DeepCopy_v1beta1_IDRange(in IDRange, out *IDRange, c *conversion.Cloner) er
 }
 
 func DeepCopy_v1beta1_Ingress(in Ingress, out *Ingress, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -514,19 +465,13 @@ func DeepCopy_v1beta1_Ingress(in Ingress, out *Ingress, c *conversion.Cloner) er
 
 func DeepCopy_v1beta1_IngressBackend(in IngressBackend, out *IngressBackend, c *conversion.Cloner) error {
 	out.ServiceName = in.ServiceName
-	if err := intstr.DeepCopy_intstr_IntOrString(in.ServicePort, &out.ServicePort, c); err != nil {
+	out.ServicePort = in.ServicePort
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_v1beta1_IngressList(in IngressList, out *IngressList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Ingress, len(in))
@@ -566,9 +511,7 @@ func DeepCopy_v1beta1_IngressSpec(in IngressSpec, out *IngressSpec, c *conversio
 	if in.Backend != nil {
 		in, out := in.Backend, &out.Backend
 		*out = new(IngressBackend)
-		if err := DeepCopy_v1beta1_IngressBackend(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.Backend = nil
 	}
@@ -617,9 +560,7 @@ func DeepCopy_v1beta1_IngressTLS(in IngressTLS, out *IngressTLS, c *conversion.C
 }
 
 func DeepCopy_v1beta1_Job(in Job, out *Job, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -635,24 +576,16 @@ func DeepCopy_v1beta1_Job(in Job, out *Job, c *conversion.Cloner) error {
 func DeepCopy_v1beta1_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error {
 	out.Type = in.Type
 	out.Status = in.Status
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil {
+	out.LastProbeTime = in.LastProbeTime.DeepCopy()
-		return err
+	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
-	}
-	if err := unversioned.DeepCopy_unversioned_Time(in.LastTransitionTime, &out.LastTransitionTime, c); err != nil {
-		return err
-	}
 	out.Reason = in.Reason
 	out.Message = in.Message
 	return nil
 }
 
 func DeepCopy_v1beta1_JobList(in JobList, out *JobList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Job, len(in))
@@ -726,18 +659,14 @@ func DeepCopy_v1beta1_JobStatus(in JobStatus, out *JobStatus, c *conversion.Clon
 	if in.StartTime != nil {
 		in, out := in.StartTime, &out.StartTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.StartTime = nil
 	}
 	if in.CompletionTime != nil {
 		in, out := in.CompletionTime, &out.CompletionTime
 		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
+		**out = in.DeepCopy()
-			return err
-		}
 	} else {
 		out.CompletionTime = nil
 	}
@@ -785,9 +714,7 @@ func DeepCopy_v1beta1_LabelSelectorRequirement(in LabelSelectorRequirement, out
 }
 
 func DeepCopy_v1beta1_ListOptions(in ListOptions, out *ListOptions, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	out.LabelSelector = in.LabelSelector
 	out.FieldSelector = in.FieldSelector
 	out.Watch = in.Watch
@@ -803,9 +730,7 @@ func DeepCopy_v1beta1_ListOptions(in ListOptions, out *ListOptions, c *conversio
 }
 
 func DeepCopy_v1beta1_NetworkPolicy(in NetworkPolicy, out *NetworkPolicy, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -842,12 +767,8 @@ func DeepCopy_v1beta1_NetworkPolicyIngressRule(in NetworkPolicyIngressRule, out
 }
 
 func DeepCopy_v1beta1_NetworkPolicyList(in NetworkPolicyList, out *NetworkPolicyList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]NetworkPolicy, len(in))
@@ -888,20 +809,14 @@ func DeepCopy_v1beta1_NetworkPolicyPort(in NetworkPolicyPort, out *NetworkPolicy
 	if in.Protocol != nil {
 		in, out := in.Protocol, &out.Protocol
 		*out = new(v1.Protocol)
-		if newVal, err := c.DeepCopy(*in); err != nil {
+		**out = *in
-			return err
-		} else {
-			**out = newVal.(v1.Protocol)
-		}
 	} else {
 		out.Protocol = nil
 	}
 	if in.Port != nil {
 		in, out := in.Port, &out.Port
 		*out = new(intstr.IntOrString)
-		if err := intstr.DeepCopy_intstr_IntOrString(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.Port = nil
 	}
@@ -927,9 +842,7 @@ func DeepCopy_v1beta1_NetworkPolicySpec(in NetworkPolicySpec, out *NetworkPolicy
 }
 
 func DeepCopy_v1beta1_PodSecurityPolicy(in PodSecurityPolicy, out *PodSecurityPolicy, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -940,12 +853,8 @@ func DeepCopy_v1beta1_PodSecurityPolicy(in PodSecurityPolicy, out *PodSecurityPo
 }
 
 func DeepCopy_v1beta1_PodSecurityPolicyList(in PodSecurityPolicyList, out *PodSecurityPolicyList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]PodSecurityPolicy, len(in))
@@ -1003,9 +912,7 @@ func DeepCopy_v1beta1_PodSecurityPolicySpec(in PodSecurityPolicySpec, out *PodSe
 		in, out := in.HostPorts, &out.HostPorts
 		*out = make([]HostPortRange, len(in))
 		for i := range in {
-			if err := DeepCopy_v1beta1_HostPortRange(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.HostPorts = nil
@@ -1029,28 +936,20 @@ func DeepCopy_v1beta1_PodSecurityPolicySpec(in PodSecurityPolicySpec, out *PodSe
 }
 
 func DeepCopy_v1beta1_ReplicaSet(in ReplicaSet, out *ReplicaSet, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_v1beta1_ReplicaSetSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_v1beta1_ReplicaSetStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_v1beta1_ReplicaSetList(in ReplicaSetList, out *ReplicaSetList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ReplicaSet, len(in))
@@ -1096,9 +995,7 @@ func DeepCopy_v1beta1_ReplicaSetStatus(in ReplicaSetStatus, out *ReplicaSetStatu
 }
 
 func DeepCopy_v1beta1_ReplicationControllerDummy(in ReplicationControllerDummy, out *ReplicationControllerDummy, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	return nil
 }
 
@@ -1111,18 +1008,14 @@ func DeepCopy_v1beta1_RollingUpdateDeployment(in RollingUpdateDeployment, out *R
 	if in.MaxUnavailable != nil {
 		in, out := in.MaxUnavailable, &out.MaxUnavailable
 		*out = new(intstr.IntOrString)
-		if err := intstr.DeepCopy_intstr_IntOrString(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.MaxUnavailable = nil
 	}
 	if in.MaxSurge != nil {
 		in, out := in.MaxSurge, &out.MaxSurge
 		*out = new(intstr.IntOrString)
-		if err := intstr.DeepCopy_intstr_IntOrString(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.MaxSurge = nil
 	}
@@ -1135,9 +1028,7 @@ func DeepCopy_v1beta1_RunAsUserStrategyOptions(in RunAsUserStrategyOptions, out
 		in, out := in.Ranges, &out.Ranges
 		*out = make([]IDRange, len(in))
 		for i := range in {
-			if err := DeepCopy_v1beta1_IDRange(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Ranges = nil
@@ -1150,9 +1041,7 @@ func DeepCopy_v1beta1_SELinuxStrategyOptions(in SELinuxStrategyOptions, out *SEL
 	if in.SELinuxOptions != nil {
 		in, out := in.SELinuxOptions, &out.SELinuxOptions
 		*out = new(v1.SELinuxOptions)
-		if err := v1.DeepCopy_v1_SELinuxOptions(*in, *out, c); err != nil {
+		**out = *in
-			return err
-		}
 	} else {
 		out.SELinuxOptions = nil
 	}
@@ -1160,15 +1049,11 @@ func DeepCopy_v1beta1_SELinuxStrategyOptions(in SELinuxStrategyOptions, out *SEL
 }
 
 func DeepCopy_v1beta1_Scale(in Scale, out *Scale, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_v1beta1_ScaleSpec(in.Spec, &out.Spec, c); err != nil {
+	out.Spec = in.Spec
-		return err
-	}
 	if err := DeepCopy_v1beta1_ScaleStatus(in.Status, &out.Status, c); err != nil {
 		return err
 	}
@@ -1209,9 +1094,7 @@ func DeepCopy_v1beta1_SupplementalGroupsStrategyOptions(in SupplementalGroupsStr
 		in, out := in.Ranges, &out.Ranges
 		*out = make([]IDRange, len(in))
 		for i := range in {
-			if err := DeepCopy_v1beta1_IDRange(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Ranges = nil
@@ -1220,9 +1103,7 @@ func DeepCopy_v1beta1_SupplementalGroupsStrategyOptions(in SupplementalGroupsStr
 }
 
 func DeepCopy_v1beta1_ThirdPartyResource(in ThirdPartyResource, out *ThirdPartyResource, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -1231,9 +1112,7 @@ func DeepCopy_v1beta1_ThirdPartyResource(in ThirdPartyResource, out *ThirdPartyR
 		in, out := in.Versions, &out.Versions
 		*out = make([]APIVersion, len(in))
 		for i := range in {
-			if err := DeepCopy_v1beta1_APIVersion(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Versions = nil
@@ -1242,9 +1121,7 @@ func DeepCopy_v1beta1_ThirdPartyResource(in ThirdPartyResource, out *ThirdPartyR
 }
 
 func DeepCopy_v1beta1_ThirdPartyResourceData(in ThirdPartyResourceData, out *ThirdPartyResourceData, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -1259,12 +1136,8 @@ func DeepCopy_v1beta1_ThirdPartyResourceData(in ThirdPartyResourceData, out *Thi
 }
 
 func DeepCopy_v1beta1_ThirdPartyResourceDataList(in ThirdPartyResourceDataList, out *ThirdPartyResourceDataList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ThirdPartyResourceData, len(in))
@@ -1280,12 +1153,8 @@ func DeepCopy_v1beta1_ThirdPartyResourceDataList(in ThirdPartyResourceDataList,
 }
 
 func DeepCopy_v1beta1_ThirdPartyResourceList(in ThirdPartyResourceList, out *ThirdPartyResourceList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ThirdPartyResource, len(in))

pkg/apis/policy/deep_copy_generated.go

@@ -24,7 +24,6 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
-	intstr "k8s.io/kubernetes/pkg/util/intstr"
 )
 
 func init() {
@@ -40,28 +39,20 @@ func init() {
 }
 
 func DeepCopy_policy_PodDisruptionBudget(in PodDisruptionBudget, out *PodDisruptionBudget, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_policy_PodDisruptionBudgetSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_policy_PodDisruptionBudgetStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_policy_PodDisruptionBudgetList(in PodDisruptionBudgetList, out *PodDisruptionBudgetList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]PodDisruptionBudget, len(in))
@@ -77,9 +68,7 @@ func DeepCopy_policy_PodDisruptionBudgetList(in PodDisruptionBudgetList, out *Po
 }
 
 func DeepCopy_policy_PodDisruptionBudgetSpec(in PodDisruptionBudgetSpec, out *PodDisruptionBudgetSpec, c *conversion.Cloner) error {
-	if err := intstr.DeepCopy_intstr_IntOrString(in.MinAvailable, &out.MinAvailable, c); err != nil {
+	out.MinAvailable = in.MinAvailable
-		return err
-	}
 	if in.Selector != nil {
 		in, out := in.Selector, &out.Selector
 		*out = new(unversioned.LabelSelector)

pkg/apis/policy/v1alpha1/deep_copy_generated.go

@@ -25,7 +25,6 @@ import (
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
-	intstr "k8s.io/kubernetes/pkg/util/intstr"
 )
 
 func init() {
@@ -41,28 +40,20 @@ func init() {
 }
 
 func DeepCopy_v1alpha1_PodDisruptionBudget(in PodDisruptionBudget, out *PodDisruptionBudget, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_v1alpha1_PodDisruptionBudgetSpec(in.Spec, &out.Spec, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_v1alpha1_PodDisruptionBudgetStatus(in.Status, &out.Status, c); err != nil {
+	out.Status = in.Status
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_v1alpha1_PodDisruptionBudgetList(in PodDisruptionBudgetList, out *PodDisruptionBudgetList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]PodDisruptionBudget, len(in))
@@ -78,9 +69,7 @@ func DeepCopy_v1alpha1_PodDisruptionBudgetList(in PodDisruptionBudgetList, out *
 }
 
 func DeepCopy_v1alpha1_PodDisruptionBudgetSpec(in PodDisruptionBudgetSpec, out *PodDisruptionBudgetSpec, c *conversion.Cloner) error {
-	if err := intstr.DeepCopy_intstr_IntOrString(in.MinAvailable, &out.MinAvailable, c); err != nil {
+	out.MinAvailable = in.MinAvailable
-		return err
-	}
 	if in.Selector != nil {
 		in, out := in.Selector, &out.Selector
 		*out = new(unversioned.LabelSelector)

pkg/apis/rbac/deep_copy_generated.go

@@ -22,7 +22,6 @@ package rbac
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 )
@@ -46,9 +45,7 @@ func init() {
 }
 
 func DeepCopy_rbac_ClusterRole(in ClusterRole, out *ClusterRole, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -67,9 +64,7 @@ func DeepCopy_rbac_ClusterRole(in ClusterRole, out *ClusterRole, c *conversion.C
 }
 
 func DeepCopy_rbac_ClusterRoleBinding(in ClusterRoleBinding, out *ClusterRoleBinding, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -77,26 +72,18 @@ func DeepCopy_rbac_ClusterRoleBinding(in ClusterRoleBinding, out *ClusterRoleBin
 		in, out := in.Subjects, &out.Subjects
 		*out = make([]Subject, len(in))
 		for i := range in {
-			if err := DeepCopy_rbac_Subject(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Subjects = nil
 	}
-	if err := api.DeepCopy_api_ObjectReference(in.RoleRef, &out.RoleRef, c); err != nil {
+	out.RoleRef = in.RoleRef
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_rbac_ClusterRoleBindingList(in ClusterRoleBindingList, out *ClusterRoleBindingList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ClusterRoleBinding, len(in))
@@ -112,12 +99,8 @@ func DeepCopy_rbac_ClusterRoleBindingList(in ClusterRoleBindingList, out *Cluste
 }
 
 func DeepCopy_rbac_ClusterRoleList(in ClusterRoleList, out *ClusterRoleList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ClusterRole, len(in))
@@ -179,9 +162,7 @@ func DeepCopy_rbac_PolicyRule(in PolicyRule, out *PolicyRule, c *conversion.Clon
 }
 
 func DeepCopy_rbac_Role(in Role, out *Role, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -200,9 +181,7 @@ func DeepCopy_rbac_Role(in Role, out *Role, c *conversion.Cloner) error {
 }
 
 func DeepCopy_rbac_RoleBinding(in RoleBinding, out *RoleBinding, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -210,26 +189,18 @@ func DeepCopy_rbac_RoleBinding(in RoleBinding, out *RoleBinding, c *conversion.C
 		in, out := in.Subjects, &out.Subjects
 		*out = make([]Subject, len(in))
 		for i := range in {
-			if err := DeepCopy_rbac_Subject(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Subjects = nil
 	}
-	if err := api.DeepCopy_api_ObjectReference(in.RoleRef, &out.RoleRef, c); err != nil {
+	out.RoleRef = in.RoleRef
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_rbac_RoleBindingList(in RoleBindingList, out *RoleBindingList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]RoleBinding, len(in))
@@ -245,12 +216,8 @@ func DeepCopy_rbac_RoleBindingList(in RoleBindingList, out *RoleBindingList, c *
 }
 
 func DeepCopy_rbac_RoleList(in RoleList, out *RoleList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Role, len(in))

pkg/apis/rbac/v1alpha1/deep_copy_generated.go

@@ -22,7 +22,6 @@ package v1alpha1
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
@@ -47,9 +46,7 @@ func init() {
 }
 
 func DeepCopy_v1alpha1_ClusterRole(in ClusterRole, out *ClusterRole, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -68,9 +65,7 @@ func DeepCopy_v1alpha1_ClusterRole(in ClusterRole, out *ClusterRole, c *conversi
 }
 
 func DeepCopy_v1alpha1_ClusterRoleBinding(in ClusterRoleBinding, out *ClusterRoleBinding, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -78,26 +73,18 @@ func DeepCopy_v1alpha1_ClusterRoleBinding(in ClusterRoleBinding, out *ClusterRol
 		in, out := in.Subjects, &out.Subjects
 		*out = make([]Subject, len(in))
 		for i := range in {
-			if err := DeepCopy_v1alpha1_Subject(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Subjects = nil
 	}
-	if err := v1.DeepCopy_v1_ObjectReference(in.RoleRef, &out.RoleRef, c); err != nil {
+	out.RoleRef = in.RoleRef
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_v1alpha1_ClusterRoleBindingList(in ClusterRoleBindingList, out *ClusterRoleBindingList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ClusterRoleBinding, len(in))
@@ -113,12 +100,8 @@ func DeepCopy_v1alpha1_ClusterRoleBindingList(in ClusterRoleBindingList, out *Cl
 }
 
 func DeepCopy_v1alpha1_ClusterRoleList(in ClusterRoleList, out *ClusterRoleList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]ClusterRole, len(in))
@@ -176,9 +159,7 @@ func DeepCopy_v1alpha1_PolicyRule(in PolicyRule, out *PolicyRule, c *conversion.
 }
 
 func DeepCopy_v1alpha1_Role(in Role, out *Role, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -197,9 +178,7 @@ func DeepCopy_v1alpha1_Role(in Role, out *Role, c *conversion.Cloner) error {
 }
 
 func DeepCopy_v1alpha1_RoleBinding(in RoleBinding, out *RoleBinding, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
-	}
 	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 		return err
 	}
@@ -207,26 +186,18 @@ func DeepCopy_v1alpha1_RoleBinding(in RoleBinding, out *RoleBinding, c *conversi
 		in, out := in.Subjects, &out.Subjects
 		*out = make([]Subject, len(in))
 		for i := range in {
-			if err := DeepCopy_v1alpha1_Subject(in[i], &(*out)[i], c); err != nil {
+			(*out)[i] = in[i]
-				return err
-			}
 		}
 	} else {
 		out.Subjects = nil
 	}
-	if err := v1.DeepCopy_v1_ObjectReference(in.RoleRef, &out.RoleRef, c); err != nil {
+	out.RoleRef = in.RoleRef
-		return err
-	}
 	return nil
 }
 
 func DeepCopy_v1alpha1_RoleBindingList(in RoleBindingList, out *RoleBindingList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]RoleBinding, len(in))
@@ -242,12 +213,8 @@ func DeepCopy_v1alpha1_RoleBindingList(in RoleBindingList, out *RoleBindingList,
 }
 
 func DeepCopy_v1alpha1_RoleList(in RoleList, out *RoleList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	out.TypeMeta = in.TypeMeta
-		return err
+	out.ListMeta = in.ListMeta
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
 	if in.Items != nil {
 		in, out := in.Items, &out.Items
 		*out = make([]Role, len(in))