Merge pull request #28679 from sttts/sttts-deepcopy-pointer-in

Automatic merge from submit-queue

Deepcopy: avoid struct copies and reflection Call

- make signature of generated deepcopy methods symmetric with `in *type, out *type`, avoiding copies of big structs on the stack
- switch to `in interface{}, out interface{}` which allows us to call them with without `reflect.Call`

The first change reduces runtime of BenchmarkPodCopy-4 from `> 3500ns` to around `2300ns`.

The second change reduces runtime to around `1900ns`.

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

@@ -204,6 +204,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 const (
 	apiPackagePath        = "k8s.io/kubernetes/pkg/api"
 	conversionPackagePath = "k8s.io/kubernetes/pkg/conversion"
+	runtimePackagePath    = "k8s.io/kubernetes/pkg/runtime"
 )
 
 // genDeepCopy produces a file with autogenerated deep-copy functions.
@@ -384,8 +385,10 @@ func (g *genDeepCopy) Init(c *generator.Context, w io.Writer) error {
 	sw.Do("if err := $.scheme|raw$.AddGeneratedDeepCopyFuncs(\n", map[string]interface{}{
 		"scheme": scheme,
 	})
+	reflect := c.Universe.Type(types.Name{Package: "reflect", Name: "TypeOf"})
 	for _, t := range g.typesForInit {
-		sw.Do(fmt.Sprintf("%s,\n", g.funcNameTmpl(t)), argsFromType(t))
+		g.imports.AddType(reflect)
+		sw.Do(fmt.Sprintf("conversion.GeneratedDeepCopyFunc{Fn: %s, InType: reflect.TypeOf(func() *$.type|raw$ {var x *$.type|raw$; return x}())},\n", g.funcNameTmpl(t)), argsFromType(t))
 	}
 	sw.Do("); err != nil {\n", nil)
 	sw.Do("// if one of the deep copy functions is malformed, detect it immediately.\n", nil)
@@ -425,10 +428,11 @@ func (g *genDeepCopy) GenerateType(c *generator.Context, t *types.Type, w io.Wri
 
 	sw := generator.NewSnippetWriter(w, c, "$", "$")
 	funcName := g.funcNameTmpl(t)
-	sw.Do(fmt.Sprintf("func %s(in $.type|raw$, out *$.type|raw$, c *$.Cloner|raw$) error {\n", funcName), g.withGlobals(argsFromType(t)))
+	sw.Do(fmt.Sprintf("func %s(in interface{}, out interface{}, c *$.Cloner|raw$) error {{\n", funcName), g.withGlobals(argsFromType(t)))
+	sw.Do("in := in.(*$.type|raw$)\nout := out.(*$.type|raw$)\n", g.withGlobals(argsFromType(t)))
 	g.generateFor(t, sw)
 	sw.Do("return nil\n", nil)
-	sw.Do("}\n\n", nil)
+	sw.Do("}}\n\n", nil)
 	return sw.Error()
 }
 
@@ -459,7 +463,7 @@ func (g *genDeepCopy) generateFor(t *types.Type, sw *generator.SnippetWriter) {
 }
 
 func (g *genDeepCopy) doBuiltin(t *types.Type, sw *generator.SnippetWriter) {
-	sw.Do("*out = in\n", nil)
+	sw.Do("*out = *in\n", nil)
 }
 
 func (g *genDeepCopy) doMap(t *types.Type, sw *generator.SnippetWriter) {
@@ -467,63 +471,63 @@ func (g *genDeepCopy) doMap(t *types.Type, sw *generator.SnippetWriter) {
 	if t.Key.IsAssignable() {
 		switch {
 		case hasDeepCopyMethod(t.Elem):
-			sw.Do("for key, val := range in {\n", nil)
+			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("for key := range *in {\n", nil)
 			sw.Do("(*out)[key] = struct{}{}\n", nil)
 			sw.Do("}\n", nil)
 		case t.Elem.IsAssignable():
-			sw.Do("for key, val := range in {\n", nil)
+			sw.Do("for key, val := range *in {\n", nil)
 			sw.Do("(*out)[key] = val\n", nil)
 			sw.Do("}\n", nil)
 		default:
-			sw.Do("for key, val := range in {\n", nil)
+			sw.Do("for key, val := range *in {\n", nil)
 			if g.copyableAndInBounds(t.Elem) {
 				sw.Do("newVal := new($.|raw$)\n", t.Elem)
 				funcName := g.funcNameTmpl(t.Elem)
-				sw.Do(fmt.Sprintf("if err := %s(val, newVal, c); err != nil {\n", funcName), argsFromType(t.Elem))
+				sw.Do(fmt.Sprintf("if err := %s(&val, newVal, c); err != nil {\n", funcName), argsFromType(t.Elem))
 				sw.Do("return err\n", nil)
 				sw.Do("}\n", nil)
 				sw.Do("(*out)[key] = *newVal\n", nil)
 			} else {
-				sw.Do("if newVal, err := c.DeepCopy(val); err != nil {\n", nil)
+				sw.Do("if newVal, err := c.DeepCopy(&val); err != nil {\n", nil)
 				sw.Do("return err\n", nil)
 				sw.Do("} else {\n", nil)
-				sw.Do("(*out)[key] = newVal.($.|raw$)\n", t.Elem)
+				sw.Do("(*out)[key] = *newVal.(*$.|raw$)\n", t.Elem)
 				sw.Do("}\n", nil)
 			}
 			sw.Do("}\n", nil)
 		}
 	} else {
 		// TODO: Implement it when necessary.
-		sw.Do("for range in {\n", nil)
+		sw.Do("for range *in {\n", nil)
 		sw.Do("// FIXME: Copying unassignable keys unsupported $.|raw$\n", t.Key)
 		sw.Do("}\n", nil)
 	}
 }
 
 func (g *genDeepCopy) doSlice(t *types.Type, sw *generator.SnippetWriter) {
-	sw.Do("*out = make($.|raw$, len(in))\n", t)
+	sw.Do("*out = make($.|raw$, len(*in))\n", t)
 	if t.Elem.Kind == types.Builtin {
-		sw.Do("copy(*out, in)\n", nil)
+		sw.Do("copy(*out, *in)\n", nil)
 	} else {
-		sw.Do("for i := range in {\n", nil)
+		sw.Do("for i := range *in {\n", nil)
 		if hasDeepCopyMethod(t.Elem) {
-			sw.Do("(*out)[i] = in[i].DeepCopy()\n", nil)
+			sw.Do("(*out)[i] = (*in)[i].DeepCopy()\n", nil)
 		} else if t.Elem.IsAssignable() {
-			sw.Do("(*out)[i] = in[i]\n", nil)
+			sw.Do("(*out)[i] = (*in)[i]\n", nil)
 		} else if g.copyableAndInBounds(t.Elem) {
 			funcName := g.funcNameTmpl(t.Elem)
-			sw.Do(fmt.Sprintf("if err := %s(in[i], &(*out)[i], c); err != nil {\n", funcName), argsFromType(t.Elem))
+			sw.Do(fmt.Sprintf("if err := %s(&(*in)[i], &(*out)[i], c); err != nil {\n", funcName), argsFromType(t.Elem))
 			sw.Do("return err\n", nil)
 			sw.Do("}\n", nil)
 		} else {
-			sw.Do("if newVal, err := c.DeepCopy(in[i]); err != nil {\n", nil)
+			sw.Do("if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {\n", nil)
 			sw.Do("return err\n", nil)
 			sw.Do("} else {\n", nil)
-			sw.Do("(*out)[i] = newVal.($.|raw$)\n", t.Elem)
+			sw.Do("(*out)[i] = *newVal.(*$.|raw$)\n", t.Elem)
 			sw.Do("}\n", nil)
 		}
 		sw.Do("}\n", nil)
@@ -531,6 +535,10 @@ func (g *genDeepCopy) doSlice(t *types.Type, sw *generator.SnippetWriter) {
 }
 
 func (g *genDeepCopy) doStruct(t *types.Type, sw *generator.SnippetWriter) {
+	if len(t.Members) == 0 {
+		// at least do something with in/out to avoid "declared and not used" errors
+		sw.Do("_ = in\n_ = out\n", nil)
+	}
 	for _, m := range t.Members {
 		t := m.Type
 		if t.Kind == types.Alias {
@@ -547,7 +555,7 @@ func (g *genDeepCopy) doStruct(t *types.Type, sw *generator.SnippetWriter) {
 			sw.Do("out.$.name$ = in.$.name$\n", args)
 		case types.Map, types.Slice, types.Pointer:
 			sw.Do("if in.$.name$ != nil {\n", args)
-			sw.Do("in, out := in.$.name$, &out.$.name$\n", args)
+			sw.Do("in, out := &in.$.name$, &out.$.name$\n", args)
 			g.generateFor(t, sw)
 			sw.Do("} else {\n", nil)
 			sw.Do("out.$.name$ = nil\n", args)
@@ -559,23 +567,23 @@ func (g *genDeepCopy) doStruct(t *types.Type, sw *generator.SnippetWriter) {
 				sw.Do("out.$.name$ = in.$.name$\n", args)
 			} else if g.copyableAndInBounds(t) {
 				funcName := g.funcNameTmpl(t)
-				sw.Do(fmt.Sprintf("if err := %s(in.$.name$, &out.$.name$, c); err != nil {\n", funcName), args)
+				sw.Do(fmt.Sprintf("if err := %s(&in.$.name$, &out.$.name$, c); err != nil {\n", funcName), args)
 				sw.Do("return err\n", nil)
 				sw.Do("}\n", nil)
 			} else {
-				sw.Do("if newVal, err := c.DeepCopy(in.$.name$); err != nil {\n", args)
+				sw.Do("if newVal, err := c.DeepCopy(&in.$.name$); err != nil {\n", args)
 				sw.Do("return err\n", nil)
 				sw.Do("} else {\n", nil)
-				sw.Do("out.$.name$ = newVal.($.type|raw$)\n", args)
+				sw.Do("out.$.name$ = *newVal.(*$.type|raw$)\n", args)
 				sw.Do("}\n", nil)
 			}
 		default:
 			sw.Do("if in.$.name$ == nil {\n", args)
 			sw.Do("out.$.name$ = nil\n", args)
-			sw.Do("} else if newVal, err := c.DeepCopy(in.$.name$); err != nil {\n", args)
+			sw.Do("} else if newVal, err := c.DeepCopy(&in.$.name$); err != nil {\n", args)
 			sw.Do("return err\n", nil)
 			sw.Do("} else {\n", nil)
-			sw.Do("out.$.name$ = newVal.($.type|raw$)\n", args)
+			sw.Do("out.$.name$ = *newVal.(*$.type|raw$)\n", args)
 			sw.Do("}\n", nil)
 		}
 	}
@@ -587,13 +595,15 @@ 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 hasDeepCopyMethod(t.Elem) {
-		sw.Do("**out = in.DeepCopy()\n", nil)
+		sw.Do("*out = new($.Elem|raw$)\n", t)
+		sw.Do("**out = (*in).DeepCopy()\n", nil)
 	} else if t.Elem.IsAssignable() {
-		sw.Do("**out = *in", nil)
+		sw.Do("*out = new($.Elem|raw$)\n", t)
+		sw.Do("**out = **in", nil)
 	} else if g.copyableAndInBounds(t.Elem) {
 		funcName := g.funcNameTmpl(t.Elem)
+		sw.Do("*out = new($.Elem|raw$)\n", t)
 		sw.Do(fmt.Sprintf("if err := %s(*in, *out, c); err != nil {\n", funcName), argsFromType(t.Elem))
 		sw.Do("return err\n", nil)
 		sw.Do("}\n", nil)
@@ -601,7 +611,7 @@ func (g *genDeepCopy) doPointer(t *types.Type, sw *generator.SnippetWriter) {
 		sw.Do("if newVal, err := c.DeepCopy(*in); err != nil {\n", nil)
 		sw.Do("return err\n", nil)
 		sw.Do("} else {\n", nil)
-		sw.Do("**out = newVal.($.|raw$)\n", t.Elem)
+		sw.Do("*out = newVal.($.|raw$)\n", t.Elem)
 		sw.Do("}\n", nil)
 	}
 }

federation/apis/federation/deep_copy_generated.go

@@ -23,108 +23,133 @@ package federation
 import (
 	api "k8s.io/kubernetes/pkg/api"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_federation_Cluster,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_Cluster, InType: reflect.TypeOf(func() *Cluster { var x *Cluster; return x }())},
-		DeepCopy_federation_ClusterCondition,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterCondition, InType: reflect.TypeOf(func() *ClusterCondition { var x *ClusterCondition; return x }())},
-		DeepCopy_federation_ClusterList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterList, InType: reflect.TypeOf(func() *ClusterList { var x *ClusterList; return x }())},
-		DeepCopy_federation_ClusterSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterSpec, InType: reflect.TypeOf(func() *ClusterSpec { var x *ClusterSpec; return x }())},
-		DeepCopy_federation_ClusterStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterStatus, InType: reflect.TypeOf(func() *ClusterStatus { var x *ClusterStatus; return x }())},
-		DeepCopy_federation_ServerAddressByClientCIDR,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ServerAddressByClientCIDR, InType: reflect.TypeOf(func() *ServerAddressByClientCIDR { var x *ServerAddressByClientCIDR; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_federation_Cluster(in Cluster, out *Cluster, c *conversion.Cloner) error {
+func DeepCopy_federation_Cluster(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*Cluster)
-		return err
+		out := out.(*Cluster)
+		out.TypeMeta = in.TypeMeta
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_federation_ClusterSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_federation_ClusterStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	if err := DeepCopy_federation_ClusterSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_federation_ClusterStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
 }
 
-func DeepCopy_federation_ClusterCondition(in ClusterCondition, out *ClusterCondition, c *conversion.Cloner) error {
+func DeepCopy_federation_ClusterCondition(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Type = in.Type
+	{
-	out.Status = in.Status
+		in := in.(*ClusterCondition)
-	out.LastProbeTime = in.LastProbeTime.DeepCopy()
+		out := out.(*ClusterCondition)
-	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
+		out.Type = in.Type
-	out.Reason = in.Reason
+		out.Status = in.Status
-	out.Message = in.Message
+		out.LastProbeTime = in.LastProbeTime.DeepCopy()
-	return nil
+		out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
+		out.Reason = in.Reason
+		out.Message = in.Message
+		return nil
+	}
 }
 
-func DeepCopy_federation_ClusterList(in ClusterList, out *ClusterList, c *conversion.Cloner) error {
+func DeepCopy_federation_ClusterList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.ListMeta = in.ListMeta
+		in := in.(*ClusterList)
-	if in.Items != nil {
+		out := out.(*ClusterList)
-		in, out := in.Items, &out.Items
+		out.TypeMeta = in.TypeMeta
-		*out = make([]Cluster, len(in))
+		out.ListMeta = in.ListMeta
-		for i := range in {
+		if in.Items != nil {
-			if err := DeepCopy_federation_Cluster(in[i], &(*out)[i], c); err != nil {
+			in, out := &in.Items, &out.Items
-				return err
+			*out = make([]Cluster, len(*in))
+			for i := range *in {
+				if err := DeepCopy_federation_Cluster(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
 			}
+		} else {
+			out.Items = nil
 		}
-	} else {
+		return nil
-		out.Items = nil
 	}
-	return nil
 }
 
-func DeepCopy_federation_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conversion.Cloner) error {
+func DeepCopy_federation_ClusterSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.ServerAddressByClientCIDRs != nil {
+	{
-		in, out := in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
+		in := in.(*ClusterSpec)
-		*out = make([]ServerAddressByClientCIDR, len(in))
+		out := out.(*ClusterSpec)
-		for i := range in {
+		if in.ServerAddressByClientCIDRs != nil {
-			(*out)[i] = in[i]
+			in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
-		}
+			*out = make([]ServerAddressByClientCIDR, len(*in))
-	} else {
+			for i := range *in {
-		out.ServerAddressByClientCIDRs = nil
+				(*out)[i] = (*in)[i]
-	}
-	if in.SecretRef != nil {
-		in, out := in.SecretRef, &out.SecretRef
-		*out = new(api.LocalObjectReference)
-		**out = *in
-	} else {
-		out.SecretRef = nil
-	}
-	return nil
-}
-
-func DeepCopy_federation_ClusterStatus(in ClusterStatus, out *ClusterStatus, c *conversion.Cloner) error {
-	if in.Conditions != nil {
-		in, out := in.Conditions, &out.Conditions
-		*out = make([]ClusterCondition, len(in))
-		for i := range in {
-			if err := DeepCopy_federation_ClusterCondition(in[i], &(*out)[i], c); err != nil {
-				return err
 			}
+		} else {
+			out.ServerAddressByClientCIDRs = nil
 		}
-	} else {
+		if in.SecretRef != nil {
-		out.Conditions = nil
+			in, out := &in.SecretRef, &out.SecretRef
+			*out = new(api.LocalObjectReference)
+			**out = **in
+		} else {
+			out.SecretRef = nil
+		}
+		return nil
 	}
-	if in.Zones != nil {
-		in, out := in.Zones, &out.Zones
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Zones = nil
-	}
-	out.Region = in.Region
-	return nil
 }
 
-func DeepCopy_federation_ServerAddressByClientCIDR(in ServerAddressByClientCIDR, out *ServerAddressByClientCIDR, c *conversion.Cloner) error {
+func DeepCopy_federation_ClusterStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.ClientCIDR = in.ClientCIDR
+	{
-	out.ServerAddress = in.ServerAddress
+		in := in.(*ClusterStatus)
-	return nil
+		out := out.(*ClusterStatus)
+		if in.Conditions != nil {
+			in, out := &in.Conditions, &out.Conditions
+			*out = make([]ClusterCondition, len(*in))
+			for i := range *in {
+				if err := DeepCopy_federation_ClusterCondition(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Conditions = nil
+		}
+		if in.Zones != nil {
+			in, out := &in.Zones, &out.Zones
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Zones = nil
+		}
+		out.Region = in.Region
+		return nil
+	}
+}
+
+func DeepCopy_federation_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ServerAddressByClientCIDR)
+		out := out.(*ServerAddressByClientCIDR)
+		out.ClientCIDR = in.ClientCIDR
+		out.ServerAddress = in.ServerAddress
+		return nil
+	}
 }

federation/apis/federation/v1beta1/deep_copy_generated.go

@@ -24,108 +24,133 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v1beta1_Cluster,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Cluster, InType: reflect.TypeOf(func() *Cluster { var x *Cluster; return x }())},
-		DeepCopy_v1beta1_ClusterCondition,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterCondition, InType: reflect.TypeOf(func() *ClusterCondition { var x *ClusterCondition; return x }())},
-		DeepCopy_v1beta1_ClusterList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterList, InType: reflect.TypeOf(func() *ClusterList { var x *ClusterList; return x }())},
-		DeepCopy_v1beta1_ClusterSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterSpec, InType: reflect.TypeOf(func() *ClusterSpec { var x *ClusterSpec; return x }())},
-		DeepCopy_v1beta1_ClusterStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterStatus, InType: reflect.TypeOf(func() *ClusterStatus { var x *ClusterStatus; return x }())},
-		DeepCopy_v1beta1_ServerAddressByClientCIDR,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ServerAddressByClientCIDR, InType: reflect.TypeOf(func() *ServerAddressByClientCIDR { var x *ServerAddressByClientCIDR; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v1beta1_Cluster(in Cluster, out *Cluster, c *conversion.Cloner) error {
+func DeepCopy_v1beta1_Cluster(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*Cluster)
-		return err
+		out := out.(*Cluster)
+		out.TypeMeta = in.TypeMeta
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_v1beta1_ClusterSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_v1beta1_ClusterStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	if err := DeepCopy_v1beta1_ClusterSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_v1beta1_ClusterStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
 }
 
-func DeepCopy_v1beta1_ClusterCondition(in ClusterCondition, out *ClusterCondition, c *conversion.Cloner) error {
+func DeepCopy_v1beta1_ClusterCondition(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Type = in.Type
+	{
-	out.Status = in.Status
+		in := in.(*ClusterCondition)
-	out.LastProbeTime = in.LastProbeTime.DeepCopy()
+		out := out.(*ClusterCondition)
-	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
+		out.Type = in.Type
-	out.Reason = in.Reason
+		out.Status = in.Status
-	out.Message = in.Message
+		out.LastProbeTime = in.LastProbeTime.DeepCopy()
-	return nil
+		out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
+		out.Reason = in.Reason
+		out.Message = in.Message
+		return nil
+	}
 }
 
-func DeepCopy_v1beta1_ClusterList(in ClusterList, out *ClusterList, c *conversion.Cloner) error {
+func DeepCopy_v1beta1_ClusterList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.ListMeta = in.ListMeta
+		in := in.(*ClusterList)
-	if in.Items != nil {
+		out := out.(*ClusterList)
-		in, out := in.Items, &out.Items
+		out.TypeMeta = in.TypeMeta
-		*out = make([]Cluster, len(in))
+		out.ListMeta = in.ListMeta
-		for i := range in {
+		if in.Items != nil {
-			if err := DeepCopy_v1beta1_Cluster(in[i], &(*out)[i], c); err != nil {
+			in, out := &in.Items, &out.Items
-				return err
+			*out = make([]Cluster, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1beta1_Cluster(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
 			}
+		} else {
+			out.Items = nil
 		}
-	} else {
+		return nil
-		out.Items = nil
 	}
-	return nil
 }
 
-func DeepCopy_v1beta1_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conversion.Cloner) error {
+func DeepCopy_v1beta1_ClusterSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.ServerAddressByClientCIDRs != nil {
+	{
-		in, out := in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
+		in := in.(*ClusterSpec)
-		*out = make([]ServerAddressByClientCIDR, len(in))
+		out := out.(*ClusterSpec)
-		for i := range in {
+		if in.ServerAddressByClientCIDRs != nil {
-			(*out)[i] = in[i]
+			in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
-		}
+			*out = make([]ServerAddressByClientCIDR, len(*in))
-	} else {
+			for i := range *in {
-		out.ServerAddressByClientCIDRs = nil
+				(*out)[i] = (*in)[i]
-	}
-	if in.SecretRef != nil {
-		in, out := in.SecretRef, &out.SecretRef
-		*out = new(v1.LocalObjectReference)
-		**out = *in
-	} else {
-		out.SecretRef = nil
-	}
-	return nil
-}
-
-func DeepCopy_v1beta1_ClusterStatus(in ClusterStatus, out *ClusterStatus, c *conversion.Cloner) error {
-	if in.Conditions != nil {
-		in, out := in.Conditions, &out.Conditions
-		*out = make([]ClusterCondition, len(in))
-		for i := range in {
-			if err := DeepCopy_v1beta1_ClusterCondition(in[i], &(*out)[i], c); err != nil {
-				return err
 			}
+		} else {
+			out.ServerAddressByClientCIDRs = nil
 		}
-	} else {
+		if in.SecretRef != nil {
-		out.Conditions = nil
+			in, out := &in.SecretRef, &out.SecretRef
+			*out = new(v1.LocalObjectReference)
+			**out = **in
+		} else {
+			out.SecretRef = nil
+		}
+		return nil
 	}
-	if in.Zones != nil {
-		in, out := in.Zones, &out.Zones
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Zones = nil
-	}
-	out.Region = in.Region
-	return nil
 }
 
-func DeepCopy_v1beta1_ServerAddressByClientCIDR(in ServerAddressByClientCIDR, out *ServerAddressByClientCIDR, c *conversion.Cloner) error {
+func DeepCopy_v1beta1_ClusterStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.ClientCIDR = in.ClientCIDR
+	{
-	out.ServerAddress = in.ServerAddress
+		in := in.(*ClusterStatus)
-	return nil
+		out := out.(*ClusterStatus)
+		if in.Conditions != nil {
+			in, out := &in.Conditions, &out.Conditions
+			*out = make([]ClusterCondition, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1beta1_ClusterCondition(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Conditions = nil
+		}
+		if in.Zones != nil {
+			in, out := &in.Zones, &out.Zones
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Zones = nil
+		}
+		out.Region = in.Region
+		return nil
+	}
+}
+
+func DeepCopy_v1beta1_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ServerAddressByClientCIDR)
+		out := out.(*ServerAddressByClientCIDR)
+		out.ClientCIDR = in.ClientCIDR
+		out.ServerAddress = in.ServerAddress
+		return nil
+	}
 }

federation/apis/federation/v1beta1/generated.proto

@@ -24,6 +24,7 @@ package k8s.io.kubernetes.federation.apis.federation.v1beta1;
 import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
+import "k8s.io/kubernetes/pkg/runtime/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".

pkg/api/conversion_test.go

@@ -38,15 +38,7 @@ func BenchmarkPodConversion(b *testing.B) {
 	}
 
 	// add a fixed item
-	data, err := ioutil.ReadFile("pod_example.json")
+	items = append(items, benchmarkPod)
-	if err != nil {
-		b.Fatalf("Unexpected error while reading file: %v", err)
-	}
-	var pod api.Pod
-	if err := runtime.DecodeInto(testapi.Default.Codec(), data, &pod); err != nil {
-		b.Fatalf("Unexpected error decoding pod: %v", err)
-	}
-	items = append(items, pod)
 	width := len(items)
 
 	scheme := api.Scheme

pkg/api/deep_copy_test.go

@@ -19,32 +19,129 @@ package api_test
 import (
 	"io/ioutil"
 	"testing"
+	"time"
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/types"
 )
 
-func BenchmarkPodCopy(b *testing.B) {
+func parseTimeOrDie(ts string) unversioned.Time {
-	data, err := ioutil.ReadFile("pod_example.json")
+	t, err := time.Parse(time.RFC3339, ts)
 	if err != nil {
-		b.Fatalf("Unexpected error while reading file: %v", err)
+		panic(err)
-	}
-	var pod api.Pod
-	if err := runtime.DecodeInto(testapi.Default.Codec(), data, &pod); err != nil {
-		b.Fatalf("Unexpected error decoding pod: %v", err)
 	}
+	return unversioned.Time{Time: t}
+}
 
+var benchmarkPod api.Pod = api.Pod{
+	TypeMeta: unversioned.TypeMeta{
+		Kind:       "Pod",
+		APIVersion: "v1",
+	},
+	ObjectMeta: api.ObjectMeta{
+		Name:              "etcd-server-e2e-test-wojtekt-master",
+		Namespace:         "default",
+		SelfLink:          "/api/v1/namespaces/default/pods/etcd-server-e2e-test-wojtekt-master",
+		UID:               types.UID("a671734a-e8e5-11e4-8fde-42010af09327"),
+		ResourceVersion:   "22",
+		CreationTimestamp: parseTimeOrDie("2015-04-22T11:49:36Z"),
+		Annotations: map[string]string{
+			"kubernetes.io/config.mirror": "mirror",
+			"kubernetes.io/config.source": "file",
+		},
+	},
+	Spec: api.PodSpec{
+		Volumes: []api.Volume{
+			{
+				Name: "varetcd",
+				VolumeSource: api.VolumeSource{
+					HostPath: &api.HostPathVolumeSource{
+						Path: "/mnt/master-pd/var/etcd",
+					},
+				},
+			},
+		},
+		Containers: []api.Container{
+			{
+				Name:  "etcd-container",
+				Image: "gcr.io/google_containers/etcd:2.0.9",
+				Command: []string{
+					"/usr/local/bin/etcd",
+					"--addr",
+					"127.0.0.1:4001",
+					"--bind-addr",
+					"127.0.0.1:4001",
+					"--data-dir",
+					"/var/etcd/data",
+				},
+				Ports: []api.ContainerPort{
+					{
+						Name:          "serverport",
+						HostPort:      2380,
+						ContainerPort: 2380,
+						Protocol:      "TCP",
+					},
+					{
+						Name:          "clientport",
+						HostPort:      4001,
+						ContainerPort: 4001,
+						Protocol:      "TCP",
+					},
+				},
+				VolumeMounts: []api.VolumeMount{
+					{
+						Name:      "varetcd",
+						MountPath: "/var/etcd",
+					},
+				},
+				TerminationMessagePath: "/dev/termination-log",
+				ImagePullPolicy:        api.PullIfNotPresent,
+			},
+		},
+		RestartPolicy: api.RestartPolicyAlways,
+		DNSPolicy:     api.DNSClusterFirst,
+		NodeName:      "e2e-test-wojtekt-master",
+	},
+	Status: api.PodStatus{
+		Phase: api.PodRunning,
+		Conditions: []api.PodCondition{
+			{
+				Type:   api.PodReady,
+				Status: api.ConditionTrue,
+			},
+		},
+		ContainerStatuses: []api.ContainerStatus{
+			{
+				Name: "etcd-container",
+				State: api.ContainerState{
+					Running: &api.ContainerStateRunning{
+						StartedAt: parseTimeOrDie("2015-04-22T11:49:32Z"),
+					},
+				},
+				Ready:        true,
+				RestartCount: 0,
+				Image:        "gcr.io/google_containers/etcd:2.0.9",
+				ImageID:      "docker://b6b9a86dc06aa1361357ca1b105feba961f6a4145adca6c54e142c0be0fe87b0",
+				ContainerID:  "docker://3cbbf818f1addfc252957b4504f56ef2907a313fe6afc47fc75373674255d46d",
+			},
+		},
+	},
+}
+
+func BenchmarkPodCopy(b *testing.B) {
 	var result *api.Pod
 	for i := 0; i < b.N; i++ {
-		obj, err := api.Scheme.DeepCopy(&pod)
+		obj, err := api.Scheme.DeepCopy(&benchmarkPod)
 		if err != nil {
 			b.Fatalf("Unexpected error copying pod: %v", err)
 		}
 		result = obj.(*api.Pod)
 	}
-	if !api.Semantic.DeepEqual(pod, *result) {
+	if !api.Semantic.DeepEqual(benchmarkPod, *result) {
-		b.Fatalf("Incorrect copy: expected %v, got %v", pod, *result)
+		b.Fatalf("Incorrect copy: expected %v, got %v", benchmarkPod, *result)
 	}
 }
 

pkg/api/pod_example.json

@@ -1,102 +0,0 @@
-{
-    "kind": "Pod",
-    "apiVersion": "v1",
-    "metadata": {
-        "name": "etcd-server-e2e-test-wojtekt-master",
-        "namespace": "default",
-        "selfLink": "/api/v1/namespaces/default/pods/etcd-server-e2e-test-wojtekt-master",
-        "uid": "a671734a-e8e5-11e4-8fde-42010af09327",
-        "resourceVersion": "22",
-        "creationTimestamp": "2015-04-22T11:49:36Z",
-        "annotations": {
-            "kubernetes.io/config.mirror": "mirror",
-            "kubernetes.io/config.source": "file"
-        }
-    },
-    "spec": {
-        "volumes": [
-            {
-                "name": "varetcd",
-                "hostPath": {
-                    "path": "/mnt/master-pd/var/etcd"
-                },
-                "emptyDir": null,
-                "gcePersistentDisk": null,
-                "awsElasticBlockStore": null,
-                "gitRepo": null,
-                "secret": null,
-                "nfs": null,
-                "iscsi": null,
-                "glusterfs": null
-            }
-        ],
-        "containers": [
-            {
-                "name": "etcd-container",
-                "image": "gcr.io/google_containers/etcd:2.0.9",
-                "command": [
-                    "/usr/local/bin/etcd",
-                    "--addr",
-                    "127.0.0.1:4001",
-                    "--bind-addr",
-                    "127.0.0.1:4001",
-                    "--data-dir",
-                    "/var/etcd/data"
-                ],
-                "ports": [
-                    {
-                        "name": "serverport",
-                        "hostPort": 2380,
-                        "containerPort": 2380,
-                        "protocol": "TCP"
-                    },
-                    {
-                        "name": "clientport",
-                        "hostPort": 4001,
-                        "containerPort": 4001,
-                        "protocol": "TCP"
-                    }
-                ],
-                "resources": {},
-                "volumeMounts": [
-                    {
-                        "name": "varetcd",
-                        "mountPath": "/var/etcd"
-                    }
-                ],
-                "terminationMessagePath": "/dev/termination-log",
-                "imagePullPolicy": "IfNotPresent",
-                "capabilities": {}
-            }
-        ],
-        "restartPolicy": "Always",
-        "dnsPolicy": "ClusterFirst",
-        "nodeName": "e2e-test-wojtekt-master",
-        "hostNetwork": true
-    },
-    "status": {
-        "phase": "Running",
-        "conditions": [
-            {
-                "type": "Ready",
-                "status": "True"
-            }
-        ],
-        "containerStatuses": [
-            {
-                "name": "etcd-container",
-                "state": {
-                    "running": {
-                        "startedAt": "2015-04-22T11:49:32Z"
-                    }
-                },
-                "lastState": {},
-                "ready": true,
-                "restartCount": 0,
-                "image": "gcr.io/google_containers/etcd:2.0.9",
-                "imageID": "docker://b6b9a86dc06aa1361357ca1b105feba961f6a4145adca6c54e142c0be0fe87b0",
-                "containerID": "docker://3cbbf818f1addfc252957b4504f56ef2907a313fe6afc47fc75373674255d46d"
-            }
-        ]
-    }
-}

pkg/api/unversioned/deep_copy_generated.go

@@ -25,264 +25,366 @@ import (
 	time "time"
 )
 
-func DeepCopy_unversioned_APIGroup(in APIGroup, out *APIGroup, c *conversion.Cloner) error {
+func DeepCopy_unversioned_APIGroup(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.Name = in.Name
+		in := in.(*APIGroup)
-	if in.Versions != nil {
+		out := out.(*APIGroup)
-		in, out := in.Versions, &out.Versions
+		out.TypeMeta = in.TypeMeta
-		*out = make([]GroupVersionForDiscovery, len(in))
+		out.Name = in.Name
-		for i := range in {
+		if in.Versions != nil {
-			(*out)[i] = in[i]
+			in, out := &in.Versions, &out.Versions
+			*out = make([]GroupVersionForDiscovery, len(*in))
+			for i := range *in {
+				(*out)[i] = (*in)[i]
+			}
+		} else {
+			out.Versions = nil
 		}
-	} else {
+		out.PreferredVersion = in.PreferredVersion
-		out.Versions = nil
+		if in.ServerAddressByClientCIDRs != nil {
-	}
+			in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
-	out.PreferredVersion = in.PreferredVersion
+			*out = make([]ServerAddressByClientCIDR, len(*in))
-	if in.ServerAddressByClientCIDRs != nil {
+			for i := range *in {
-		in, out := in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
+				(*out)[i] = (*in)[i]
-		*out = make([]ServerAddressByClientCIDR, len(in))
+			}
-		for i := range in {
+		} else {
-			(*out)[i] = in[i]
+			out.ServerAddressByClientCIDRs = nil
 		}
-	} else {
+		return nil
-		out.ServerAddressByClientCIDRs = nil
 	}
-	return nil
 }
 
-func DeepCopy_unversioned_APIGroupList(in APIGroupList, out *APIGroupList, c *conversion.Cloner) error {
+func DeepCopy_unversioned_APIGroupList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if in.Groups != nil {
+		in := in.(*APIGroupList)
-		in, out := in.Groups, &out.Groups
+		out := out.(*APIGroupList)
-		*out = make([]APIGroup, len(in))
+		out.TypeMeta = in.TypeMeta
-		for i := range in {
+		if in.Groups != nil {
-			if err := DeepCopy_unversioned_APIGroup(in[i], &(*out)[i], c); err != nil {
+			in, out := &in.Groups, &out.Groups
+			*out = make([]APIGroup, len(*in))
+			for i := range *in {
+				if err := DeepCopy_unversioned_APIGroup(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Groups = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_APIResource(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*APIResource)
+		out := out.(*APIResource)
+		out.Name = in.Name
+		out.Namespaced = in.Namespaced
+		out.Kind = in.Kind
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_APIResourceList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*APIResourceList)
+		out := out.(*APIResourceList)
+		out.TypeMeta = in.TypeMeta
+		out.GroupVersion = in.GroupVersion
+		if in.APIResources != nil {
+			in, out := &in.APIResources, &out.APIResources
+			*out = make([]APIResource, len(*in))
+			for i := range *in {
+				(*out)[i] = (*in)[i]
+			}
+		} else {
+			out.APIResources = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_APIVersions(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*APIVersions)
+		out := out.(*APIVersions)
+		out.TypeMeta = in.TypeMeta
+		if in.Versions != nil {
+			in, out := &in.Versions, &out.Versions
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Versions = nil
+		}
+		if in.ServerAddressByClientCIDRs != nil {
+			in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
+			*out = make([]ServerAddressByClientCIDR, len(*in))
+			for i := range *in {
+				(*out)[i] = (*in)[i]
+			}
+		} else {
+			out.ServerAddressByClientCIDRs = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_Duration(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*Duration)
+		out := out.(*Duration)
+		out.Duration = in.Duration
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ExportOptions)
+		out := out.(*ExportOptions)
+		out.TypeMeta = in.TypeMeta
+		out.Export = in.Export
+		out.Exact = in.Exact
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_GroupKind(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*GroupKind)
+		out := out.(*GroupKind)
+		out.Group = in.Group
+		out.Kind = in.Kind
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_GroupResource(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*GroupResource)
+		out := out.(*GroupResource)
+		out.Group = in.Group
+		out.Resource = in.Resource
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_GroupVersion(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*GroupVersion)
+		out := out.(*GroupVersion)
+		out.Group = in.Group
+		out.Version = in.Version
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_GroupVersionForDiscovery(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*GroupVersionForDiscovery)
+		out := out.(*GroupVersionForDiscovery)
+		out.GroupVersion = in.GroupVersion
+		out.Version = in.Version
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_GroupVersionKind(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*GroupVersionKind)
+		out := out.(*GroupVersionKind)
+		out.Group = in.Group
+		out.Version = in.Version
+		out.Kind = in.Kind
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_GroupVersionResource(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*GroupVersionResource)
+		out := out.(*GroupVersionResource)
+		out.Group = in.Group
+		out.Version = in.Version
+		out.Resource = in.Resource
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_LabelSelector(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*LabelSelector)
+		out := out.(*LabelSelector)
+		if in.MatchLabels != nil {
+			in, out := &in.MatchLabels, &out.MatchLabels
+			*out = make(map[string]string)
+			for key, val := range *in {
+				(*out)[key] = val
+			}
+		} else {
+			out.MatchLabels = nil
+		}
+		if in.MatchExpressions != nil {
+			in, out := &in.MatchExpressions, &out.MatchExpressions
+			*out = make([]LabelSelectorRequirement, len(*in))
+			for i := range *in {
+				if err := DeepCopy_unversioned_LabelSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.MatchExpressions = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_LabelSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*LabelSelectorRequirement)
+		out := out.(*LabelSelectorRequirement)
+		out.Key = in.Key
+		out.Operator = in.Operator
+		if in.Values != nil {
+			in, out := &in.Values, &out.Values
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Values = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_ListMeta(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ListMeta)
+		out := out.(*ListMeta)
+		out.SelfLink = in.SelfLink
+		out.ResourceVersion = in.ResourceVersion
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_Patch(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*Patch)
+		out := out.(*Patch)
+		_ = in
+		_ = out
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_RootPaths(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RootPaths)
+		out := out.(*RootPaths)
+		if in.Paths != nil {
+			in, out := &in.Paths, &out.Paths
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Paths = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ServerAddressByClientCIDR)
+		out := out.(*ServerAddressByClientCIDR)
+		out.ClientCIDR = in.ClientCIDR
+		out.ServerAddress = in.ServerAddress
+		return nil
+	}
+}
+
+func DeepCopy_unversioned_Status(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*Status)
+		out := out.(*Status)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		out.Status = in.Status
+		out.Message = in.Message
+		out.Reason = in.Reason
+		if in.Details != nil {
+			in, out := &in.Details, &out.Details
+			*out = new(StatusDetails)
+			if err := DeepCopy_unversioned_StatusDetails(*in, *out, c); err != nil {
 				return err
 			}
+		} else {
+			out.Details = nil
 		}
-	} else {
+		out.Code = in.Code
-		out.Groups = nil
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_unversioned_APIResource(in APIResource, out *APIResource, c *conversion.Cloner) error {
+func DeepCopy_unversioned_StatusCause(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Name = in.Name
+	{
-	out.Namespaced = in.Namespaced
+		in := in.(*StatusCause)
-	out.Kind = in.Kind
+		out := out.(*StatusCause)
-	return nil
+		out.Type = in.Type
-}
+		out.Message = in.Message
-
+		out.Field = in.Field
-func DeepCopy_unversioned_APIResourceList(in APIResourceList, out *APIResourceList, c *conversion.Cloner) error {
+		return nil
-	out.TypeMeta = in.TypeMeta
-	out.GroupVersion = in.GroupVersion
-	if in.APIResources != nil {
-		in, out := in.APIResources, &out.APIResources
-		*out = make([]APIResource, len(in))
-		for i := range in {
-			(*out)[i] = in[i]
-		}
-	} else {
-		out.APIResources = nil
 	}
-	return nil
 }
 
-func DeepCopy_unversioned_APIVersions(in APIVersions, out *APIVersions, c *conversion.Cloner) error {
+func DeepCopy_unversioned_StatusDetails(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if in.Versions != nil {
+		in := in.(*StatusDetails)
-		in, out := in.Versions, &out.Versions
+		out := out.(*StatusDetails)
-		*out = make([]string, len(in))
+		out.Name = in.Name
-		copy(*out, in)
+		out.Group = in.Group
-	} else {
+		out.Kind = in.Kind
-		out.Versions = nil
+		if in.Causes != nil {
-	}
+			in, out := &in.Causes, &out.Causes
-	if in.ServerAddressByClientCIDRs != nil {
+			*out = make([]StatusCause, len(*in))
-		in, out := in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
+			for i := range *in {
-		*out = make([]ServerAddressByClientCIDR, len(in))
+				(*out)[i] = (*in)[i]
-		for i := range in {
-			(*out)[i] = in[i]
-		}
-	} else {
-		out.ServerAddressByClientCIDRs = nil
-	}
-	return nil
-}
-
-func DeepCopy_unversioned_Duration(in Duration, out *Duration, c *conversion.Cloner) error {
-	out.Duration = in.Duration
-	return nil
-}
-
-func DeepCopy_unversioned_ExportOptions(in ExportOptions, out *ExportOptions, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.Export = in.Export
-	out.Exact = in.Exact
-	return nil
-}
-
-func DeepCopy_unversioned_GroupKind(in GroupKind, out *GroupKind, c *conversion.Cloner) error {
-	out.Group = in.Group
-	out.Kind = in.Kind
-	return nil
-}
-
-func DeepCopy_unversioned_GroupResource(in GroupResource, out *GroupResource, c *conversion.Cloner) error {
-	out.Group = in.Group
-	out.Resource = in.Resource
-	return nil
-}
-
-func DeepCopy_unversioned_GroupVersion(in GroupVersion, out *GroupVersion, c *conversion.Cloner) error {
-	out.Group = in.Group
-	out.Version = in.Version
-	return nil
-}
-
-func DeepCopy_unversioned_GroupVersionForDiscovery(in GroupVersionForDiscovery, out *GroupVersionForDiscovery, c *conversion.Cloner) error {
-	out.GroupVersion = in.GroupVersion
-	out.Version = in.Version
-	return nil
-}
-
-func DeepCopy_unversioned_GroupVersionKind(in GroupVersionKind, out *GroupVersionKind, c *conversion.Cloner) error {
-	out.Group = in.Group
-	out.Version = in.Version
-	out.Kind = in.Kind
-	return nil
-}
-
-func DeepCopy_unversioned_GroupVersionResource(in GroupVersionResource, out *GroupVersionResource, c *conversion.Cloner) error {
-	out.Group = in.Group
-	out.Version = in.Version
-	out.Resource = in.Resource
-	return nil
-}
-
-func DeepCopy_unversioned_LabelSelector(in LabelSelector, out *LabelSelector, c *conversion.Cloner) error {
-	if in.MatchLabels != nil {
-		in, out := in.MatchLabels, &out.MatchLabels
-		*out = make(map[string]string)
-		for key, val := range in {
-			(*out)[key] = val
-		}
-	} else {
-		out.MatchLabels = nil
-	}
-	if in.MatchExpressions != nil {
-		in, out := in.MatchExpressions, &out.MatchExpressions
-		*out = make([]LabelSelectorRequirement, len(in))
-		for i := range in {
-			if err := DeepCopy_unversioned_LabelSelectorRequirement(in[i], &(*out)[i], c); err != nil {
-				return err
 			}
+		} else {
+			out.Causes = nil
 		}
-	} else {
+		out.RetryAfterSeconds = in.RetryAfterSeconds
-		out.MatchExpressions = nil
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_unversioned_LabelSelectorRequirement(in LabelSelectorRequirement, out *LabelSelectorRequirement, c *conversion.Cloner) error {
+func DeepCopy_unversioned_Time(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Key = in.Key
+	{
-	out.Operator = in.Operator
+		in := in.(*Time)
-	if in.Values != nil {
+		out := out.(*Time)
-		in, out := in.Values, &out.Values
+		if newVal, err := c.DeepCopy(&in.Time); err != nil {
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Values = nil
-	}
-	return nil
-}
-
-func DeepCopy_unversioned_ListMeta(in ListMeta, out *ListMeta, c *conversion.Cloner) error {
-	out.SelfLink = in.SelfLink
-	out.ResourceVersion = in.ResourceVersion
-	return nil
-}
-
-func DeepCopy_unversioned_Patch(in Patch, out *Patch, c *conversion.Cloner) error {
-	return nil
-}
-
-func DeepCopy_unversioned_RootPaths(in RootPaths, out *RootPaths, c *conversion.Cloner) error {
-	if in.Paths != nil {
-		in, out := in.Paths, &out.Paths
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Paths = nil
-	}
-	return nil
-}
-
-func DeepCopy_unversioned_ServerAddressByClientCIDR(in ServerAddressByClientCIDR, out *ServerAddressByClientCIDR, c *conversion.Cloner) error {
-	out.ClientCIDR = in.ClientCIDR
-	out.ServerAddress = in.ServerAddress
-	return nil
-}
-
-func DeepCopy_unversioned_Status(in Status, out *Status, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	out.Status = in.Status
-	out.Message = in.Message
-	out.Reason = in.Reason
-	if in.Details != nil {
-		in, out := in.Details, &out.Details
-		*out = new(StatusDetails)
-		if err := DeepCopy_unversioned_StatusDetails(*in, *out, c); err != nil {
 			return err
+		} else {
+			out.Time = *newVal.(*time.Time)
 		}
-	} else {
+		return nil
-		out.Details = nil
 	}
-	out.Code = in.Code
-	return nil
 }
 
-func DeepCopy_unversioned_StatusCause(in StatusCause, out *StatusCause, c *conversion.Cloner) error {
+func DeepCopy_unversioned_Timestamp(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Type = in.Type
+	{
-	out.Message = in.Message
+		in := in.(*Timestamp)
-	out.Field = in.Field
+		out := out.(*Timestamp)
-	return nil
+		out.Seconds = in.Seconds
-}
+		out.Nanos = in.Nanos
-
+		return nil
-func DeepCopy_unversioned_StatusDetails(in StatusDetails, out *StatusDetails, c *conversion.Cloner) error {
-	out.Name = in.Name
-	out.Group = in.Group
-	out.Kind = in.Kind
-	if in.Causes != nil {
-		in, out := in.Causes, &out.Causes
-		*out = make([]StatusCause, len(in))
-		for i := range in {
-			(*out)[i] = in[i]
-		}
-	} else {
-		out.Causes = nil
 	}
-	out.RetryAfterSeconds = in.RetryAfterSeconds
-	return nil
 }
 
-func DeepCopy_unversioned_Time(in Time, out *Time, c *conversion.Cloner) error {
+func DeepCopy_unversioned_TypeMeta(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if newVal, err := c.DeepCopy(in.Time); err != nil {
+	{
-		return err
+		in := in.(*TypeMeta)
-	} else {
+		out := out.(*TypeMeta)
-		out.Time = newVal.(time.Time)
+		out.Kind = in.Kind
+		out.APIVersion = in.APIVersion
+		return nil
 	}
-	return nil
-}
-
-func DeepCopy_unversioned_Timestamp(in Timestamp, out *Timestamp, c *conversion.Cloner) error {
-	out.Seconds = in.Seconds
-	out.Nanos = in.Nanos
-	return nil
-}
-
-func DeepCopy_unversioned_TypeMeta(in TypeMeta, out *TypeMeta, c *conversion.Cloner) error {
-	out.Kind = in.Kind
-	out.APIVersion = in.APIVersion
-	return nil
 }

pkg/apis/apps/deep_copy_generated.go

@@ -24,88 +24,105 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_apps_PetSet,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_PetSet, InType: reflect.TypeOf(func() *PetSet { var x *PetSet; return x }())},
-		DeepCopy_apps_PetSetList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_PetSetList, InType: reflect.TypeOf(func() *PetSetList { var x *PetSetList; return x }())},
-		DeepCopy_apps_PetSetSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_PetSetSpec, InType: reflect.TypeOf(func() *PetSetSpec { var x *PetSetSpec; return x }())},
-		DeepCopy_apps_PetSetStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_PetSetStatus, InType: reflect.TypeOf(func() *PetSetStatus { var x *PetSetStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_apps_PetSet(in PetSet, out *PetSet, c *conversion.Cloner) error {
+func DeepCopy_apps_PetSet(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*PetSet)
-		return err
+		out := out.(*PetSet)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_apps_PetSetSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_apps_PetSetStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_apps_PetSetList(in PetSetList, out *PetSetList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]PetSet, len(in))
-		for i := range in {
-			if err := DeepCopy_apps_PetSet(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_apps_PetSetSpec(in PetSetSpec, out *PetSetSpec, c *conversion.Cloner) error {
-	out.Replicas = in.Replicas
-	if in.Selector != nil {
-		in, out := in.Selector, &out.Selector
-		*out = new(unversioned.LabelSelector)
-		if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil {
 			return err
 		}
-	} else {
+		if err := DeepCopy_apps_PetSetSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Selector = nil
+			return err
-	}
-	if err := api.DeepCopy_api_PodTemplateSpec(in.Template, &out.Template, c); err != nil {
-		return err
-	}
-	if in.VolumeClaimTemplates != nil {
-		in, out := in.VolumeClaimTemplates, &out.VolumeClaimTemplates
-		*out = make([]api.PersistentVolumeClaim, len(in))
-		for i := range in {
-			if err := api.DeepCopy_api_PersistentVolumeClaim(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
 		}
-	} else {
+		if err := DeepCopy_apps_PetSetStatus(&in.Status, &out.Status, c); err != nil {
-		out.VolumeClaimTemplates = nil
+			return err
+		}
+		return nil
 	}
-	out.ServiceName = in.ServiceName
-	return nil
 }
 
-func DeepCopy_apps_PetSetStatus(in PetSetStatus, out *PetSetStatus, c *conversion.Cloner) error {
+func DeepCopy_apps_PetSetList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.ObservedGeneration != nil {
+	{
-		in, out := in.ObservedGeneration, &out.ObservedGeneration
+		in := in.(*PetSetList)
-		*out = new(int64)
+		out := out.(*PetSetList)
-		**out = *in
+		out.TypeMeta = in.TypeMeta
-	} else {
+		out.ListMeta = in.ListMeta
-		out.ObservedGeneration = nil
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]PetSet, len(*in))
+			for i := range *in {
+				if err := DeepCopy_apps_PetSet(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_apps_PetSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PetSetSpec)
+		out := out.(*PetSetSpec)
+		out.Replicas = in.Replicas
+		if in.Selector != nil {
+			in, out := &in.Selector, &out.Selector
+			*out = new(unversioned.LabelSelector)
+			if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil {
+				return err
+			}
+		} else {
+			out.Selector = nil
+		}
+		if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
+			return err
+		}
+		if in.VolumeClaimTemplates != nil {
+			in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates
+			*out = make([]api.PersistentVolumeClaim, len(*in))
+			for i := range *in {
+				if err := api.DeepCopy_api_PersistentVolumeClaim(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.VolumeClaimTemplates = nil
+		}
+		out.ServiceName = in.ServiceName
+		return nil
+	}
+}
+
+func DeepCopy_apps_PetSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PetSetStatus)
+		out := out.(*PetSetStatus)
+		if in.ObservedGeneration != nil {
+			in, out := &in.ObservedGeneration, &out.ObservedGeneration
+			*out = new(int64)
+			**out = **in
+		} else {
+			out.ObservedGeneration = nil
+		}
+		out.Replicas = in.Replicas
+		return nil
 	}
-	out.Replicas = in.Replicas
-	return nil
 }

pkg/apis/apps/v1alpha1/deep_copy_generated.go

@@ -25,94 +25,111 @@ import (
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v1alpha1_PetSet,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PetSet, InType: reflect.TypeOf(func() *PetSet { var x *PetSet; return x }())},
-		DeepCopy_v1alpha1_PetSetList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PetSetList, InType: reflect.TypeOf(func() *PetSetList { var x *PetSetList; return x }())},
-		DeepCopy_v1alpha1_PetSetSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PetSetSpec, InType: reflect.TypeOf(func() *PetSetSpec { var x *PetSetSpec; return x }())},
-		DeepCopy_v1alpha1_PetSetStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PetSetStatus, InType: reflect.TypeOf(func() *PetSetStatus { var x *PetSetStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v1alpha1_PetSet(in PetSet, out *PetSet, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_PetSet(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*PetSet)
-		return err
+		out := out.(*PetSet)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_v1alpha1_PetSetSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_v1alpha1_PetSetStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_v1alpha1_PetSetList(in PetSetList, out *PetSetList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]PetSet, len(in))
-		for i := range in {
-			if err := DeepCopy_v1alpha1_PetSet(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_v1alpha1_PetSetSpec(in PetSetSpec, out *PetSetSpec, c *conversion.Cloner) error {
-	if in.Replicas != nil {
-		in, out := in.Replicas, &out.Replicas
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.Replicas = nil
-	}
-	if in.Selector != nil {
-		in, out := in.Selector, &out.Selector
-		*out = new(unversioned.LabelSelector)
-		if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil {
 			return err
 		}
-	} else {
+		if err := DeepCopy_v1alpha1_PetSetSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Selector = nil
+			return err
-	}
-	if err := v1.DeepCopy_v1_PodTemplateSpec(in.Template, &out.Template, c); err != nil {
-		return err
-	}
-	if in.VolumeClaimTemplates != nil {
-		in, out := in.VolumeClaimTemplates, &out.VolumeClaimTemplates
-		*out = make([]v1.PersistentVolumeClaim, len(in))
-		for i := range in {
-			if err := v1.DeepCopy_v1_PersistentVolumeClaim(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
 		}
-	} else {
+		if err := DeepCopy_v1alpha1_PetSetStatus(&in.Status, &out.Status, c); err != nil {
-		out.VolumeClaimTemplates = nil
+			return err
+		}
+		return nil
 	}
-	out.ServiceName = in.ServiceName
-	return nil
 }
 
-func DeepCopy_v1alpha1_PetSetStatus(in PetSetStatus, out *PetSetStatus, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_PetSetList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.ObservedGeneration != nil {
+	{
-		in, out := in.ObservedGeneration, &out.ObservedGeneration
+		in := in.(*PetSetList)
-		*out = new(int64)
+		out := out.(*PetSetList)
-		**out = *in
+		out.TypeMeta = in.TypeMeta
-	} else {
+		out.ListMeta = in.ListMeta
-		out.ObservedGeneration = nil
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]PetSet, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1alpha1_PetSet(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1alpha1_PetSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PetSetSpec)
+		out := out.(*PetSetSpec)
+		if in.Replicas != nil {
+			in, out := &in.Replicas, &out.Replicas
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.Replicas = nil
+		}
+		if in.Selector != nil {
+			in, out := &in.Selector, &out.Selector
+			*out = new(unversioned.LabelSelector)
+			if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil {
+				return err
+			}
+		} else {
+			out.Selector = nil
+		}
+		if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
+			return err
+		}
+		if in.VolumeClaimTemplates != nil {
+			in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates
+			*out = make([]v1.PersistentVolumeClaim, len(*in))
+			for i := range *in {
+				if err := v1.DeepCopy_v1_PersistentVolumeClaim(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.VolumeClaimTemplates = nil
+		}
+		out.ServiceName = in.ServiceName
+		return nil
+	}
+}
+
+func DeepCopy_v1alpha1_PetSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PetSetStatus)
+		out := out.(*PetSetStatus)
+		if in.ObservedGeneration != nil {
+			in, out := &in.ObservedGeneration, &out.ObservedGeneration
+			*out = new(int64)
+			**out = **in
+		} else {
+			out.ObservedGeneration = nil
+		}
+		out.Replicas = in.Replicas
+		return nil
 	}
-	out.Replicas = in.Replicas
-	return nil
 }

pkg/apis/apps/v1alpha1/generated.proto

@@ -24,6 +24,7 @@ package k8s.io.kubernetes.pkg.apis.apps.v1alpha1;
 import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
+import "k8s.io/kubernetes/pkg/runtime/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".

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

@@ -23,64 +23,81 @@ package authentication
 import (
 	api "k8s.io/kubernetes/pkg/api"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_authenticationk8sio_TokenReview,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authenticationk8sio_TokenReview, InType: reflect.TypeOf(func() *TokenReview { var x *TokenReview; return x }())},
-		DeepCopy_authenticationk8sio_TokenReviewSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authenticationk8sio_TokenReviewSpec, InType: reflect.TypeOf(func() *TokenReviewSpec { var x *TokenReviewSpec; return x }())},
-		DeepCopy_authenticationk8sio_TokenReviewStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authenticationk8sio_TokenReviewStatus, InType: reflect.TypeOf(func() *TokenReviewStatus { var x *TokenReviewStatus; return x }())},
-		DeepCopy_authenticationk8sio_UserInfo,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authenticationk8sio_UserInfo, InType: reflect.TypeOf(func() *UserInfo { var x *UserInfo; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_authenticationk8sio_TokenReview(in TokenReview, out *TokenReview, c *conversion.Cloner) error {
+func DeepCopy_authenticationk8sio_TokenReview(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.Spec = in.Spec
+		in := in.(*TokenReview)
-	if err := DeepCopy_authenticationk8sio_TokenReviewStatus(in.Status, &out.Status, c); err != nil {
+		out := out.(*TokenReview)
-		return err
+		out.TypeMeta = in.TypeMeta
-	}
+		out.Spec = in.Spec
-	return nil
+		if err := DeepCopy_authenticationk8sio_TokenReviewStatus(&in.Status, &out.Status, c); err != nil {
-}
+			return err
-
-func DeepCopy_authenticationk8sio_TokenReviewSpec(in TokenReviewSpec, out *TokenReviewSpec, c *conversion.Cloner) error {
-	out.Token = in.Token
-	return nil
-}
-
-func DeepCopy_authenticationk8sio_TokenReviewStatus(in TokenReviewStatus, out *TokenReviewStatus, c *conversion.Cloner) error {
-	out.Authenticated = in.Authenticated
-	if err := DeepCopy_authenticationk8sio_UserInfo(in.User, &out.User, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_authenticationk8sio_UserInfo(in UserInfo, out *UserInfo, c *conversion.Cloner) error {
-	out.Username = in.Username
-	out.UID = in.UID
-	if in.Groups != nil {
-		in, out := in.Groups, &out.Groups
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Groups = nil
-	}
-	if in.Extra != nil {
-		in, out := in.Extra, &out.Extra
-		*out = make(map[string][]string)
-		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
-				return err
-			} else {
-				(*out)[key] = newVal.([]string)
-			}
 		}
-	} else {
+		return nil
-		out.Extra = nil
+	}
+}
+
+func DeepCopy_authenticationk8sio_TokenReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*TokenReviewSpec)
+		out := out.(*TokenReviewSpec)
+		out.Token = in.Token
+		return nil
+	}
+}
+
+func DeepCopy_authenticationk8sio_TokenReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*TokenReviewStatus)
+		out := out.(*TokenReviewStatus)
+		out.Authenticated = in.Authenticated
+		if err := DeepCopy_authenticationk8sio_UserInfo(&in.User, &out.User, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_authenticationk8sio_UserInfo(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*UserInfo)
+		out := out.(*UserInfo)
+		out.Username = in.Username
+		out.UID = in.UID
+		if in.Groups != nil {
+			in, out := &in.Groups, &out.Groups
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Groups = nil
+		}
+		if in.Extra != nil {
+			in, out := &in.Extra, &out.Extra
+			*out = make(map[string][]string)
+			for key, val := range *in {
+				if newVal, err := c.DeepCopy(&val); err != nil {
+					return err
+				} else {
+					(*out)[key] = *newVal.(*[]string)
+				}
+			}
+		} else {
+			out.Extra = nil
+		}
+		return nil
 	}
-	return nil
 }

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

@@ -23,64 +23,81 @@ package v1beta1
 import (
 	api "k8s.io/kubernetes/pkg/api"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v1beta1_TokenReview,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_TokenReview, InType: reflect.TypeOf(func() *TokenReview { var x *TokenReview; return x }())},
-		DeepCopy_v1beta1_TokenReviewSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_TokenReviewSpec, InType: reflect.TypeOf(func() *TokenReviewSpec { var x *TokenReviewSpec; return x }())},
-		DeepCopy_v1beta1_TokenReviewStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_TokenReviewStatus, InType: reflect.TypeOf(func() *TokenReviewStatus { var x *TokenReviewStatus; return x }())},
-		DeepCopy_v1beta1_UserInfo,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_UserInfo, InType: reflect.TypeOf(func() *UserInfo { var x *UserInfo; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v1beta1_TokenReview(in TokenReview, out *TokenReview, c *conversion.Cloner) error {
+func DeepCopy_v1beta1_TokenReview(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.Spec = in.Spec
+		in := in.(*TokenReview)
-	if err := DeepCopy_v1beta1_TokenReviewStatus(in.Status, &out.Status, c); err != nil {
+		out := out.(*TokenReview)
-		return err
+		out.TypeMeta = in.TypeMeta
-	}
+		out.Spec = in.Spec
-	return nil
+		if err := DeepCopy_v1beta1_TokenReviewStatus(&in.Status, &out.Status, c); err != nil {
-}
+			return err
-
-func DeepCopy_v1beta1_TokenReviewSpec(in TokenReviewSpec, out *TokenReviewSpec, c *conversion.Cloner) error {
-	out.Token = in.Token
-	return nil
-}
-
-func DeepCopy_v1beta1_TokenReviewStatus(in TokenReviewStatus, out *TokenReviewStatus, c *conversion.Cloner) error {
-	out.Authenticated = in.Authenticated
-	if err := DeepCopy_v1beta1_UserInfo(in.User, &out.User, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_v1beta1_UserInfo(in UserInfo, out *UserInfo, c *conversion.Cloner) error {
-	out.Username = in.Username
-	out.UID = in.UID
-	if in.Groups != nil {
-		in, out := in.Groups, &out.Groups
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Groups = nil
-	}
-	if in.Extra != nil {
-		in, out := in.Extra, &out.Extra
-		*out = make(map[string][]string)
-		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
-				return err
-			} else {
-				(*out)[key] = newVal.([]string)
-			}
 		}
-	} else {
+		return nil
-		out.Extra = nil
+	}
+}
+
+func DeepCopy_v1beta1_TokenReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*TokenReviewSpec)
+		out := out.(*TokenReviewSpec)
+		out.Token = in.Token
+		return nil
+	}
+}
+
+func DeepCopy_v1beta1_TokenReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*TokenReviewStatus)
+		out := out.(*TokenReviewStatus)
+		out.Authenticated = in.Authenticated
+		if err := DeepCopy_v1beta1_UserInfo(&in.User, &out.User, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1beta1_UserInfo(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*UserInfo)
+		out := out.(*UserInfo)
+		out.Username = in.Username
+		out.UID = in.UID
+		if in.Groups != nil {
+			in, out := &in.Groups, &out.Groups
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Groups = nil
+		}
+		if in.Extra != nil {
+			in, out := &in.Extra, &out.Extra
+			*out = make(map[string][]string)
+			for key, val := range *in {
+				if newVal, err := c.DeepCopy(&val); err != nil {
+					return err
+				} else {
+					(*out)[key] = *newVal.(*[]string)
+				}
+			}
+		} else {
+			out.Extra = nil
+		}
+		return nil
 	}
-	return nil
 }

pkg/apis/authorization/deep_copy_generated.go

@@ -23,127 +23,160 @@ package authorization
 import (
 	api "k8s.io/kubernetes/pkg/api"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_authorization_LocalSubjectAccessReview,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_LocalSubjectAccessReview, InType: reflect.TypeOf(func() *LocalSubjectAccessReview { var x *LocalSubjectAccessReview; return x }())},
-		DeepCopy_authorization_NonResourceAttributes,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_NonResourceAttributes, InType: reflect.TypeOf(func() *NonResourceAttributes { var x *NonResourceAttributes; return x }())},
-		DeepCopy_authorization_ResourceAttributes,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_ResourceAttributes, InType: reflect.TypeOf(func() *ResourceAttributes { var x *ResourceAttributes; return x }())},
-		DeepCopy_authorization_SelfSubjectAccessReview,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SelfSubjectAccessReview, InType: reflect.TypeOf(func() *SelfSubjectAccessReview { var x *SelfSubjectAccessReview; return x }())},
-		DeepCopy_authorization_SelfSubjectAccessReviewSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SelfSubjectAccessReviewSpec, InType: reflect.TypeOf(func() *SelfSubjectAccessReviewSpec { var x *SelfSubjectAccessReviewSpec; return x }())},
-		DeepCopy_authorization_SubjectAccessReview,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SubjectAccessReview, InType: reflect.TypeOf(func() *SubjectAccessReview { var x *SubjectAccessReview; return x }())},
-		DeepCopy_authorization_SubjectAccessReviewSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SubjectAccessReviewSpec, InType: reflect.TypeOf(func() *SubjectAccessReviewSpec { var x *SubjectAccessReviewSpec; return x }())},
-		DeepCopy_authorization_SubjectAccessReviewStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SubjectAccessReviewStatus, InType: reflect.TypeOf(func() *SubjectAccessReviewStatus { var x *SubjectAccessReviewStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_authorization_LocalSubjectAccessReview(in LocalSubjectAccessReview, out *LocalSubjectAccessReview, c *conversion.Cloner) error {
+func DeepCopy_authorization_LocalSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := DeepCopy_authorization_SubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
+		in := in.(*LocalSubjectAccessReview)
-		return err
+		out := out.(*LocalSubjectAccessReview)
-	}
+		out.TypeMeta = in.TypeMeta
-	out.Status = in.Status
+		if err := DeepCopy_authorization_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil {
-	return nil
+			return err
-}
-
-func DeepCopy_authorization_NonResourceAttributes(in NonResourceAttributes, out *NonResourceAttributes, c *conversion.Cloner) error {
-	out.Path = in.Path
-	out.Verb = in.Verb
-	return nil
-}
-
-func DeepCopy_authorization_ResourceAttributes(in ResourceAttributes, out *ResourceAttributes, c *conversion.Cloner) error {
-	out.Namespace = in.Namespace
-	out.Verb = in.Verb
-	out.Group = in.Group
-	out.Version = in.Version
-	out.Resource = in.Resource
-	out.Subresource = in.Subresource
-	out.Name = in.Name
-	return nil
-}
-
-func DeepCopy_authorization_SelfSubjectAccessReview(in SelfSubjectAccessReview, out *SelfSubjectAccessReview, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_authorization_SelfSubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	out.Status = in.Status
-	return nil
-}
-
-func DeepCopy_authorization_SelfSubjectAccessReviewSpec(in SelfSubjectAccessReviewSpec, out *SelfSubjectAccessReviewSpec, c *conversion.Cloner) error {
-	if in.ResourceAttributes != nil {
-		in, out := in.ResourceAttributes, &out.ResourceAttributes
-		*out = new(ResourceAttributes)
-		**out = *in
-	} else {
-		out.ResourceAttributes = nil
-	}
-	if in.NonResourceAttributes != nil {
-		in, out := in.NonResourceAttributes, &out.NonResourceAttributes
-		*out = new(NonResourceAttributes)
-		**out = *in
-	} else {
-		out.NonResourceAttributes = nil
-	}
-	return nil
-}
-
-func DeepCopy_authorization_SubjectAccessReview(in SubjectAccessReview, out *SubjectAccessReview, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_authorization_SubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	out.Status = in.Status
-	return nil
-}
-
-func DeepCopy_authorization_SubjectAccessReviewSpec(in SubjectAccessReviewSpec, out *SubjectAccessReviewSpec, c *conversion.Cloner) error {
-	if in.ResourceAttributes != nil {
-		in, out := in.ResourceAttributes, &out.ResourceAttributes
-		*out = new(ResourceAttributes)
-		**out = *in
-	} else {
-		out.ResourceAttributes = nil
-	}
-	if in.NonResourceAttributes != nil {
-		in, out := in.NonResourceAttributes, &out.NonResourceAttributes
-		*out = new(NonResourceAttributes)
-		**out = *in
-	} else {
-		out.NonResourceAttributes = nil
-	}
-	out.User = in.User
-	if in.Groups != nil {
-		in, out := in.Groups, &out.Groups
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Groups = nil
-	}
-	if in.Extra != nil {
-		in, out := in.Extra, &out.Extra
-		*out = make(map[string][]string)
-		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
-				return err
-			} else {
-				(*out)[key] = newVal.([]string)
-			}
 		}
-	} else {
+		out.Status = in.Status
-		out.Extra = nil
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_authorization_SubjectAccessReviewStatus(in SubjectAccessReviewStatus, out *SubjectAccessReviewStatus, c *conversion.Cloner) error {
+func DeepCopy_authorization_NonResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Allowed = in.Allowed
+	{
-	out.Reason = in.Reason
+		in := in.(*NonResourceAttributes)
-	return nil
+		out := out.(*NonResourceAttributes)
+		out.Path = in.Path
+		out.Verb = in.Verb
+		return nil
+	}
+}
+
+func DeepCopy_authorization_ResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ResourceAttributes)
+		out := out.(*ResourceAttributes)
+		out.Namespace = in.Namespace
+		out.Verb = in.Verb
+		out.Group = in.Group
+		out.Version = in.Version
+		out.Resource = in.Resource
+		out.Subresource = in.Subresource
+		out.Name = in.Name
+		return nil
+	}
+}
+
+func DeepCopy_authorization_SelfSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*SelfSubjectAccessReview)
+		out := out.(*SelfSubjectAccessReview)
+		out.TypeMeta = in.TypeMeta
+		if err := DeepCopy_authorization_SelfSubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		out.Status = in.Status
+		return nil
+	}
+}
+
+func DeepCopy_authorization_SelfSubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*SelfSubjectAccessReviewSpec)
+		out := out.(*SelfSubjectAccessReviewSpec)
+		if in.ResourceAttributes != nil {
+			in, out := &in.ResourceAttributes, &out.ResourceAttributes
+			*out = new(ResourceAttributes)
+			**out = **in
+		} else {
+			out.ResourceAttributes = nil
+		}
+		if in.NonResourceAttributes != nil {
+			in, out := &in.NonResourceAttributes, &out.NonResourceAttributes
+			*out = new(NonResourceAttributes)
+			**out = **in
+		} else {
+			out.NonResourceAttributes = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_authorization_SubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*SubjectAccessReview)
+		out := out.(*SubjectAccessReview)
+		out.TypeMeta = in.TypeMeta
+		if err := DeepCopy_authorization_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		out.Status = in.Status
+		return nil
+	}
+}
+
+func DeepCopy_authorization_SubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*SubjectAccessReviewSpec)
+		out := out.(*SubjectAccessReviewSpec)
+		if in.ResourceAttributes != nil {
+			in, out := &in.ResourceAttributes, &out.ResourceAttributes
+			*out = new(ResourceAttributes)
+			**out = **in
+		} else {
+			out.ResourceAttributes = nil
+		}
+		if in.NonResourceAttributes != nil {
+			in, out := &in.NonResourceAttributes, &out.NonResourceAttributes
+			*out = new(NonResourceAttributes)
+			**out = **in
+		} else {
+			out.NonResourceAttributes = nil
+		}
+		out.User = in.User
+		if in.Groups != nil {
+			in, out := &in.Groups, &out.Groups
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Groups = nil
+		}
+		if in.Extra != nil {
+			in, out := &in.Extra, &out.Extra
+			*out = make(map[string][]string)
+			for key, val := range *in {
+				if newVal, err := c.DeepCopy(&val); err != nil {
+					return err
+				} else {
+					(*out)[key] = *newVal.(*[]string)
+				}
+			}
+		} else {
+			out.Extra = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_authorization_SubjectAccessReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*SubjectAccessReviewStatus)
+		out := out.(*SubjectAccessReviewStatus)
+		out.Allowed = in.Allowed
+		out.Reason = in.Reason
+		return nil
+	}
 }

pkg/apis/authorization/v1beta1/deep_copy_generated.go

@@ -23,127 +23,160 @@ package v1beta1
 import (
 	api "k8s.io/kubernetes/pkg/api"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v1beta1_LocalSubjectAccessReview,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_LocalSubjectAccessReview, InType: reflect.TypeOf(func() *LocalSubjectAccessReview { var x *LocalSubjectAccessReview; return x }())},
-		DeepCopy_v1beta1_NonResourceAttributes,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NonResourceAttributes, InType: reflect.TypeOf(func() *NonResourceAttributes { var x *NonResourceAttributes; return x }())},
-		DeepCopy_v1beta1_ResourceAttributes,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ResourceAttributes, InType: reflect.TypeOf(func() *ResourceAttributes { var x *ResourceAttributes; return x }())},
-		DeepCopy_v1beta1_SelfSubjectAccessReview,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SelfSubjectAccessReview, InType: reflect.TypeOf(func() *SelfSubjectAccessReview { var x *SelfSubjectAccessReview; return x }())},
-		DeepCopy_v1beta1_SelfSubjectAccessReviewSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SelfSubjectAccessReviewSpec, InType: reflect.TypeOf(func() *SelfSubjectAccessReviewSpec { var x *SelfSubjectAccessReviewSpec; return x }())},
-		DeepCopy_v1beta1_SubjectAccessReview,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubjectAccessReview, InType: reflect.TypeOf(func() *SubjectAccessReview { var x *SubjectAccessReview; return x }())},
-		DeepCopy_v1beta1_SubjectAccessReviewSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubjectAccessReviewSpec, InType: reflect.TypeOf(func() *SubjectAccessReviewSpec { var x *SubjectAccessReviewSpec; return x }())},
-		DeepCopy_v1beta1_SubjectAccessReviewStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubjectAccessReviewStatus, InType: reflect.TypeOf(func() *SubjectAccessReviewStatus { var x *SubjectAccessReviewStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v1beta1_LocalSubjectAccessReview(in LocalSubjectAccessReview, out *LocalSubjectAccessReview, c *conversion.Cloner) error {
+func DeepCopy_v1beta1_LocalSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := DeepCopy_v1beta1_SubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
+		in := in.(*LocalSubjectAccessReview)
-		return err
+		out := out.(*LocalSubjectAccessReview)
-	}
+		out.TypeMeta = in.TypeMeta
-	out.Status = in.Status
+		if err := DeepCopy_v1beta1_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil {
-	return nil
+			return err
-}
-
-func DeepCopy_v1beta1_NonResourceAttributes(in NonResourceAttributes, out *NonResourceAttributes, c *conversion.Cloner) error {
-	out.Path = in.Path
-	out.Verb = in.Verb
-	return nil
-}
-
-func DeepCopy_v1beta1_ResourceAttributes(in ResourceAttributes, out *ResourceAttributes, c *conversion.Cloner) error {
-	out.Namespace = in.Namespace
-	out.Verb = in.Verb
-	out.Group = in.Group
-	out.Version = in.Version
-	out.Resource = in.Resource
-	out.Subresource = in.Subresource
-	out.Name = in.Name
-	return nil
-}
-
-func DeepCopy_v1beta1_SelfSubjectAccessReview(in SelfSubjectAccessReview, out *SelfSubjectAccessReview, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	out.Status = in.Status
-	return nil
-}
-
-func DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(in SelfSubjectAccessReviewSpec, out *SelfSubjectAccessReviewSpec, c *conversion.Cloner) error {
-	if in.ResourceAttributes != nil {
-		in, out := in.ResourceAttributes, &out.ResourceAttributes
-		*out = new(ResourceAttributes)
-		**out = *in
-	} else {
-		out.ResourceAttributes = nil
-	}
-	if in.NonResourceAttributes != nil {
-		in, out := in.NonResourceAttributes, &out.NonResourceAttributes
-		*out = new(NonResourceAttributes)
-		**out = *in
-	} else {
-		out.NonResourceAttributes = nil
-	}
-	return nil
-}
-
-func DeepCopy_v1beta1_SubjectAccessReview(in SubjectAccessReview, out *SubjectAccessReview, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_v1beta1_SubjectAccessReviewSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	out.Status = in.Status
-	return nil
-}
-
-func DeepCopy_v1beta1_SubjectAccessReviewSpec(in SubjectAccessReviewSpec, out *SubjectAccessReviewSpec, c *conversion.Cloner) error {
-	if in.ResourceAttributes != nil {
-		in, out := in.ResourceAttributes, &out.ResourceAttributes
-		*out = new(ResourceAttributes)
-		**out = *in
-	} else {
-		out.ResourceAttributes = nil
-	}
-	if in.NonResourceAttributes != nil {
-		in, out := in.NonResourceAttributes, &out.NonResourceAttributes
-		*out = new(NonResourceAttributes)
-		**out = *in
-	} else {
-		out.NonResourceAttributes = nil
-	}
-	out.User = in.User
-	if in.Groups != nil {
-		in, out := in.Groups, &out.Groups
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Groups = nil
-	}
-	if in.Extra != nil {
-		in, out := in.Extra, &out.Extra
-		*out = make(map[string][]string)
-		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
-				return err
-			} else {
-				(*out)[key] = newVal.([]string)
-			}
 		}
-	} else {
+		out.Status = in.Status
-		out.Extra = nil
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_v1beta1_SubjectAccessReviewStatus(in SubjectAccessReviewStatus, out *SubjectAccessReviewStatus, c *conversion.Cloner) error {
+func DeepCopy_v1beta1_NonResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Allowed = in.Allowed
+	{
-	out.Reason = in.Reason
+		in := in.(*NonResourceAttributes)
-	return nil
+		out := out.(*NonResourceAttributes)
+		out.Path = in.Path
+		out.Verb = in.Verb
+		return nil
+	}
+}
+
+func DeepCopy_v1beta1_ResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ResourceAttributes)
+		out := out.(*ResourceAttributes)
+		out.Namespace = in.Namespace
+		out.Verb = in.Verb
+		out.Group = in.Group
+		out.Version = in.Version
+		out.Resource = in.Resource
+		out.Subresource = in.Subresource
+		out.Name = in.Name
+		return nil
+	}
+}
+
+func DeepCopy_v1beta1_SelfSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*SelfSubjectAccessReview)
+		out := out.(*SelfSubjectAccessReview)
+		out.TypeMeta = in.TypeMeta
+		if err := DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		out.Status = in.Status
+		return nil
+	}
+}
+
+func DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*SelfSubjectAccessReviewSpec)
+		out := out.(*SelfSubjectAccessReviewSpec)
+		if in.ResourceAttributes != nil {
+			in, out := &in.ResourceAttributes, &out.ResourceAttributes
+			*out = new(ResourceAttributes)
+			**out = **in
+		} else {
+			out.ResourceAttributes = nil
+		}
+		if in.NonResourceAttributes != nil {
+			in, out := &in.NonResourceAttributes, &out.NonResourceAttributes
+			*out = new(NonResourceAttributes)
+			**out = **in
+		} else {
+			out.NonResourceAttributes = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1beta1_SubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*SubjectAccessReview)
+		out := out.(*SubjectAccessReview)
+		out.TypeMeta = in.TypeMeta
+		if err := DeepCopy_v1beta1_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		out.Status = in.Status
+		return nil
+	}
+}
+
+func DeepCopy_v1beta1_SubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*SubjectAccessReviewSpec)
+		out := out.(*SubjectAccessReviewSpec)
+		if in.ResourceAttributes != nil {
+			in, out := &in.ResourceAttributes, &out.ResourceAttributes
+			*out = new(ResourceAttributes)
+			**out = **in
+		} else {
+			out.ResourceAttributes = nil
+		}
+		if in.NonResourceAttributes != nil {
+			in, out := &in.NonResourceAttributes, &out.NonResourceAttributes
+			*out = new(NonResourceAttributes)
+			**out = **in
+		} else {
+			out.NonResourceAttributes = nil
+		}
+		out.User = in.User
+		if in.Groups != nil {
+			in, out := &in.Groups, &out.Groups
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Groups = nil
+		}
+		if in.Extra != nil {
+			in, out := &in.Extra, &out.Extra
+			*out = make(map[string][]string)
+			for key, val := range *in {
+				if newVal, err := c.DeepCopy(&val); err != nil {
+					return err
+				} else {
+					(*out)[key] = *newVal.(*[]string)
+				}
+			}
+		} else {
+			out.Extra = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1beta1_SubjectAccessReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*SubjectAccessReviewStatus)
+		out := out.(*SubjectAccessReviewStatus)
+		out.Allowed = in.Allowed
+		out.Reason = in.Reason
+		return nil
+	}
 }

pkg/apis/autoscaling/deep_copy_generated.go

@@ -24,126 +24,159 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_autoscaling_CrossVersionObjectReference,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_CrossVersionObjectReference, InType: reflect.TypeOf(func() *CrossVersionObjectReference { var x *CrossVersionObjectReference; return x }())},
-		DeepCopy_autoscaling_HorizontalPodAutoscaler,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscaler, InType: reflect.TypeOf(func() *HorizontalPodAutoscaler { var x *HorizontalPodAutoscaler; return x }())},
-		DeepCopy_autoscaling_HorizontalPodAutoscalerList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscalerList, InType: reflect.TypeOf(func() *HorizontalPodAutoscalerList { var x *HorizontalPodAutoscalerList; return x }())},
-		DeepCopy_autoscaling_HorizontalPodAutoscalerSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscalerSpec, InType: reflect.TypeOf(func() *HorizontalPodAutoscalerSpec { var x *HorizontalPodAutoscalerSpec; return x }())},
-		DeepCopy_autoscaling_HorizontalPodAutoscalerStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscalerStatus, InType: reflect.TypeOf(func() *HorizontalPodAutoscalerStatus { var x *HorizontalPodAutoscalerStatus; return x }())},
-		DeepCopy_autoscaling_Scale,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_Scale, InType: reflect.TypeOf(func() *Scale { var x *Scale; return x }())},
-		DeepCopy_autoscaling_ScaleSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_ScaleSpec, InType: reflect.TypeOf(func() *ScaleSpec { var x *ScaleSpec; return x }())},
-		DeepCopy_autoscaling_ScaleStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_ScaleStatus, InType: reflect.TypeOf(func() *ScaleStatus { var x *ScaleStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_autoscaling_CrossVersionObjectReference(in CrossVersionObjectReference, out *CrossVersionObjectReference, c *conversion.Cloner) error {
+func DeepCopy_autoscaling_CrossVersionObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Kind = in.Kind
+	{
-	out.Name = in.Name
+		in := in.(*CrossVersionObjectReference)
-	out.APIVersion = in.APIVersion
+		out := out.(*CrossVersionObjectReference)
-	return nil
+		out.Kind = in.Kind
+		out.Name = in.Name
+		out.APIVersion = in.APIVersion
+		return nil
+	}
 }
 
-func DeepCopy_autoscaling_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, c *conversion.Cloner) error {
+func DeepCopy_autoscaling_HorizontalPodAutoscaler(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*HorizontalPodAutoscaler)
-		return err
+		out := out.(*HorizontalPodAutoscaler)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_autoscaling_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
+			return err
-	}
-	if err := DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_autoscaling_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]HorizontalPodAutoscaler, len(in))
-		for i := range in {
-			if err := DeepCopy_autoscaling_HorizontalPodAutoscaler(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
 		}
-	} else {
+		if err := DeepCopy_autoscaling_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Items = nil
+			return err
+		}
+		if err := DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_autoscaling_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error {
+func DeepCopy_autoscaling_HorizontalPodAutoscalerList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.ScaleTargetRef = in.ScaleTargetRef
+	{
-	if in.MinReplicas != nil {
+		in := in.(*HorizontalPodAutoscalerList)
-		in, out := in.MinReplicas, &out.MinReplicas
+		out := out.(*HorizontalPodAutoscalerList)
-		*out = new(int32)
+		out.TypeMeta = in.TypeMeta
-		**out = *in
+		out.ListMeta = in.ListMeta
-	} else {
+		if in.Items != nil {
-		out.MinReplicas = nil
+			in, out := &in.Items, &out.Items
+			*out = make([]HorizontalPodAutoscaler, len(*in))
+			for i := range *in {
+				if err := DeepCopy_autoscaling_HorizontalPodAutoscaler(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
 	}
-	out.MaxReplicas = in.MaxReplicas
-	if in.TargetCPUUtilizationPercentage != nil {
-		in, out := in.TargetCPUUtilizationPercentage, &out.TargetCPUUtilizationPercentage
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.TargetCPUUtilizationPercentage = nil
-	}
-	return nil
 }
 
-func DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, c *conversion.Cloner) error {
+func DeepCopy_autoscaling_HorizontalPodAutoscalerSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.ObservedGeneration != nil {
+	{
-		in, out := in.ObservedGeneration, &out.ObservedGeneration
+		in := in.(*HorizontalPodAutoscalerSpec)
-		*out = new(int64)
+		out := out.(*HorizontalPodAutoscalerSpec)
-		**out = *in
+		out.ScaleTargetRef = in.ScaleTargetRef
-	} else {
+		if in.MinReplicas != nil {
-		out.ObservedGeneration = nil
+			in, out := &in.MinReplicas, &out.MinReplicas
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.MinReplicas = nil
+		}
+		out.MaxReplicas = in.MaxReplicas
+		if in.TargetCPUUtilizationPercentage != nil {
+			in, out := &in.TargetCPUUtilizationPercentage, &out.TargetCPUUtilizationPercentage
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.TargetCPUUtilizationPercentage = nil
+		}
+		return nil
 	}
-	if in.LastScaleTime != nil {
-		in, out := in.LastScaleTime, &out.LastScaleTime
-		*out = new(unversioned.Time)
-		**out = in.DeepCopy()
-	} else {
-		out.LastScaleTime = nil
-	}
-	out.CurrentReplicas = in.CurrentReplicas
-	out.DesiredReplicas = in.DesiredReplicas
-	if in.CurrentCPUUtilizationPercentage != nil {
-		in, out := in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.CurrentCPUUtilizationPercentage = nil
-	}
-	return nil
 }
 
-func DeepCopy_autoscaling_Scale(in Scale, out *Scale, c *conversion.Cloner) error {
+func DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*HorizontalPodAutoscalerStatus)
-		return err
+		out := out.(*HorizontalPodAutoscalerStatus)
+		if in.ObservedGeneration != nil {
+			in, out := &in.ObservedGeneration, &out.ObservedGeneration
+			*out = new(int64)
+			**out = **in
+		} else {
+			out.ObservedGeneration = nil
+		}
+		if in.LastScaleTime != nil {
+			in, out := &in.LastScaleTime, &out.LastScaleTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.LastScaleTime = nil
+		}
+		out.CurrentReplicas = in.CurrentReplicas
+		out.DesiredReplicas = in.DesiredReplicas
+		if in.CurrentCPUUtilizationPercentage != nil {
+			in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.CurrentCPUUtilizationPercentage = nil
+		}
+		return nil
 	}
-	out.Spec = in.Spec
-	out.Status = in.Status
-	return nil
 }
 
-func DeepCopy_autoscaling_ScaleSpec(in ScaleSpec, out *ScaleSpec, c *conversion.Cloner) error {
+func DeepCopy_autoscaling_Scale(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Replicas = in.Replicas
+	{
-	return nil
+		in := in.(*Scale)
+		out := out.(*Scale)
+		out.TypeMeta = in.TypeMeta
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		out.Spec = in.Spec
+		out.Status = in.Status
+		return nil
+	}
 }
 
-func DeepCopy_autoscaling_ScaleStatus(in ScaleStatus, out *ScaleStatus, c *conversion.Cloner) error {
+func DeepCopy_autoscaling_ScaleSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Replicas = in.Replicas
+	{
-	out.Selector = in.Selector
+		in := in.(*ScaleSpec)
-	return nil
+		out := out.(*ScaleSpec)
+		out.Replicas = in.Replicas
+		return nil
+	}
+}
+
+func DeepCopy_autoscaling_ScaleStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ScaleStatus)
+		out := out.(*ScaleStatus)
+		out.Replicas = in.Replicas
+		out.Selector = in.Selector
+		return nil
+	}
 }

pkg/apis/autoscaling/v1/deep_copy_generated.go

@@ -25,126 +25,159 @@ import (
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v1_CrossVersionObjectReference,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_CrossVersionObjectReference, InType: reflect.TypeOf(func() *CrossVersionObjectReference { var x *CrossVersionObjectReference; return x }())},
-		DeepCopy_v1_HorizontalPodAutoscaler,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscaler, InType: reflect.TypeOf(func() *HorizontalPodAutoscaler { var x *HorizontalPodAutoscaler; return x }())},
-		DeepCopy_v1_HorizontalPodAutoscalerList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscalerList, InType: reflect.TypeOf(func() *HorizontalPodAutoscalerList { var x *HorizontalPodAutoscalerList; return x }())},
-		DeepCopy_v1_HorizontalPodAutoscalerSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscalerSpec, InType: reflect.TypeOf(func() *HorizontalPodAutoscalerSpec { var x *HorizontalPodAutoscalerSpec; return x }())},
-		DeepCopy_v1_HorizontalPodAutoscalerStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscalerStatus, InType: reflect.TypeOf(func() *HorizontalPodAutoscalerStatus { var x *HorizontalPodAutoscalerStatus; return x }())},
-		DeepCopy_v1_Scale,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Scale, InType: reflect.TypeOf(func() *Scale { var x *Scale; return x }())},
-		DeepCopy_v1_ScaleSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ScaleSpec, InType: reflect.TypeOf(func() *ScaleSpec { var x *ScaleSpec; return x }())},
-		DeepCopy_v1_ScaleStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ScaleStatus, InType: reflect.TypeOf(func() *ScaleStatus { var x *ScaleStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v1_CrossVersionObjectReference(in CrossVersionObjectReference, out *CrossVersionObjectReference, c *conversion.Cloner) error {
+func DeepCopy_v1_CrossVersionObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Kind = in.Kind
+	{
-	out.Name = in.Name
+		in := in.(*CrossVersionObjectReference)
-	out.APIVersion = in.APIVersion
+		out := out.(*CrossVersionObjectReference)
-	return nil
+		out.Kind = in.Kind
+		out.Name = in.Name
+		out.APIVersion = in.APIVersion
+		return nil
+	}
 }
 
-func DeepCopy_v1_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, c *conversion.Cloner) error {
+func DeepCopy_v1_HorizontalPodAutoscaler(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api_v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*HorizontalPodAutoscaler)
-		return err
+		out := out.(*HorizontalPodAutoscaler)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_v1_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := api_v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
+			return err
-	}
-	if err := DeepCopy_v1_HorizontalPodAutoscalerStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_v1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]HorizontalPodAutoscaler, len(in))
-		for i := range in {
-			if err := DeepCopy_v1_HorizontalPodAutoscaler(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
 		}
-	} else {
+		if err := DeepCopy_v1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Items = nil
+			return err
+		}
+		if err := DeepCopy_v1_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_v1_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error {
+func DeepCopy_v1_HorizontalPodAutoscalerList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.ScaleTargetRef = in.ScaleTargetRef
+	{
-	if in.MinReplicas != nil {
+		in := in.(*HorizontalPodAutoscalerList)
-		in, out := in.MinReplicas, &out.MinReplicas
+		out := out.(*HorizontalPodAutoscalerList)
-		*out = new(int32)
+		out.TypeMeta = in.TypeMeta
-		**out = *in
+		out.ListMeta = in.ListMeta
-	} else {
+		if in.Items != nil {
-		out.MinReplicas = nil
+			in, out := &in.Items, &out.Items
+			*out = make([]HorizontalPodAutoscaler, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1_HorizontalPodAutoscaler(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
 	}
-	out.MaxReplicas = in.MaxReplicas
-	if in.TargetCPUUtilizationPercentage != nil {
-		in, out := in.TargetCPUUtilizationPercentage, &out.TargetCPUUtilizationPercentage
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.TargetCPUUtilizationPercentage = nil
-	}
-	return nil
 }
 
-func DeepCopy_v1_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, c *conversion.Cloner) error {
+func DeepCopy_v1_HorizontalPodAutoscalerSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.ObservedGeneration != nil {
+	{
-		in, out := in.ObservedGeneration, &out.ObservedGeneration
+		in := in.(*HorizontalPodAutoscalerSpec)
-		*out = new(int64)
+		out := out.(*HorizontalPodAutoscalerSpec)
-		**out = *in
+		out.ScaleTargetRef = in.ScaleTargetRef
-	} else {
+		if in.MinReplicas != nil {
-		out.ObservedGeneration = nil
+			in, out := &in.MinReplicas, &out.MinReplicas
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.MinReplicas = nil
+		}
+		out.MaxReplicas = in.MaxReplicas
+		if in.TargetCPUUtilizationPercentage != nil {
+			in, out := &in.TargetCPUUtilizationPercentage, &out.TargetCPUUtilizationPercentage
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.TargetCPUUtilizationPercentage = nil
+		}
+		return nil
 	}
-	if in.LastScaleTime != nil {
-		in, out := in.LastScaleTime, &out.LastScaleTime
-		*out = new(unversioned.Time)
-		**out = in.DeepCopy()
-	} else {
-		out.LastScaleTime = nil
-	}
-	out.CurrentReplicas = in.CurrentReplicas
-	out.DesiredReplicas = in.DesiredReplicas
-	if in.CurrentCPUUtilizationPercentage != nil {
-		in, out := in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.CurrentCPUUtilizationPercentage = nil
-	}
-	return nil
 }
 
-func DeepCopy_v1_Scale(in Scale, out *Scale, c *conversion.Cloner) error {
+func DeepCopy_v1_HorizontalPodAutoscalerStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api_v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*HorizontalPodAutoscalerStatus)
-		return err
+		out := out.(*HorizontalPodAutoscalerStatus)
+		if in.ObservedGeneration != nil {
+			in, out := &in.ObservedGeneration, &out.ObservedGeneration
+			*out = new(int64)
+			**out = **in
+		} else {
+			out.ObservedGeneration = nil
+		}
+		if in.LastScaleTime != nil {
+			in, out := &in.LastScaleTime, &out.LastScaleTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.LastScaleTime = nil
+		}
+		out.CurrentReplicas = in.CurrentReplicas
+		out.DesiredReplicas = in.DesiredReplicas
+		if in.CurrentCPUUtilizationPercentage != nil {
+			in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.CurrentCPUUtilizationPercentage = nil
+		}
+		return nil
 	}
-	out.Spec = in.Spec
-	out.Status = in.Status
-	return nil
 }
 
-func DeepCopy_v1_ScaleSpec(in ScaleSpec, out *ScaleSpec, c *conversion.Cloner) error {
+func DeepCopy_v1_Scale(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Replicas = in.Replicas
+	{
-	return nil
+		in := in.(*Scale)
+		out := out.(*Scale)
+		out.TypeMeta = in.TypeMeta
+		if err := api_v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		out.Spec = in.Spec
+		out.Status = in.Status
+		return nil
+	}
 }
 
-func DeepCopy_v1_ScaleStatus(in ScaleStatus, out *ScaleStatus, c *conversion.Cloner) error {
+func DeepCopy_v1_ScaleSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Replicas = in.Replicas
+	{
-	out.Selector = in.Selector
+		in := in.(*ScaleSpec)
-	return nil
+		out := out.(*ScaleSpec)
+		out.Replicas = in.Replicas
+		return nil
+	}
+}
+
+func DeepCopy_v1_ScaleStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ScaleStatus)
+		out := out.(*ScaleStatus)
+		out.Replicas = in.Replicas
+		out.Selector = in.Selector
+		return nil
+	}
 }

pkg/apis/autoscaling/v1/generated.proto

@@ -24,6 +24,7 @@ package k8s.io.kubernetes.pkg.apis.autoscaling.v1;
 import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
+import "k8s.io/kubernetes/pkg/runtime/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".

pkg/apis/batch/deep_copy_generated.go

@@ -24,235 +24,280 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_batch_Job,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_Job, InType: reflect.TypeOf(func() *Job { var x *Job; return x }())},
-		DeepCopy_batch_JobCondition,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobCondition, InType: reflect.TypeOf(func() *JobCondition { var x *JobCondition; return x }())},
-		DeepCopy_batch_JobList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobList, InType: reflect.TypeOf(func() *JobList { var x *JobList; return x }())},
-		DeepCopy_batch_JobSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobSpec, InType: reflect.TypeOf(func() *JobSpec { var x *JobSpec; return x }())},
-		DeepCopy_batch_JobStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobStatus, InType: reflect.TypeOf(func() *JobStatus { var x *JobStatus; return x }())},
-		DeepCopy_batch_JobTemplate,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobTemplate, InType: reflect.TypeOf(func() *JobTemplate { var x *JobTemplate; return x }())},
-		DeepCopy_batch_JobTemplateSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobTemplateSpec, InType: reflect.TypeOf(func() *JobTemplateSpec { var x *JobTemplateSpec; return x }())},
-		DeepCopy_batch_ScheduledJob,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_ScheduledJob, InType: reflect.TypeOf(func() *ScheduledJob { var x *ScheduledJob; return x }())},
-		DeepCopy_batch_ScheduledJobList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_ScheduledJobList, InType: reflect.TypeOf(func() *ScheduledJobList { var x *ScheduledJobList; return x }())},
-		DeepCopy_batch_ScheduledJobSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_ScheduledJobSpec, InType: reflect.TypeOf(func() *ScheduledJobSpec { var x *ScheduledJobSpec; return x }())},
-		DeepCopy_batch_ScheduledJobStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_ScheduledJobStatus, InType: reflect.TypeOf(func() *ScheduledJobStatus { var x *ScheduledJobStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_batch_Job(in Job, out *Job, c *conversion.Cloner) error {
+func DeepCopy_batch_Job(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*Job)
-		return err
+		out := out.(*Job)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_batch_JobSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_batch_JobStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_batch_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error {
-	out.Type = in.Type
-	out.Status = in.Status
-	out.LastProbeTime = in.LastProbeTime.DeepCopy()
-	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
-	out.Reason = in.Reason
-	out.Message = in.Message
-	return nil
-}
-
-func DeepCopy_batch_JobList(in JobList, out *JobList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]Job, len(in))
-		for i := range in {
-			if err := DeepCopy_batch_Job(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_batch_JobSpec(in JobSpec, out *JobSpec, c *conversion.Cloner) error {
-	if in.Parallelism != nil {
-		in, out := in.Parallelism, &out.Parallelism
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.Parallelism = nil
-	}
-	if in.Completions != nil {
-		in, out := in.Completions, &out.Completions
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.Completions = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		in, out := in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
-		*out = new(int64)
-		**out = *in
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
-	if in.Selector != nil {
-		in, out := in.Selector, &out.Selector
-		*out = new(unversioned.LabelSelector)
-		if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil {
 			return err
 		}
-	} else {
+		if err := DeepCopy_batch_JobSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Selector = nil
+			return err
+		}
+		if err := DeepCopy_batch_JobStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	if in.ManualSelector != nil {
-		in, out := in.ManualSelector, &out.ManualSelector
-		*out = new(bool)
-		**out = *in
-	} else {
-		out.ManualSelector = nil
-	}
-	if err := api.DeepCopy_api_PodTemplateSpec(in.Template, &out.Template, c); err != nil {
-		return err
-	}
-	return nil
 }
 
-func DeepCopy_batch_JobStatus(in JobStatus, out *JobStatus, c *conversion.Cloner) error {
+func DeepCopy_batch_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.Conditions != nil {
+	{
-		in, out := in.Conditions, &out.Conditions
+		in := in.(*JobCondition)
-		*out = make([]JobCondition, len(in))
+		out := out.(*JobCondition)
-		for i := range in {
+		out.Type = in.Type
-			if err := DeepCopy_batch_JobCondition(in[i], &(*out)[i], c); err != nil {
+		out.Status = in.Status
+		out.LastProbeTime = in.LastProbeTime.DeepCopy()
+		out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
+		out.Reason = in.Reason
+		out.Message = in.Message
+		return nil
+	}
+}
+
+func DeepCopy_batch_JobList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*JobList)
+		out := out.(*JobList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]Job, len(*in))
+			for i := range *in {
+				if err := DeepCopy_batch_Job(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_batch_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*JobSpec)
+		out := out.(*JobSpec)
+		if in.Parallelism != nil {
+			in, out := &in.Parallelism, &out.Parallelism
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.Parallelism = nil
+		}
+		if in.Completions != nil {
+			in, out := &in.Completions, &out.Completions
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.Completions = nil
+		}
+		if in.ActiveDeadlineSeconds != nil {
+			in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
+			*out = new(int64)
+			**out = **in
+		} else {
+			out.ActiveDeadlineSeconds = nil
+		}
+		if in.Selector != nil {
+			in, out := &in.Selector, &out.Selector
+			*out = new(unversioned.LabelSelector)
+			if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil {
 				return err
 			}
+		} else {
+			out.Selector = nil
 		}
-	} else {
+		if in.ManualSelector != nil {
-		out.Conditions = nil
+			in, out := &in.ManualSelector, &out.ManualSelector
+			*out = new(bool)
+			**out = **in
+		} else {
+			out.ManualSelector = nil
+		}
+		if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	if in.StartTime != nil {
-		in, out := in.StartTime, &out.StartTime
-		*out = new(unversioned.Time)
-		**out = in.DeepCopy()
-	} else {
-		out.StartTime = nil
-	}
-	if in.CompletionTime != nil {
-		in, out := in.CompletionTime, &out.CompletionTime
-		*out = new(unversioned.Time)
-		**out = in.DeepCopy()
-	} else {
-		out.CompletionTime = nil
-	}
-	out.Active = in.Active
-	out.Succeeded = in.Succeeded
-	out.Failed = in.Failed
-	return nil
 }
 
-func DeepCopy_batch_JobTemplate(in JobTemplate, out *JobTemplate, c *conversion.Cloner) error {
+func DeepCopy_batch_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*JobStatus)
-		return err
+		out := out.(*JobStatus)
-	}
+		if in.Conditions != nil {
-	if err := DeepCopy_batch_JobTemplateSpec(in.Template, &out.Template, c); err != nil {
+			in, out := &in.Conditions, &out.Conditions
-		return err
+			*out = make([]JobCondition, len(*in))
-	}
+			for i := range *in {
-	return nil
+				if err := DeepCopy_batch_JobCondition(&(*in)[i], &(*out)[i], c); err != nil {
-}
+					return err
-
+				}
-func DeepCopy_batch_JobTemplateSpec(in JobTemplateSpec, out *JobTemplateSpec, c *conversion.Cloner) error {
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_batch_JobSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_batch_ScheduledJob(in ScheduledJob, out *ScheduledJob, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_batch_ScheduledJobSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_batch_ScheduledJobStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_batch_ScheduledJobList(in ScheduledJobList, out *ScheduledJobList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]ScheduledJob, len(in))
-		for i := range in {
-			if err := DeepCopy_batch_ScheduledJob(in[i], &(*out)[i], c); err != nil {
-				return err
 			}
+		} else {
+			out.Conditions = nil
 		}
-	} else {
+		if in.StartTime != nil {
-		out.Items = nil
+			in, out := &in.StartTime, &out.StartTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.StartTime = nil
+		}
+		if in.CompletionTime != nil {
+			in, out := &in.CompletionTime, &out.CompletionTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.CompletionTime = nil
+		}
+		out.Active = in.Active
+		out.Succeeded = in.Succeeded
+		out.Failed = in.Failed
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_batch_ScheduledJobSpec(in ScheduledJobSpec, out *ScheduledJobSpec, c *conversion.Cloner) error {
+func DeepCopy_batch_JobTemplate(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Schedule = in.Schedule
+	{
-	if in.StartingDeadlineSeconds != nil {
+		in := in.(*JobTemplate)
-		in, out := in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds
+		out := out.(*JobTemplate)
-		*out = new(int64)
+		out.TypeMeta = in.TypeMeta
-		**out = *in
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-	} else {
+			return err
-		out.StartingDeadlineSeconds = nil
+		}
+		if err := DeepCopy_batch_JobTemplateSpec(&in.Template, &out.Template, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	out.ConcurrencyPolicy = in.ConcurrencyPolicy
-	if in.Suspend != nil {
-		in, out := in.Suspend, &out.Suspend
-		*out = new(bool)
-		**out = *in
-	} else {
-		out.Suspend = nil
-	}
-	if err := DeepCopy_batch_JobTemplateSpec(in.JobTemplate, &out.JobTemplate, c); err != nil {
-		return err
-	}
-	return nil
 }
 
-func DeepCopy_batch_ScheduledJobStatus(in ScheduledJobStatus, out *ScheduledJobStatus, c *conversion.Cloner) error {
+func DeepCopy_batch_JobTemplateSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.Active != nil {
+	{
-		in, out := in.Active, &out.Active
+		in := in.(*JobTemplateSpec)
-		*out = make([]api.ObjectReference, len(in))
+		out := out.(*JobTemplateSpec)
-		for i := range in {
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-			(*out)[i] = in[i]
+			return err
 		}
-	} else {
+		if err := DeepCopy_batch_JobSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Active = nil
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_batch_ScheduledJob(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ScheduledJob)
+		out := out.(*ScheduledJob)
+		out.TypeMeta = in.TypeMeta
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_batch_ScheduledJobSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_batch_ScheduledJobStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_batch_ScheduledJobList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ScheduledJobList)
+		out := out.(*ScheduledJobList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]ScheduledJob, len(*in))
+			for i := range *in {
+				if err := DeepCopy_batch_ScheduledJob(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_batch_ScheduledJobSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ScheduledJobSpec)
+		out := out.(*ScheduledJobSpec)
+		out.Schedule = in.Schedule
+		if in.StartingDeadlineSeconds != nil {
+			in, out := &in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds
+			*out = new(int64)
+			**out = **in
+		} else {
+			out.StartingDeadlineSeconds = nil
+		}
+		out.ConcurrencyPolicy = in.ConcurrencyPolicy
+		if in.Suspend != nil {
+			in, out := &in.Suspend, &out.Suspend
+			*out = new(bool)
+			**out = **in
+		} else {
+			out.Suspend = nil
+		}
+		if err := DeepCopy_batch_JobTemplateSpec(&in.JobTemplate, &out.JobTemplate, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_batch_ScheduledJobStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ScheduledJobStatus)
+		out := out.(*ScheduledJobStatus)
+		if in.Active != nil {
+			in, out := &in.Active, &out.Active
+			*out = make([]api.ObjectReference, len(*in))
+			for i := range *in {
+				(*out)[i] = (*in)[i]
+			}
+		} else {
+			out.Active = nil
+		}
+		if in.LastScheduleTime != nil {
+			in, out := &in.LastScheduleTime, &out.LastScheduleTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.LastScheduleTime = nil
+		}
+		return nil
 	}
-	if in.LastScheduleTime != nil {
-		in, out := in.LastScheduleTime, &out.LastScheduleTime
-		*out = new(unversioned.Time)
-		**out = in.DeepCopy()
-	} else {
-		out.LastScheduleTime = nil
-	}
-	return nil
 }

pkg/apis/batch/v1/deep_copy_generated.go

@@ -25,173 +25,202 @@ import (
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v1_Job,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Job, InType: reflect.TypeOf(func() *Job { var x *Job; return x }())},
-		DeepCopy_v1_JobCondition,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobCondition, InType: reflect.TypeOf(func() *JobCondition { var x *JobCondition; return x }())},
-		DeepCopy_v1_JobList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobList, InType: reflect.TypeOf(func() *JobList { var x *JobList; return x }())},
-		DeepCopy_v1_JobSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobSpec, InType: reflect.TypeOf(func() *JobSpec { var x *JobSpec; return x }())},
-		DeepCopy_v1_JobStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobStatus, InType: reflect.TypeOf(func() *JobStatus { var x *JobStatus; return x }())},
-		DeepCopy_v1_LabelSelector,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LabelSelector, InType: reflect.TypeOf(func() *LabelSelector { var x *LabelSelector; return x }())},
-		DeepCopy_v1_LabelSelectorRequirement,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LabelSelectorRequirement, InType: reflect.TypeOf(func() *LabelSelectorRequirement { var x *LabelSelectorRequirement; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v1_Job(in Job, out *Job, c *conversion.Cloner) error {
+func DeepCopy_v1_Job(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api_v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*Job)
-		return err
+		out := out.(*Job)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_v1_JobSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := api_v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_v1_JobStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_v1_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error {
-	out.Type = in.Type
-	out.Status = in.Status
-	out.LastProbeTime = in.LastProbeTime.DeepCopy()
-	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
-	out.Reason = in.Reason
-	out.Message = in.Message
-	return nil
-}
-
-func DeepCopy_v1_JobList(in JobList, out *JobList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]Job, len(in))
-		for i := range in {
-			if err := DeepCopy_v1_Job(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_v1_JobSpec(in JobSpec, out *JobSpec, c *conversion.Cloner) error {
-	if in.Parallelism != nil {
-		in, out := in.Parallelism, &out.Parallelism
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.Parallelism = nil
-	}
-	if in.Completions != nil {
-		in, out := in.Completions, &out.Completions
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.Completions = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		in, out := in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
-		*out = new(int64)
-		**out = *in
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
-	if in.Selector != nil {
-		in, out := in.Selector, &out.Selector
-		*out = new(LabelSelector)
-		if err := DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
 			return err
 		}
-	} else {
+		if err := DeepCopy_v1_JobSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Selector = nil
+			return err
+		}
+		if err := DeepCopy_v1_JobStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	if in.ManualSelector != nil {
-		in, out := in.ManualSelector, &out.ManualSelector
-		*out = new(bool)
-		**out = *in
-	} else {
-		out.ManualSelector = nil
-	}
-	if err := api_v1.DeepCopy_v1_PodTemplateSpec(in.Template, &out.Template, c); err != nil {
-		return err
-	}
-	return nil
 }
 
-func DeepCopy_v1_JobStatus(in JobStatus, out *JobStatus, c *conversion.Cloner) error {
+func DeepCopy_v1_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.Conditions != nil {
+	{
-		in, out := in.Conditions, &out.Conditions
+		in := in.(*JobCondition)
-		*out = make([]JobCondition, len(in))
+		out := out.(*JobCondition)
-		for i := range in {
+		out.Type = in.Type
-			if err := DeepCopy_v1_JobCondition(in[i], &(*out)[i], c); err != nil {
+		out.Status = in.Status
+		out.LastProbeTime = in.LastProbeTime.DeepCopy()
+		out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
+		out.Reason = in.Reason
+		out.Message = in.Message
+		return nil
+	}
+}
+
+func DeepCopy_v1_JobList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*JobList)
+		out := out.(*JobList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]Job, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1_Job(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*JobSpec)
+		out := out.(*JobSpec)
+		if in.Parallelism != nil {
+			in, out := &in.Parallelism, &out.Parallelism
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.Parallelism = nil
+		}
+		if in.Completions != nil {
+			in, out := &in.Completions, &out.Completions
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.Completions = nil
+		}
+		if in.ActiveDeadlineSeconds != nil {
+			in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
+			*out = new(int64)
+			**out = **in
+		} else {
+			out.ActiveDeadlineSeconds = nil
+		}
+		if in.Selector != nil {
+			in, out := &in.Selector, &out.Selector
+			*out = new(LabelSelector)
+			if err := DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
 				return err
 			}
+		} else {
+			out.Selector = nil
 		}
-	} else {
+		if in.ManualSelector != nil {
-		out.Conditions = nil
+			in, out := &in.ManualSelector, &out.ManualSelector
+			*out = new(bool)
+			**out = **in
+		} else {
+			out.ManualSelector = nil
+		}
+		if err := api_v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	if in.StartTime != nil {
-		in, out := in.StartTime, &out.StartTime
-		*out = new(unversioned.Time)
-		**out = in.DeepCopy()
-	} else {
-		out.StartTime = nil
-	}
-	if in.CompletionTime != nil {
-		in, out := in.CompletionTime, &out.CompletionTime
-		*out = new(unversioned.Time)
-		**out = in.DeepCopy()
-	} else {
-		out.CompletionTime = nil
-	}
-	out.Active = in.Active
-	out.Succeeded = in.Succeeded
-	out.Failed = in.Failed
-	return nil
 }
 
-func DeepCopy_v1_LabelSelector(in LabelSelector, out *LabelSelector, c *conversion.Cloner) error {
+func DeepCopy_v1_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.MatchLabels != nil {
+	{
-		in, out := in.MatchLabels, &out.MatchLabels
+		in := in.(*JobStatus)
-		*out = make(map[string]string)
+		out := out.(*JobStatus)
-		for key, val := range in {
+		if in.Conditions != nil {
-			(*out)[key] = val
+			in, out := &in.Conditions, &out.Conditions
-		}
+			*out = make([]JobCondition, len(*in))
-	} else {
+			for i := range *in {
-		out.MatchLabels = nil
+				if err := DeepCopy_v1_JobCondition(&(*in)[i], &(*out)[i], c); err != nil {
-	}
+					return err
-	if in.MatchExpressions != nil {
+				}
-		in, out := in.MatchExpressions, &out.MatchExpressions
-		*out = make([]LabelSelectorRequirement, len(in))
-		for i := range in {
-			if err := DeepCopy_v1_LabelSelectorRequirement(in[i], &(*out)[i], c); err != nil {
-				return err
 			}
+		} else {
+			out.Conditions = nil
 		}
-	} else {
+		if in.StartTime != nil {
-		out.MatchExpressions = nil
+			in, out := &in.StartTime, &out.StartTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.StartTime = nil
+		}
+		if in.CompletionTime != nil {
+			in, out := &in.CompletionTime, &out.CompletionTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.CompletionTime = nil
+		}
+		out.Active = in.Active
+		out.Succeeded = in.Succeeded
+		out.Failed = in.Failed
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_v1_LabelSelectorRequirement(in LabelSelectorRequirement, out *LabelSelectorRequirement, c *conversion.Cloner) error {
+func DeepCopy_v1_LabelSelector(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Key = in.Key
+	{
-	out.Operator = in.Operator
+		in := in.(*LabelSelector)
-	if in.Values != nil {
+		out := out.(*LabelSelector)
-		in, out := in.Values, &out.Values
+		if in.MatchLabels != nil {
-		*out = make([]string, len(in))
+			in, out := &in.MatchLabels, &out.MatchLabels
-		copy(*out, in)
+			*out = make(map[string]string)
-	} else {
+			for key, val := range *in {
-		out.Values = nil
+				(*out)[key] = val
+			}
+		} else {
+			out.MatchLabels = nil
+		}
+		if in.MatchExpressions != nil {
+			in, out := &in.MatchExpressions, &out.MatchExpressions
+			*out = make([]LabelSelectorRequirement, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1_LabelSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.MatchExpressions = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1_LabelSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*LabelSelectorRequirement)
+		out := out.(*LabelSelectorRequirement)
+		out.Key = in.Key
+		out.Operator = in.Operator
+		if in.Values != nil {
+			in, out := &in.Values, &out.Values
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Values = nil
+		}
+		return nil
 	}
-	return nil
 }

pkg/apis/batch/v1/generated.proto

@@ -24,6 +24,7 @@ package k8s.io.kubernetes.pkg.apis.batch.v1;
 import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
+import "k8s.io/kubernetes/pkg/runtime/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".

pkg/apis/batch/v2alpha1/deep_copy_generated.go

@@ -25,274 +25,327 @@ import (
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v2alpha1_Job,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_Job, InType: reflect.TypeOf(func() *Job { var x *Job; return x }())},
-		DeepCopy_v2alpha1_JobCondition,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobCondition, InType: reflect.TypeOf(func() *JobCondition { var x *JobCondition; return x }())},
-		DeepCopy_v2alpha1_JobList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobList, InType: reflect.TypeOf(func() *JobList { var x *JobList; return x }())},
-		DeepCopy_v2alpha1_JobSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobSpec, InType: reflect.TypeOf(func() *JobSpec { var x *JobSpec; return x }())},
-		DeepCopy_v2alpha1_JobStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobStatus, InType: reflect.TypeOf(func() *JobStatus { var x *JobStatus; return x }())},
-		DeepCopy_v2alpha1_JobTemplate,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobTemplate, InType: reflect.TypeOf(func() *JobTemplate { var x *JobTemplate; return x }())},
-		DeepCopy_v2alpha1_JobTemplateSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobTemplateSpec, InType: reflect.TypeOf(func() *JobTemplateSpec { var x *JobTemplateSpec; return x }())},
-		DeepCopy_v2alpha1_LabelSelector,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_LabelSelector, InType: reflect.TypeOf(func() *LabelSelector { var x *LabelSelector; return x }())},
-		DeepCopy_v2alpha1_LabelSelectorRequirement,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_LabelSelectorRequirement, InType: reflect.TypeOf(func() *LabelSelectorRequirement { var x *LabelSelectorRequirement; return x }())},
-		DeepCopy_v2alpha1_ScheduledJob,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_ScheduledJob, InType: reflect.TypeOf(func() *ScheduledJob { var x *ScheduledJob; return x }())},
-		DeepCopy_v2alpha1_ScheduledJobList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_ScheduledJobList, InType: reflect.TypeOf(func() *ScheduledJobList { var x *ScheduledJobList; return x }())},
-		DeepCopy_v2alpha1_ScheduledJobSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_ScheduledJobSpec, InType: reflect.TypeOf(func() *ScheduledJobSpec { var x *ScheduledJobSpec; return x }())},
-		DeepCopy_v2alpha1_ScheduledJobStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_ScheduledJobStatus, InType: reflect.TypeOf(func() *ScheduledJobStatus { var x *ScheduledJobStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v2alpha1_Job(in Job, out *Job, c *conversion.Cloner) error {
+func DeepCopy_v2alpha1_Job(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*Job)
-		return err
+		out := out.(*Job)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_v2alpha1_JobSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_v2alpha1_JobStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_v2alpha1_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error {
-	out.Type = in.Type
-	out.Status = in.Status
-	out.LastProbeTime = in.LastProbeTime.DeepCopy()
-	out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
-	out.Reason = in.Reason
-	out.Message = in.Message
-	return nil
-}
-
-func DeepCopy_v2alpha1_JobList(in JobList, out *JobList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]Job, len(in))
-		for i := range in {
-			if err := DeepCopy_v2alpha1_Job(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_v2alpha1_JobSpec(in JobSpec, out *JobSpec, c *conversion.Cloner) error {
-	if in.Parallelism != nil {
-		in, out := in.Parallelism, &out.Parallelism
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.Parallelism = nil
-	}
-	if in.Completions != nil {
-		in, out := in.Completions, &out.Completions
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.Completions = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		in, out := in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
-		*out = new(int64)
-		**out = *in
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
-	if in.Selector != nil {
-		in, out := in.Selector, &out.Selector
-		*out = new(LabelSelector)
-		if err := DeepCopy_v2alpha1_LabelSelector(*in, *out, c); err != nil {
 			return err
 		}
-	} else {
+		if err := DeepCopy_v2alpha1_JobSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Selector = nil
+			return err
+		}
+		if err := DeepCopy_v2alpha1_JobStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	if in.ManualSelector != nil {
-		in, out := in.ManualSelector, &out.ManualSelector
-		*out = new(bool)
-		**out = *in
-	} else {
-		out.ManualSelector = nil
-	}
-	if err := v1.DeepCopy_v1_PodTemplateSpec(in.Template, &out.Template, c); err != nil {
-		return err
-	}
-	return nil
 }
 
-func DeepCopy_v2alpha1_JobStatus(in JobStatus, out *JobStatus, c *conversion.Cloner) error {
+func DeepCopy_v2alpha1_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.Conditions != nil {
+	{
-		in, out := in.Conditions, &out.Conditions
+		in := in.(*JobCondition)
-		*out = make([]JobCondition, len(in))
+		out := out.(*JobCondition)
-		for i := range in {
+		out.Type = in.Type
-			if err := DeepCopy_v2alpha1_JobCondition(in[i], &(*out)[i], c); err != nil {
+		out.Status = in.Status
+		out.LastProbeTime = in.LastProbeTime.DeepCopy()
+		out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
+		out.Reason = in.Reason
+		out.Message = in.Message
+		return nil
+	}
+}
+
+func DeepCopy_v2alpha1_JobList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*JobList)
+		out := out.(*JobList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]Job, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v2alpha1_Job(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v2alpha1_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*JobSpec)
+		out := out.(*JobSpec)
+		if in.Parallelism != nil {
+			in, out := &in.Parallelism, &out.Parallelism
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.Parallelism = nil
+		}
+		if in.Completions != nil {
+			in, out := &in.Completions, &out.Completions
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.Completions = nil
+		}
+		if in.ActiveDeadlineSeconds != nil {
+			in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
+			*out = new(int64)
+			**out = **in
+		} else {
+			out.ActiveDeadlineSeconds = nil
+		}
+		if in.Selector != nil {
+			in, out := &in.Selector, &out.Selector
+			*out = new(LabelSelector)
+			if err := DeepCopy_v2alpha1_LabelSelector(*in, *out, c); err != nil {
 				return err
 			}
+		} else {
+			out.Selector = nil
 		}
-	} else {
+		if in.ManualSelector != nil {
-		out.Conditions = nil
+			in, out := &in.ManualSelector, &out.ManualSelector
-	}
+			*out = new(bool)
-	if in.StartTime != nil {
+			**out = **in
-		in, out := in.StartTime, &out.StartTime
+		} else {
-		*out = new(unversioned.Time)
+			out.ManualSelector = nil
-		**out = in.DeepCopy()
-	} else {
-		out.StartTime = nil
-	}
-	if in.CompletionTime != nil {
-		in, out := in.CompletionTime, &out.CompletionTime
-		*out = new(unversioned.Time)
-		**out = in.DeepCopy()
-	} else {
-		out.CompletionTime = nil
-	}
-	out.Active = in.Active
-	out.Succeeded = in.Succeeded
-	out.Failed = in.Failed
-	return nil
-}
-
-func DeepCopy_v2alpha1_JobTemplate(in JobTemplate, out *JobTemplate, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_v2alpha1_JobTemplateSpec(in.Template, &out.Template, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_v2alpha1_JobTemplateSpec(in JobTemplateSpec, out *JobTemplateSpec, c *conversion.Cloner) error {
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_v2alpha1_JobSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_v2alpha1_LabelSelector(in LabelSelector, out *LabelSelector, c *conversion.Cloner) error {
-	if in.MatchLabels != nil {
-		in, out := in.MatchLabels, &out.MatchLabels
-		*out = make(map[string]string)
-		for key, val := range in {
-			(*out)[key] = val
 		}
-	} else {
+		if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
-		out.MatchLabels = nil
+			return err
+		}
+		return nil
 	}
-	if in.MatchExpressions != nil {
+}
-		in, out := in.MatchExpressions, &out.MatchExpressions
+
-		*out = make([]LabelSelectorRequirement, len(in))
+func DeepCopy_v2alpha1_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
-		for i := range in {
+	{
-			if err := DeepCopy_v2alpha1_LabelSelectorRequirement(in[i], &(*out)[i], c); err != nil {
+		in := in.(*JobStatus)
-				return err
+		out := out.(*JobStatus)
+		if in.Conditions != nil {
+			in, out := &in.Conditions, &out.Conditions
+			*out = make([]JobCondition, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v2alpha1_JobCondition(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
 			}
+		} else {
+			out.Conditions = nil
 		}
-	} else {
+		if in.StartTime != nil {
-		out.MatchExpressions = nil
+			in, out := &in.StartTime, &out.StartTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.StartTime = nil
+		}
+		if in.CompletionTime != nil {
+			in, out := &in.CompletionTime, &out.CompletionTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.CompletionTime = nil
+		}
+		out.Active = in.Active
+		out.Succeeded = in.Succeeded
+		out.Failed = in.Failed
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_v2alpha1_LabelSelectorRequirement(in LabelSelectorRequirement, out *LabelSelectorRequirement, c *conversion.Cloner) error {
+func DeepCopy_v2alpha1_JobTemplate(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Key = in.Key
+	{
-	out.Operator = in.Operator
+		in := in.(*JobTemplate)
-	if in.Values != nil {
+		out := out.(*JobTemplate)
-		in, out := in.Values, &out.Values
+		out.TypeMeta = in.TypeMeta
-		*out = make([]string, len(in))
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		copy(*out, in)
+			return err
-	} else {
+		}
-		out.Values = nil
+		if err := DeepCopy_v2alpha1_JobTemplateSpec(&in.Template, &out.Template, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_v2alpha1_ScheduledJob(in ScheduledJob, out *ScheduledJob, c *conversion.Cloner) error {
+func DeepCopy_v2alpha1_JobTemplateSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*JobTemplateSpec)
-		return err
+		out := out.(*JobTemplateSpec)
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_v2alpha1_JobSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	if err := DeepCopy_v2alpha1_ScheduledJobSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_v2alpha1_ScheduledJobStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
 }
 
-func DeepCopy_v2alpha1_ScheduledJobList(in ScheduledJobList, out *ScheduledJobList, c *conversion.Cloner) error {
+func DeepCopy_v2alpha1_LabelSelector(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.ListMeta = in.ListMeta
+		in := in.(*LabelSelector)
-	if in.Items != nil {
+		out := out.(*LabelSelector)
-		in, out := in.Items, &out.Items
+		if in.MatchLabels != nil {
-		*out = make([]ScheduledJob, len(in))
+			in, out := &in.MatchLabels, &out.MatchLabels
-		for i := range in {
+			*out = make(map[string]string)
-			if err := DeepCopy_v2alpha1_ScheduledJob(in[i], &(*out)[i], c); err != nil {
+			for key, val := range *in {
-				return err
+				(*out)[key] = val
 			}
+		} else {
+			out.MatchLabels = nil
 		}
-	} else {
+		if in.MatchExpressions != nil {
-		out.Items = nil
+			in, out := &in.MatchExpressions, &out.MatchExpressions
+			*out = make([]LabelSelectorRequirement, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v2alpha1_LabelSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.MatchExpressions = nil
+		}
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_v2alpha1_ScheduledJobSpec(in ScheduledJobSpec, out *ScheduledJobSpec, c *conversion.Cloner) error {
+func DeepCopy_v2alpha1_LabelSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Schedule = in.Schedule
+	{
-	if in.StartingDeadlineSeconds != nil {
+		in := in.(*LabelSelectorRequirement)
-		in, out := in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds
+		out := out.(*LabelSelectorRequirement)
-		*out = new(int64)
+		out.Key = in.Key
-		**out = *in
+		out.Operator = in.Operator
-	} else {
+		if in.Values != nil {
-		out.StartingDeadlineSeconds = nil
+			in, out := &in.Values, &out.Values
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Values = nil
+		}
+		return nil
 	}
-	out.ConcurrencyPolicy = in.ConcurrencyPolicy
-	if in.Suspend != nil {
-		in, out := in.Suspend, &out.Suspend
-		*out = new(bool)
-		**out = *in
-	} else {
-		out.Suspend = nil
-	}
-	if err := DeepCopy_v2alpha1_JobTemplateSpec(in.JobTemplate, &out.JobTemplate, c); err != nil {
-		return err
-	}
-	return nil
 }
 
-func DeepCopy_v2alpha1_ScheduledJobStatus(in ScheduledJobStatus, out *ScheduledJobStatus, c *conversion.Cloner) error {
+func DeepCopy_v2alpha1_ScheduledJob(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.Active != nil {
+	{
-		in, out := in.Active, &out.Active
+		in := in.(*ScheduledJob)
-		*out = make([]v1.ObjectReference, len(in))
+		out := out.(*ScheduledJob)
-		for i := range in {
+		out.TypeMeta = in.TypeMeta
-			(*out)[i] = in[i]
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
 		}
-	} else {
+		if err := DeepCopy_v2alpha1_ScheduledJobSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Active = nil
+			return err
+		}
+		if err := DeepCopy_v2alpha1_ScheduledJobStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v2alpha1_ScheduledJobList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ScheduledJobList)
+		out := out.(*ScheduledJobList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]ScheduledJob, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v2alpha1_ScheduledJob(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v2alpha1_ScheduledJobSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ScheduledJobSpec)
+		out := out.(*ScheduledJobSpec)
+		out.Schedule = in.Schedule
+		if in.StartingDeadlineSeconds != nil {
+			in, out := &in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds
+			*out = new(int64)
+			**out = **in
+		} else {
+			out.StartingDeadlineSeconds = nil
+		}
+		out.ConcurrencyPolicy = in.ConcurrencyPolicy
+		if in.Suspend != nil {
+			in, out := &in.Suspend, &out.Suspend
+			*out = new(bool)
+			**out = **in
+		} else {
+			out.Suspend = nil
+		}
+		if err := DeepCopy_v2alpha1_JobTemplateSpec(&in.JobTemplate, &out.JobTemplate, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v2alpha1_ScheduledJobStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ScheduledJobStatus)
+		out := out.(*ScheduledJobStatus)
+		if in.Active != nil {
+			in, out := &in.Active, &out.Active
+			*out = make([]v1.ObjectReference, len(*in))
+			for i := range *in {
+				(*out)[i] = (*in)[i]
+			}
+		} else {
+			out.Active = nil
+		}
+		if in.LastScheduleTime != nil {
+			in, out := &in.LastScheduleTime, &out.LastScheduleTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.LastScheduleTime = nil
+		}
+		return nil
 	}
-	if in.LastScheduleTime != nil {
-		in, out := in.LastScheduleTime, &out.LastScheduleTime
-		*out = new(unversioned.Time)
-		**out = in.DeepCopy()
-	} else {
-		out.LastScheduleTime = nil
-	}
-	return nil
 }

pkg/apis/batch/v2alpha1/generated.proto

@@ -24,6 +24,7 @@ package k8s.io.kubernetes.pkg.apis.batch.v2alpha1;
 import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
+import "k8s.io/kubernetes/pkg/runtime/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".

pkg/apis/certificates/deep_copy_generated.go

@@ -23,98 +23,119 @@ package certificates
 import (
 	api "k8s.io/kubernetes/pkg/api"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_certificates_CertificateSigningRequest,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequest, InType: reflect.TypeOf(func() *CertificateSigningRequest { var x *CertificateSigningRequest; return x }())},
-		DeepCopy_certificates_CertificateSigningRequestCondition,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestCondition, InType: reflect.TypeOf(func() *CertificateSigningRequestCondition { var x *CertificateSigningRequestCondition; return x }())},
-		DeepCopy_certificates_CertificateSigningRequestList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestList, InType: reflect.TypeOf(func() *CertificateSigningRequestList { var x *CertificateSigningRequestList; return x }())},
-		DeepCopy_certificates_CertificateSigningRequestSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestSpec, InType: reflect.TypeOf(func() *CertificateSigningRequestSpec { var x *CertificateSigningRequestSpec; return x }())},
-		DeepCopy_certificates_CertificateSigningRequestStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestStatus, InType: reflect.TypeOf(func() *CertificateSigningRequestStatus { var x *CertificateSigningRequestStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_certificates_CertificateSigningRequest(in CertificateSigningRequest, out *CertificateSigningRequest, c *conversion.Cloner) error {
+func DeepCopy_certificates_CertificateSigningRequest(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*CertificateSigningRequest)
-		return err
+		out := out.(*CertificateSigningRequest)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_certificates_CertificateSigningRequestSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
+			return err
-	}
-	if err := DeepCopy_certificates_CertificateSigningRequestStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_certificates_CertificateSigningRequestCondition(in CertificateSigningRequestCondition, out *CertificateSigningRequestCondition, c *conversion.Cloner) error {
-	out.Type = in.Type
-	out.Reason = in.Reason
-	out.Message = in.Message
-	out.LastUpdateTime = in.LastUpdateTime.DeepCopy()
-	return nil
-}
-
-func DeepCopy_certificates_CertificateSigningRequestList(in CertificateSigningRequestList, out *CertificateSigningRequestList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]CertificateSigningRequest, len(in))
-		for i := range in {
-			if err := DeepCopy_certificates_CertificateSigningRequest(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
 		}
-	} else {
+		if err := DeepCopy_certificates_CertificateSigningRequestSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Items = nil
+			return err
-	}
-	return nil
-}
-
-func DeepCopy_certificates_CertificateSigningRequestSpec(in CertificateSigningRequestSpec, out *CertificateSigningRequestSpec, c *conversion.Cloner) error {
-	if in.Request != nil {
-		in, out := in.Request, &out.Request
-		*out = make([]byte, len(in))
-		copy(*out, in)
-	} else {
-		out.Request = nil
-	}
-	out.Username = in.Username
-	out.UID = in.UID
-	if in.Groups != nil {
-		in, out := in.Groups, &out.Groups
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Groups = nil
-	}
-	return nil
-}
-
-func DeepCopy_certificates_CertificateSigningRequestStatus(in CertificateSigningRequestStatus, out *CertificateSigningRequestStatus, c *conversion.Cloner) error {
-	if in.Conditions != nil {
-		in, out := in.Conditions, &out.Conditions
-		*out = make([]CertificateSigningRequestCondition, len(in))
-		for i := range in {
-			if err := DeepCopy_certificates_CertificateSigningRequestCondition(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
 		}
-	} else {
+		if err := DeepCopy_certificates_CertificateSigningRequestStatus(&in.Status, &out.Status, c); err != nil {
-		out.Conditions = nil
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_certificates_CertificateSigningRequestCondition(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*CertificateSigningRequestCondition)
+		out := out.(*CertificateSigningRequestCondition)
+		out.Type = in.Type
+		out.Reason = in.Reason
+		out.Message = in.Message
+		out.LastUpdateTime = in.LastUpdateTime.DeepCopy()
+		return nil
+	}
+}
+
+func DeepCopy_certificates_CertificateSigningRequestList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*CertificateSigningRequestList)
+		out := out.(*CertificateSigningRequestList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]CertificateSigningRequest, len(*in))
+			for i := range *in {
+				if err := DeepCopy_certificates_CertificateSigningRequest(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_certificates_CertificateSigningRequestSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*CertificateSigningRequestSpec)
+		out := out.(*CertificateSigningRequestSpec)
+		if in.Request != nil {
+			in, out := &in.Request, &out.Request
+			*out = make([]byte, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Request = nil
+		}
+		out.Username = in.Username
+		out.UID = in.UID
+		if in.Groups != nil {
+			in, out := &in.Groups, &out.Groups
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Groups = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_certificates_CertificateSigningRequestStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*CertificateSigningRequestStatus)
+		out := out.(*CertificateSigningRequestStatus)
+		if in.Conditions != nil {
+			in, out := &in.Conditions, &out.Conditions
+			*out = make([]CertificateSigningRequestCondition, len(*in))
+			for i := range *in {
+				if err := DeepCopy_certificates_CertificateSigningRequestCondition(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Conditions = nil
+		}
+		if in.Certificate != nil {
+			in, out := &in.Certificate, &out.Certificate
+			*out = make([]byte, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Certificate = nil
+		}
+		return nil
 	}
-	if in.Certificate != nil {
-		in, out := in.Certificate, &out.Certificate
-		*out = make([]byte, len(in))
-		copy(*out, in)
-	} else {
-		out.Certificate = nil
-	}
-	return nil
 }

pkg/apis/certificates/v1alpha1/deep_copy_generated.go

@@ -24,98 +24,119 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v1alpha1_CertificateSigningRequest,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequest, InType: reflect.TypeOf(func() *CertificateSigningRequest { var x *CertificateSigningRequest; return x }())},
-		DeepCopy_v1alpha1_CertificateSigningRequestCondition,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestCondition, InType: reflect.TypeOf(func() *CertificateSigningRequestCondition { var x *CertificateSigningRequestCondition; return x }())},
-		DeepCopy_v1alpha1_CertificateSigningRequestList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestList, InType: reflect.TypeOf(func() *CertificateSigningRequestList { var x *CertificateSigningRequestList; return x }())},
-		DeepCopy_v1alpha1_CertificateSigningRequestSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestSpec, InType: reflect.TypeOf(func() *CertificateSigningRequestSpec { var x *CertificateSigningRequestSpec; return x }())},
-		DeepCopy_v1alpha1_CertificateSigningRequestStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestStatus, InType: reflect.TypeOf(func() *CertificateSigningRequestStatus { var x *CertificateSigningRequestStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v1alpha1_CertificateSigningRequest(in CertificateSigningRequest, out *CertificateSigningRequest, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_CertificateSigningRequest(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*CertificateSigningRequest)
-		return err
+		out := out.(*CertificateSigningRequest)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_v1alpha1_CertificateSigningRequestSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
+			return err
-	}
-	if err := DeepCopy_v1alpha1_CertificateSigningRequestStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_v1alpha1_CertificateSigningRequestCondition(in CertificateSigningRequestCondition, out *CertificateSigningRequestCondition, c *conversion.Cloner) error {
-	out.Type = in.Type
-	out.Reason = in.Reason
-	out.Message = in.Message
-	out.LastUpdateTime = in.LastUpdateTime.DeepCopy()
-	return nil
-}
-
-func DeepCopy_v1alpha1_CertificateSigningRequestList(in CertificateSigningRequestList, out *CertificateSigningRequestList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]CertificateSigningRequest, len(in))
-		for i := range in {
-			if err := DeepCopy_v1alpha1_CertificateSigningRequest(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
 		}
-	} else {
+		if err := DeepCopy_v1alpha1_CertificateSigningRequestSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Items = nil
+			return err
-	}
-	return nil
-}
-
-func DeepCopy_v1alpha1_CertificateSigningRequestSpec(in CertificateSigningRequestSpec, out *CertificateSigningRequestSpec, c *conversion.Cloner) error {
-	if in.Request != nil {
-		in, out := in.Request, &out.Request
-		*out = make([]byte, len(in))
-		copy(*out, in)
-	} else {
-		out.Request = nil
-	}
-	out.Username = in.Username
-	out.UID = in.UID
-	if in.Groups != nil {
-		in, out := in.Groups, &out.Groups
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Groups = nil
-	}
-	return nil
-}
-
-func DeepCopy_v1alpha1_CertificateSigningRequestStatus(in CertificateSigningRequestStatus, out *CertificateSigningRequestStatus, c *conversion.Cloner) error {
-	if in.Conditions != nil {
-		in, out := in.Conditions, &out.Conditions
-		*out = make([]CertificateSigningRequestCondition, len(in))
-		for i := range in {
-			if err := DeepCopy_v1alpha1_CertificateSigningRequestCondition(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
 		}
-	} else {
+		if err := DeepCopy_v1alpha1_CertificateSigningRequestStatus(&in.Status, &out.Status, c); err != nil {
-		out.Conditions = nil
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1alpha1_CertificateSigningRequestCondition(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*CertificateSigningRequestCondition)
+		out := out.(*CertificateSigningRequestCondition)
+		out.Type = in.Type
+		out.Reason = in.Reason
+		out.Message = in.Message
+		out.LastUpdateTime = in.LastUpdateTime.DeepCopy()
+		return nil
+	}
+}
+
+func DeepCopy_v1alpha1_CertificateSigningRequestList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*CertificateSigningRequestList)
+		out := out.(*CertificateSigningRequestList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]CertificateSigningRequest, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1alpha1_CertificateSigningRequest(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1alpha1_CertificateSigningRequestSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*CertificateSigningRequestSpec)
+		out := out.(*CertificateSigningRequestSpec)
+		if in.Request != nil {
+			in, out := &in.Request, &out.Request
+			*out = make([]byte, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Request = nil
+		}
+		out.Username = in.Username
+		out.UID = in.UID
+		if in.Groups != nil {
+			in, out := &in.Groups, &out.Groups
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Groups = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1alpha1_CertificateSigningRequestStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*CertificateSigningRequestStatus)
+		out := out.(*CertificateSigningRequestStatus)
+		if in.Conditions != nil {
+			in, out := &in.Conditions, &out.Conditions
+			*out = make([]CertificateSigningRequestCondition, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1alpha1_CertificateSigningRequestCondition(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Conditions = nil
+		}
+		if in.Certificate != nil {
+			in, out := &in.Certificate, &out.Certificate
+			*out = make([]byte, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Certificate = nil
+		}
+		return nil
 	}
-	if in.Certificate != nil {
-		in, out := in.Certificate, &out.Certificate
-		*out = make([]byte, len(in))
-		copy(*out, in)
-	} else {
-		out.Certificate = nil
-	}
-	return nil
 }

pkg/apis/certificates/v1alpha1/generated.proto

@@ -24,6 +24,7 @@ package k8s.io.kubernetes.pkg.apis.certificates.v1alpha1;
 import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
+import "k8s.io/kubernetes/pkg/runtime/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".

pkg/apis/componentconfig/deep_copy_generated.go

@@ -23,277 +23,314 @@ package componentconfig
 import (
 	api "k8s.io/kubernetes/pkg/api"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_componentconfig_IPVar,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_IPVar, InType: reflect.TypeOf(func() *IPVar { var x *IPVar; return x }())},
-		DeepCopy_componentconfig_KubeControllerManagerConfiguration,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeControllerManagerConfiguration, InType: reflect.TypeOf(func() *KubeControllerManagerConfiguration { var x *KubeControllerManagerConfiguration; return x }())},
-		DeepCopy_componentconfig_KubeProxyConfiguration,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeProxyConfiguration, InType: reflect.TypeOf(func() *KubeProxyConfiguration { var x *KubeProxyConfiguration; return x }())},
-		DeepCopy_componentconfig_KubeSchedulerConfiguration,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeSchedulerConfiguration, InType: reflect.TypeOf(func() *KubeSchedulerConfiguration { var x *KubeSchedulerConfiguration; return x }())},
-		DeepCopy_componentconfig_KubeletConfiguration,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletConfiguration, InType: reflect.TypeOf(func() *KubeletConfiguration { var x *KubeletConfiguration; return x }())},
-		DeepCopy_componentconfig_LeaderElectionConfiguration,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_LeaderElectionConfiguration, InType: reflect.TypeOf(func() *LeaderElectionConfiguration { var x *LeaderElectionConfiguration; return x }())},
-		DeepCopy_componentconfig_PersistentVolumeRecyclerConfiguration,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_PersistentVolumeRecyclerConfiguration, InType: reflect.TypeOf(func() *PersistentVolumeRecyclerConfiguration { var x *PersistentVolumeRecyclerConfiguration; return x }())},
-		DeepCopy_componentconfig_PortRangeVar,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_PortRangeVar, InType: reflect.TypeOf(func() *PortRangeVar { var x *PortRangeVar; return x }())},
-		DeepCopy_componentconfig_VolumeConfiguration,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_VolumeConfiguration, InType: reflect.TypeOf(func() *VolumeConfiguration { var x *VolumeConfiguration; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_componentconfig_IPVar(in IPVar, out *IPVar, c *conversion.Cloner) error {
+func DeepCopy_componentconfig_IPVar(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.Val != nil {
+	{
-		in, out := in.Val, &out.Val
+		in := in.(*IPVar)
-		*out = new(string)
+		out := out.(*IPVar)
-		**out = *in
+		if in.Val != nil {
-	} else {
+			in, out := &in.Val, &out.Val
-		out.Val = nil
+			*out = new(string)
-	}
+			**out = **in
-	return nil
+		} else {
-}
+			out.Val = nil
-
-func DeepCopy_componentconfig_KubeControllerManagerConfiguration(in KubeControllerManagerConfiguration, out *KubeControllerManagerConfiguration, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.Port = in.Port
-	out.Address = in.Address
-	out.CloudProvider = in.CloudProvider
-	out.CloudConfigFile = in.CloudConfigFile
-	out.ConcurrentEndpointSyncs = in.ConcurrentEndpointSyncs
-	out.ConcurrentRSSyncs = in.ConcurrentRSSyncs
-	out.ConcurrentRCSyncs = in.ConcurrentRCSyncs
-	out.ConcurrentResourceQuotaSyncs = in.ConcurrentResourceQuotaSyncs
-	out.ConcurrentDeploymentSyncs = in.ConcurrentDeploymentSyncs
-	out.ConcurrentDaemonSetSyncs = in.ConcurrentDaemonSetSyncs
-	out.ConcurrentJobSyncs = in.ConcurrentJobSyncs
-	out.ConcurrentNamespaceSyncs = in.ConcurrentNamespaceSyncs
-	out.ConcurrentSATokenSyncs = in.ConcurrentSATokenSyncs
-	out.LookupCacheSizeForRC = in.LookupCacheSizeForRC
-	out.LookupCacheSizeForRS = in.LookupCacheSizeForRS
-	out.LookupCacheSizeForDaemonSet = in.LookupCacheSizeForDaemonSet
-	out.ServiceSyncPeriod = in.ServiceSyncPeriod
-	out.NodeSyncPeriod = in.NodeSyncPeriod
-	out.ResourceQuotaSyncPeriod = in.ResourceQuotaSyncPeriod
-	out.NamespaceSyncPeriod = in.NamespaceSyncPeriod
-	out.PVClaimBinderSyncPeriod = in.PVClaimBinderSyncPeriod
-	out.MinResyncPeriod = in.MinResyncPeriod
-	out.TerminatedPodGCThreshold = in.TerminatedPodGCThreshold
-	out.HorizontalPodAutoscalerSyncPeriod = in.HorizontalPodAutoscalerSyncPeriod
-	out.DeploymentControllerSyncPeriod = in.DeploymentControllerSyncPeriod
-	out.PodEvictionTimeout = in.PodEvictionTimeout
-	out.DeletingPodsQps = in.DeletingPodsQps
-	out.DeletingPodsBurst = in.DeletingPodsBurst
-	out.NodeMonitorGracePeriod = in.NodeMonitorGracePeriod
-	out.RegisterRetryCount = in.RegisterRetryCount
-	out.NodeStartupGracePeriod = in.NodeStartupGracePeriod
-	out.NodeMonitorPeriod = in.NodeMonitorPeriod
-	out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
-	out.EnableProfiling = in.EnableProfiling
-	out.ClusterName = in.ClusterName
-	out.ClusterCIDR = in.ClusterCIDR
-	out.ServiceCIDR = in.ServiceCIDR
-	out.NodeCIDRMaskSize = in.NodeCIDRMaskSize
-	out.AllocateNodeCIDRs = in.AllocateNodeCIDRs
-	out.ConfigureCloudRoutes = in.ConfigureCloudRoutes
-	out.RootCAFile = in.RootCAFile
-	out.ContentType = in.ContentType
-	out.KubeAPIQPS = in.KubeAPIQPS
-	out.KubeAPIBurst = in.KubeAPIBurst
-	out.LeaderElection = in.LeaderElection
-	out.VolumeConfiguration = in.VolumeConfiguration
-	out.ControllerStartInterval = in.ControllerStartInterval
-	out.EnableGarbageCollector = in.EnableGarbageCollector
-	return nil
-}
-
-func DeepCopy_componentconfig_KubeProxyConfiguration(in KubeProxyConfiguration, out *KubeProxyConfiguration, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.BindAddress = in.BindAddress
-	out.ClusterCIDR = in.ClusterCIDR
-	out.HealthzBindAddress = in.HealthzBindAddress
-	out.HealthzPort = in.HealthzPort
-	out.HostnameOverride = in.HostnameOverride
-	if in.IPTablesMasqueradeBit != nil {
-		in, out := in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.IPTablesMasqueradeBit = nil
-	}
-	out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
-	out.KubeconfigPath = in.KubeconfigPath
-	out.MasqueradeAll = in.MasqueradeAll
-	out.Master = in.Master
-	if in.OOMScoreAdj != nil {
-		in, out := in.OOMScoreAdj, &out.OOMScoreAdj
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.OOMScoreAdj = nil
-	}
-	out.Mode = in.Mode
-	out.PortRange = in.PortRange
-	out.ResourceContainer = in.ResourceContainer
-	out.UDPIdleTimeout = in.UDPIdleTimeout
-	out.ConntrackMax = in.ConntrackMax
-	out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout
-	return nil
-}
-
-func DeepCopy_componentconfig_KubeSchedulerConfiguration(in KubeSchedulerConfiguration, out *KubeSchedulerConfiguration, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.Port = in.Port
-	out.Address = in.Address
-	out.AlgorithmProvider = in.AlgorithmProvider
-	out.PolicyConfigFile = in.PolicyConfigFile
-	out.EnableProfiling = in.EnableProfiling
-	out.ContentType = in.ContentType
-	out.KubeAPIQPS = in.KubeAPIQPS
-	out.KubeAPIBurst = in.KubeAPIBurst
-	out.SchedulerName = in.SchedulerName
-	out.HardPodAffinitySymmetricWeight = in.HardPodAffinitySymmetricWeight
-	out.FailureDomains = in.FailureDomains
-	out.LeaderElection = in.LeaderElection
-	return nil
-}
-
-func DeepCopy_componentconfig_KubeletConfiguration(in KubeletConfiguration, out *KubeletConfiguration, c *conversion.Cloner) error {
-	out.Config = in.Config
-	out.SyncFrequency = in.SyncFrequency
-	out.FileCheckFrequency = in.FileCheckFrequency
-	out.HTTPCheckFrequency = in.HTTPCheckFrequency
-	out.ManifestURL = in.ManifestURL
-	out.ManifestURLHeader = in.ManifestURLHeader
-	out.EnableServer = in.EnableServer
-	out.Address = in.Address
-	out.Port = in.Port
-	out.ReadOnlyPort = in.ReadOnlyPort
-	out.TLSCertFile = in.TLSCertFile
-	out.TLSPrivateKeyFile = in.TLSPrivateKeyFile
-	out.CertDirectory = in.CertDirectory
-	out.HostnameOverride = in.HostnameOverride
-	out.PodInfraContainerImage = in.PodInfraContainerImage
-	out.DockerEndpoint = in.DockerEndpoint
-	out.RootDirectory = in.RootDirectory
-	out.SeccompProfileRoot = in.SeccompProfileRoot
-	out.AllowPrivileged = in.AllowPrivileged
-	out.HostNetworkSources = in.HostNetworkSources
-	out.HostPIDSources = in.HostPIDSources
-	out.HostIPCSources = in.HostIPCSources
-	out.RegistryPullQPS = in.RegistryPullQPS
-	out.RegistryBurst = in.RegistryBurst
-	out.EventRecordQPS = in.EventRecordQPS
-	out.EventBurst = in.EventBurst
-	out.EnableDebuggingHandlers = in.EnableDebuggingHandlers
-	out.MinimumGCAge = in.MinimumGCAge
-	out.MaxPerPodContainerCount = in.MaxPerPodContainerCount
-	out.MaxContainerCount = in.MaxContainerCount
-	out.CAdvisorPort = in.CAdvisorPort
-	out.HealthzPort = in.HealthzPort
-	out.HealthzBindAddress = in.HealthzBindAddress
-	out.OOMScoreAdj = in.OOMScoreAdj
-	out.RegisterNode = in.RegisterNode
-	out.ClusterDomain = in.ClusterDomain
-	out.MasterServiceNamespace = in.MasterServiceNamespace
-	out.ClusterDNS = in.ClusterDNS
-	out.StreamingConnectionIdleTimeout = in.StreamingConnectionIdleTimeout
-	out.NodeStatusUpdateFrequency = in.NodeStatusUpdateFrequency
-	out.ImageMinimumGCAge = in.ImageMinimumGCAge
-	out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
-	out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
-	out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB
-	out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod
-	out.NetworkPluginName = in.NetworkPluginName
-	out.NetworkPluginDir = in.NetworkPluginDir
-	out.VolumePluginDir = in.VolumePluginDir
-	out.CloudProvider = in.CloudProvider
-	out.CloudConfigFile = in.CloudConfigFile
-	out.KubeletCgroups = in.KubeletCgroups
-	out.RuntimeCgroups = in.RuntimeCgroups
-	out.SystemCgroups = in.SystemCgroups
-	out.CgroupRoot = in.CgroupRoot
-	out.ContainerRuntime = in.ContainerRuntime
-	out.RuntimeRequestTimeout = in.RuntimeRequestTimeout
-	out.RktPath = in.RktPath
-	out.RktAPIEndpoint = in.RktAPIEndpoint
-	out.RktStage1Image = in.RktStage1Image
-	out.LockFilePath = in.LockFilePath
-	out.ExitOnLockContention = in.ExitOnLockContention
-	out.ConfigureCBR0 = in.ConfigureCBR0
-	out.HairpinMode = in.HairpinMode
-	out.BabysitDaemons = in.BabysitDaemons
-	out.MaxPods = in.MaxPods
-	out.NvidiaGPUs = in.NvidiaGPUs
-	out.DockerExecHandlerName = in.DockerExecHandlerName
-	out.PodCIDR = in.PodCIDR
-	out.ResolverConfig = in.ResolverConfig
-	out.CPUCFSQuota = in.CPUCFSQuota
-	out.Containerized = in.Containerized
-	out.MaxOpenFiles = in.MaxOpenFiles
-	out.ReconcileCIDR = in.ReconcileCIDR
-	out.RegisterSchedulable = in.RegisterSchedulable
-	out.ContentType = in.ContentType
-	out.KubeAPIQPS = in.KubeAPIQPS
-	out.KubeAPIBurst = in.KubeAPIBurst
-	out.SerializeImagePulls = in.SerializeImagePulls
-	out.ExperimentalFlannelOverlay = in.ExperimentalFlannelOverlay
-	out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency
-	out.NodeIP = in.NodeIP
-	if in.NodeLabels != nil {
-		in, out := in.NodeLabels, &out.NodeLabels
-		*out = make(map[string]string)
-		for key, val := range in {
-			(*out)[key] = val
 		}
-	} else {
+		return nil
-		out.NodeLabels = nil
 	}
-	out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
-	out.EnableCustomMetrics = in.EnableCustomMetrics
-	out.EvictionHard = in.EvictionHard
-	out.EvictionSoft = in.EvictionSoft
-	out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod
-	out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod
-	out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod
-	out.PodsPerCore = in.PodsPerCore
-	out.EnableControllerAttachDetach = in.EnableControllerAttachDetach
-	return nil
 }
 
-func DeepCopy_componentconfig_LeaderElectionConfiguration(in LeaderElectionConfiguration, out *LeaderElectionConfiguration, c *conversion.Cloner) error {
+func DeepCopy_componentconfig_KubeControllerManagerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.LeaderElect = in.LeaderElect
+	{
-	out.LeaseDuration = in.LeaseDuration
+		in := in.(*KubeControllerManagerConfiguration)
-	out.RenewDeadline = in.RenewDeadline
+		out := out.(*KubeControllerManagerConfiguration)
-	out.RetryPeriod = in.RetryPeriod
+		out.TypeMeta = in.TypeMeta
-	return nil
+		out.Port = in.Port
-}
+		out.Address = in.Address
-
+		out.CloudProvider = in.CloudProvider
-func DeepCopy_componentconfig_PersistentVolumeRecyclerConfiguration(in PersistentVolumeRecyclerConfiguration, out *PersistentVolumeRecyclerConfiguration, c *conversion.Cloner) error {
+		out.CloudConfigFile = in.CloudConfigFile
-	out.MaximumRetry = in.MaximumRetry
+		out.ConcurrentEndpointSyncs = in.ConcurrentEndpointSyncs
-	out.MinimumTimeoutNFS = in.MinimumTimeoutNFS
+		out.ConcurrentRSSyncs = in.ConcurrentRSSyncs
-	out.PodTemplateFilePathNFS = in.PodTemplateFilePathNFS
+		out.ConcurrentRCSyncs = in.ConcurrentRCSyncs
-	out.IncrementTimeoutNFS = in.IncrementTimeoutNFS
+		out.ConcurrentResourceQuotaSyncs = in.ConcurrentResourceQuotaSyncs
-	out.PodTemplateFilePathHostPath = in.PodTemplateFilePathHostPath
+		out.ConcurrentDeploymentSyncs = in.ConcurrentDeploymentSyncs
-	out.MinimumTimeoutHostPath = in.MinimumTimeoutHostPath
+		out.ConcurrentDaemonSetSyncs = in.ConcurrentDaemonSetSyncs
-	out.IncrementTimeoutHostPath = in.IncrementTimeoutHostPath
+		out.ConcurrentJobSyncs = in.ConcurrentJobSyncs
-	return nil
+		out.ConcurrentNamespaceSyncs = in.ConcurrentNamespaceSyncs
-}
+		out.ConcurrentSATokenSyncs = in.ConcurrentSATokenSyncs
-
+		out.LookupCacheSizeForRC = in.LookupCacheSizeForRC
-func DeepCopy_componentconfig_PortRangeVar(in PortRangeVar, out *PortRangeVar, c *conversion.Cloner) error {
+		out.LookupCacheSizeForRS = in.LookupCacheSizeForRS
-	if in.Val != nil {
+		out.LookupCacheSizeForDaemonSet = in.LookupCacheSizeForDaemonSet
-		in, out := in.Val, &out.Val
+		out.ServiceSyncPeriod = in.ServiceSyncPeriod
-		*out = new(string)
+		out.NodeSyncPeriod = in.NodeSyncPeriod
-		**out = *in
+		out.ResourceQuotaSyncPeriod = in.ResourceQuotaSyncPeriod
-	} else {
+		out.NamespaceSyncPeriod = in.NamespaceSyncPeriod
-		out.Val = nil
+		out.PVClaimBinderSyncPeriod = in.PVClaimBinderSyncPeriod
+		out.MinResyncPeriod = in.MinResyncPeriod
+		out.TerminatedPodGCThreshold = in.TerminatedPodGCThreshold
+		out.HorizontalPodAutoscalerSyncPeriod = in.HorizontalPodAutoscalerSyncPeriod
+		out.DeploymentControllerSyncPeriod = in.DeploymentControllerSyncPeriod
+		out.PodEvictionTimeout = in.PodEvictionTimeout
+		out.DeletingPodsQps = in.DeletingPodsQps
+		out.DeletingPodsBurst = in.DeletingPodsBurst
+		out.NodeMonitorGracePeriod = in.NodeMonitorGracePeriod
+		out.RegisterRetryCount = in.RegisterRetryCount
+		out.NodeStartupGracePeriod = in.NodeStartupGracePeriod
+		out.NodeMonitorPeriod = in.NodeMonitorPeriod
+		out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
+		out.EnableProfiling = in.EnableProfiling
+		out.ClusterName = in.ClusterName
+		out.ClusterCIDR = in.ClusterCIDR
+		out.ServiceCIDR = in.ServiceCIDR
+		out.NodeCIDRMaskSize = in.NodeCIDRMaskSize
+		out.AllocateNodeCIDRs = in.AllocateNodeCIDRs
+		out.ConfigureCloudRoutes = in.ConfigureCloudRoutes
+		out.RootCAFile = in.RootCAFile
+		out.ContentType = in.ContentType
+		out.KubeAPIQPS = in.KubeAPIQPS
+		out.KubeAPIBurst = in.KubeAPIBurst
+		out.LeaderElection = in.LeaderElection
+		out.VolumeConfiguration = in.VolumeConfiguration
+		out.ControllerStartInterval = in.ControllerStartInterval
+		out.EnableGarbageCollector = in.EnableGarbageCollector
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_componentconfig_VolumeConfiguration(in VolumeConfiguration, out *VolumeConfiguration, c *conversion.Cloner) error {
+func DeepCopy_componentconfig_KubeProxyConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.EnableHostPathProvisioning = in.EnableHostPathProvisioning
+	{
-	out.EnableDynamicProvisioning = in.EnableDynamicProvisioning
+		in := in.(*KubeProxyConfiguration)
-	out.PersistentVolumeRecyclerConfiguration = in.PersistentVolumeRecyclerConfiguration
+		out := out.(*KubeProxyConfiguration)
-	out.FlexVolumePluginDir = in.FlexVolumePluginDir
+		out.TypeMeta = in.TypeMeta
-	return nil
+		out.BindAddress = in.BindAddress
+		out.ClusterCIDR = in.ClusterCIDR
+		out.HealthzBindAddress = in.HealthzBindAddress
+		out.HealthzPort = in.HealthzPort
+		out.HostnameOverride = in.HostnameOverride
+		if in.IPTablesMasqueradeBit != nil {
+			in, out := &in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.IPTablesMasqueradeBit = nil
+		}
+		out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
+		out.KubeconfigPath = in.KubeconfigPath
+		out.MasqueradeAll = in.MasqueradeAll
+		out.Master = in.Master
+		if in.OOMScoreAdj != nil {
+			in, out := &in.OOMScoreAdj, &out.OOMScoreAdj
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.OOMScoreAdj = nil
+		}
+		out.Mode = in.Mode
+		out.PortRange = in.PortRange
+		out.ResourceContainer = in.ResourceContainer
+		out.UDPIdleTimeout = in.UDPIdleTimeout
+		out.ConntrackMax = in.ConntrackMax
+		out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout
+		return nil
+	}
+}
+
+func DeepCopy_componentconfig_KubeSchedulerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*KubeSchedulerConfiguration)
+		out := out.(*KubeSchedulerConfiguration)
+		out.TypeMeta = in.TypeMeta
+		out.Port = in.Port
+		out.Address = in.Address
+		out.AlgorithmProvider = in.AlgorithmProvider
+		out.PolicyConfigFile = in.PolicyConfigFile
+		out.EnableProfiling = in.EnableProfiling
+		out.ContentType = in.ContentType
+		out.KubeAPIQPS = in.KubeAPIQPS
+		out.KubeAPIBurst = in.KubeAPIBurst
+		out.SchedulerName = in.SchedulerName
+		out.HardPodAffinitySymmetricWeight = in.HardPodAffinitySymmetricWeight
+		out.FailureDomains = in.FailureDomains
+		out.LeaderElection = in.LeaderElection
+		return nil
+	}
+}
+
+func DeepCopy_componentconfig_KubeletConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*KubeletConfiguration)
+		out := out.(*KubeletConfiguration)
+		out.Config = in.Config
+		out.SyncFrequency = in.SyncFrequency
+		out.FileCheckFrequency = in.FileCheckFrequency
+		out.HTTPCheckFrequency = in.HTTPCheckFrequency
+		out.ManifestURL = in.ManifestURL
+		out.ManifestURLHeader = in.ManifestURLHeader
+		out.EnableServer = in.EnableServer
+		out.Address = in.Address
+		out.Port = in.Port
+		out.ReadOnlyPort = in.ReadOnlyPort
+		out.TLSCertFile = in.TLSCertFile
+		out.TLSPrivateKeyFile = in.TLSPrivateKeyFile
+		out.CertDirectory = in.CertDirectory
+		out.HostnameOverride = in.HostnameOverride
+		out.PodInfraContainerImage = in.PodInfraContainerImage
+		out.DockerEndpoint = in.DockerEndpoint
+		out.RootDirectory = in.RootDirectory
+		out.SeccompProfileRoot = in.SeccompProfileRoot
+		out.AllowPrivileged = in.AllowPrivileged
+		out.HostNetworkSources = in.HostNetworkSources
+		out.HostPIDSources = in.HostPIDSources
+		out.HostIPCSources = in.HostIPCSources
+		out.RegistryPullQPS = in.RegistryPullQPS
+		out.RegistryBurst = in.RegistryBurst
+		out.EventRecordQPS = in.EventRecordQPS
+		out.EventBurst = in.EventBurst
+		out.EnableDebuggingHandlers = in.EnableDebuggingHandlers
+		out.MinimumGCAge = in.MinimumGCAge
+		out.MaxPerPodContainerCount = in.MaxPerPodContainerCount
+		out.MaxContainerCount = in.MaxContainerCount
+		out.CAdvisorPort = in.CAdvisorPort
+		out.HealthzPort = in.HealthzPort
+		out.HealthzBindAddress = in.HealthzBindAddress
+		out.OOMScoreAdj = in.OOMScoreAdj
+		out.RegisterNode = in.RegisterNode
+		out.ClusterDomain = in.ClusterDomain
+		out.MasterServiceNamespace = in.MasterServiceNamespace
+		out.ClusterDNS = in.ClusterDNS
+		out.StreamingConnectionIdleTimeout = in.StreamingConnectionIdleTimeout
+		out.NodeStatusUpdateFrequency = in.NodeStatusUpdateFrequency
+		out.ImageMinimumGCAge = in.ImageMinimumGCAge
+		out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
+		out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
+		out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB
+		out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod
+		out.NetworkPluginName = in.NetworkPluginName
+		out.NetworkPluginDir = in.NetworkPluginDir
+		out.VolumePluginDir = in.VolumePluginDir
+		out.CloudProvider = in.CloudProvider
+		out.CloudConfigFile = in.CloudConfigFile
+		out.KubeletCgroups = in.KubeletCgroups
+		out.RuntimeCgroups = in.RuntimeCgroups
+		out.SystemCgroups = in.SystemCgroups
+		out.CgroupRoot = in.CgroupRoot
+		out.ContainerRuntime = in.ContainerRuntime
+		out.RuntimeRequestTimeout = in.RuntimeRequestTimeout
+		out.RktPath = in.RktPath
+		out.RktAPIEndpoint = in.RktAPIEndpoint
+		out.RktStage1Image = in.RktStage1Image
+		out.LockFilePath = in.LockFilePath
+		out.ExitOnLockContention = in.ExitOnLockContention
+		out.ConfigureCBR0 = in.ConfigureCBR0
+		out.HairpinMode = in.HairpinMode
+		out.BabysitDaemons = in.BabysitDaemons
+		out.MaxPods = in.MaxPods
+		out.NvidiaGPUs = in.NvidiaGPUs
+		out.DockerExecHandlerName = in.DockerExecHandlerName
+		out.PodCIDR = in.PodCIDR
+		out.ResolverConfig = in.ResolverConfig
+		out.CPUCFSQuota = in.CPUCFSQuota
+		out.Containerized = in.Containerized
+		out.MaxOpenFiles = in.MaxOpenFiles
+		out.ReconcileCIDR = in.ReconcileCIDR
+		out.RegisterSchedulable = in.RegisterSchedulable
+		out.ContentType = in.ContentType
+		out.KubeAPIQPS = in.KubeAPIQPS
+		out.KubeAPIBurst = in.KubeAPIBurst
+		out.SerializeImagePulls = in.SerializeImagePulls
+		out.ExperimentalFlannelOverlay = in.ExperimentalFlannelOverlay
+		out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency
+		out.NodeIP = in.NodeIP
+		if in.NodeLabels != nil {
+			in, out := &in.NodeLabels, &out.NodeLabels
+			*out = make(map[string]string)
+			for key, val := range *in {
+				(*out)[key] = val
+			}
+		} else {
+			out.NodeLabels = nil
+		}
+		out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
+		out.EnableCustomMetrics = in.EnableCustomMetrics
+		out.EvictionHard = in.EvictionHard
+		out.EvictionSoft = in.EvictionSoft
+		out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod
+		out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod
+		out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod
+		out.PodsPerCore = in.PodsPerCore
+		out.EnableControllerAttachDetach = in.EnableControllerAttachDetach
+		return nil
+	}
+}
+
+func DeepCopy_componentconfig_LeaderElectionConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*LeaderElectionConfiguration)
+		out := out.(*LeaderElectionConfiguration)
+		out.LeaderElect = in.LeaderElect
+		out.LeaseDuration = in.LeaseDuration
+		out.RenewDeadline = in.RenewDeadline
+		out.RetryPeriod = in.RetryPeriod
+		return nil
+	}
+}
+
+func DeepCopy_componentconfig_PersistentVolumeRecyclerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PersistentVolumeRecyclerConfiguration)
+		out := out.(*PersistentVolumeRecyclerConfiguration)
+		out.MaximumRetry = in.MaximumRetry
+		out.MinimumTimeoutNFS = in.MinimumTimeoutNFS
+		out.PodTemplateFilePathNFS = in.PodTemplateFilePathNFS
+		out.IncrementTimeoutNFS = in.IncrementTimeoutNFS
+		out.PodTemplateFilePathHostPath = in.PodTemplateFilePathHostPath
+		out.MinimumTimeoutHostPath = in.MinimumTimeoutHostPath
+		out.IncrementTimeoutHostPath = in.IncrementTimeoutHostPath
+		return nil
+	}
+}
+
+func DeepCopy_componentconfig_PortRangeVar(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PortRangeVar)
+		out := out.(*PortRangeVar)
+		if in.Val != nil {
+			in, out := &in.Val, &out.Val
+			*out = new(string)
+			**out = **in
+		} else {
+			out.Val = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_componentconfig_VolumeConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*VolumeConfiguration)
+		out := out.(*VolumeConfiguration)
+		out.EnableHostPathProvisioning = in.EnableHostPathProvisioning
+		out.EnableDynamicProvisioning = in.EnableDynamicProvisioning
+		out.PersistentVolumeRecyclerConfiguration = in.PersistentVolumeRecyclerConfiguration
+		out.FlexVolumePluginDir = in.FlexVolumePluginDir
+		return nil
+	}
 }

pkg/apis/componentconfig/v1alpha1/deep_copy_generated.go

@@ -23,88 +23,101 @@ package v1alpha1
 import (
 	api "k8s.io/kubernetes/pkg/api"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v1alpha1_KubeProxyConfiguration,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeProxyConfiguration, InType: reflect.TypeOf(func() *KubeProxyConfiguration { var x *KubeProxyConfiguration; return x }())},
-		DeepCopy_v1alpha1_KubeSchedulerConfiguration,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeSchedulerConfiguration, InType: reflect.TypeOf(func() *KubeSchedulerConfiguration { var x *KubeSchedulerConfiguration; return x }())},
-		DeepCopy_v1alpha1_LeaderElectionConfiguration,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_LeaderElectionConfiguration, InType: reflect.TypeOf(func() *LeaderElectionConfiguration { var x *LeaderElectionConfiguration; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v1alpha1_KubeProxyConfiguration(in KubeProxyConfiguration, out *KubeProxyConfiguration, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_KubeProxyConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.BindAddress = in.BindAddress
+		in := in.(*KubeProxyConfiguration)
-	out.ClusterCIDR = in.ClusterCIDR
+		out := out.(*KubeProxyConfiguration)
-	out.HealthzBindAddress = in.HealthzBindAddress
+		out.TypeMeta = in.TypeMeta
-	out.HealthzPort = in.HealthzPort
+		out.BindAddress = in.BindAddress
-	out.HostnameOverride = in.HostnameOverride
+		out.ClusterCIDR = in.ClusterCIDR
-	if in.IPTablesMasqueradeBit != nil {
+		out.HealthzBindAddress = in.HealthzBindAddress
-		in, out := in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit
+		out.HealthzPort = in.HealthzPort
-		*out = new(int32)
+		out.HostnameOverride = in.HostnameOverride
-		**out = *in
+		if in.IPTablesMasqueradeBit != nil {
-	} else {
+			in, out := &in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit
-		out.IPTablesMasqueradeBit = nil
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.IPTablesMasqueradeBit = nil
+		}
+		out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
+		out.KubeconfigPath = in.KubeconfigPath
+		out.MasqueradeAll = in.MasqueradeAll
+		out.Master = in.Master
+		if in.OOMScoreAdj != nil {
+			in, out := &in.OOMScoreAdj, &out.OOMScoreAdj
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.OOMScoreAdj = nil
+		}
+		out.Mode = in.Mode
+		out.PortRange = in.PortRange
+		out.ResourceContainer = in.ResourceContainer
+		out.UDPIdleTimeout = in.UDPIdleTimeout
+		out.ConntrackMax = in.ConntrackMax
+		out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout
+		return nil
 	}
-	out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
-	out.KubeconfigPath = in.KubeconfigPath
-	out.MasqueradeAll = in.MasqueradeAll
-	out.Master = in.Master
-	if in.OOMScoreAdj != nil {
-		in, out := in.OOMScoreAdj, &out.OOMScoreAdj
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.OOMScoreAdj = nil
-	}
-	out.Mode = in.Mode
-	out.PortRange = in.PortRange
-	out.ResourceContainer = in.ResourceContainer
-	out.UDPIdleTimeout = in.UDPIdleTimeout
-	out.ConntrackMax = in.ConntrackMax
-	out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout
-	return nil
 }
 
-func DeepCopy_v1alpha1_KubeSchedulerConfiguration(in KubeSchedulerConfiguration, out *KubeSchedulerConfiguration, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_KubeSchedulerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.Port = in.Port
+		in := in.(*KubeSchedulerConfiguration)
-	out.Address = in.Address
+		out := out.(*KubeSchedulerConfiguration)
-	out.AlgorithmProvider = in.AlgorithmProvider
+		out.TypeMeta = in.TypeMeta
-	out.PolicyConfigFile = in.PolicyConfigFile
+		out.Port = in.Port
-	if in.EnableProfiling != nil {
+		out.Address = in.Address
-		in, out := in.EnableProfiling, &out.EnableProfiling
+		out.AlgorithmProvider = in.AlgorithmProvider
-		*out = new(bool)
+		out.PolicyConfigFile = in.PolicyConfigFile
-		**out = *in
+		if in.EnableProfiling != nil {
-	} else {
+			in, out := &in.EnableProfiling, &out.EnableProfiling
-		out.EnableProfiling = nil
+			*out = new(bool)
+			**out = **in
+		} else {
+			out.EnableProfiling = nil
+		}
+		out.ContentType = in.ContentType
+		out.KubeAPIQPS = in.KubeAPIQPS
+		out.KubeAPIBurst = in.KubeAPIBurst
+		out.SchedulerName = in.SchedulerName
+		out.HardPodAffinitySymmetricWeight = in.HardPodAffinitySymmetricWeight
+		out.FailureDomains = in.FailureDomains
+		if err := DeepCopy_v1alpha1_LeaderElectionConfiguration(&in.LeaderElection, &out.LeaderElection, c); err != nil {
+			return err
+		}
+		return nil
 	}
-	out.ContentType = in.ContentType
-	out.KubeAPIQPS = in.KubeAPIQPS
-	out.KubeAPIBurst = in.KubeAPIBurst
-	out.SchedulerName = in.SchedulerName
-	out.HardPodAffinitySymmetricWeight = in.HardPodAffinitySymmetricWeight
-	out.FailureDomains = in.FailureDomains
-	if err := DeepCopy_v1alpha1_LeaderElectionConfiguration(in.LeaderElection, &out.LeaderElection, c); err != nil {
-		return err
-	}
-	return nil
 }
 
-func DeepCopy_v1alpha1_LeaderElectionConfiguration(in LeaderElectionConfiguration, out *LeaderElectionConfiguration, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_LeaderElectionConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.LeaderElect != nil {
+	{
-		in, out := in.LeaderElect, &out.LeaderElect
+		in := in.(*LeaderElectionConfiguration)
-		*out = new(bool)
+		out := out.(*LeaderElectionConfiguration)
-		**out = *in
+		if in.LeaderElect != nil {
-	} else {
+			in, out := &in.LeaderElect, &out.LeaderElect
-		out.LeaderElect = nil
+			*out = new(bool)
+			**out = **in
+		} else {
+			out.LeaderElect = nil
+		}
+		out.LeaseDuration = in.LeaseDuration
+		out.RenewDeadline = in.RenewDeadline
+		out.RetryPeriod = in.RetryPeriod
+		return nil
 	}
-	out.LeaseDuration = in.LeaseDuration
-	out.RenewDeadline = in.RenewDeadline
-	out.RetryPeriod = in.RetryPeriod
-	return nil
 }

pkg/apis/policy/deep_copy_generated.go

@@ -24,67 +24,84 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_policy_PodDisruptionBudget,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudget, InType: reflect.TypeOf(func() *PodDisruptionBudget { var x *PodDisruptionBudget; return x }())},
-		DeepCopy_policy_PodDisruptionBudgetList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudgetList, InType: reflect.TypeOf(func() *PodDisruptionBudgetList { var x *PodDisruptionBudgetList; return x }())},
-		DeepCopy_policy_PodDisruptionBudgetSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudgetSpec, InType: reflect.TypeOf(func() *PodDisruptionBudgetSpec { var x *PodDisruptionBudgetSpec; return x }())},
-		DeepCopy_policy_PodDisruptionBudgetStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudgetStatus, InType: reflect.TypeOf(func() *PodDisruptionBudgetStatus { var x *PodDisruptionBudgetStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_policy_PodDisruptionBudget(in PodDisruptionBudget, out *PodDisruptionBudget, c *conversion.Cloner) error {
+func DeepCopy_policy_PodDisruptionBudget(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*PodDisruptionBudget)
-		return err
+		out := out.(*PodDisruptionBudget)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_policy_PodDisruptionBudgetSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	out.Status = in.Status
-	return nil
-}
-
-func DeepCopy_policy_PodDisruptionBudgetList(in PodDisruptionBudgetList, out *PodDisruptionBudgetList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]PodDisruptionBudget, len(in))
-		for i := range in {
-			if err := DeepCopy_policy_PodDisruptionBudget(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_policy_PodDisruptionBudgetSpec(in PodDisruptionBudgetSpec, out *PodDisruptionBudgetSpec, c *conversion.Cloner) error {
-	out.MinAvailable = in.MinAvailable
-	if in.Selector != nil {
-		in, out := in.Selector, &out.Selector
-		*out = new(unversioned.LabelSelector)
-		if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil {
 			return err
 		}
-	} else {
+		if err := DeepCopy_policy_PodDisruptionBudgetSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Selector = nil
+			return err
+		}
+		out.Status = in.Status
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_policy_PodDisruptionBudgetStatus(in PodDisruptionBudgetStatus, out *PodDisruptionBudgetStatus, c *conversion.Cloner) error {
+func DeepCopy_policy_PodDisruptionBudgetList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.PodDisruptionAllowed = in.PodDisruptionAllowed
+	{
-	out.CurrentHealthy = in.CurrentHealthy
+		in := in.(*PodDisruptionBudgetList)
-	out.DesiredHealthy = in.DesiredHealthy
+		out := out.(*PodDisruptionBudgetList)
-	out.ExpectedPods = in.ExpectedPods
+		out.TypeMeta = in.TypeMeta
-	return nil
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]PodDisruptionBudget, len(*in))
+			for i := range *in {
+				if err := DeepCopy_policy_PodDisruptionBudget(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_policy_PodDisruptionBudgetSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodDisruptionBudgetSpec)
+		out := out.(*PodDisruptionBudgetSpec)
+		out.MinAvailable = in.MinAvailable
+		if in.Selector != nil {
+			in, out := &in.Selector, &out.Selector
+			*out = new(unversioned.LabelSelector)
+			if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil {
+				return err
+			}
+		} else {
+			out.Selector = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_policy_PodDisruptionBudgetStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodDisruptionBudgetStatus)
+		out := out.(*PodDisruptionBudgetStatus)
+		out.PodDisruptionAllowed = in.PodDisruptionAllowed
+		out.CurrentHealthy = in.CurrentHealthy
+		out.DesiredHealthy = in.DesiredHealthy
+		out.ExpectedPods = in.ExpectedPods
+		return nil
+	}
 }

pkg/apis/policy/v1alpha1/deep_copy_generated.go

@@ -25,67 +25,84 @@ import (
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v1alpha1_PodDisruptionBudget,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PodDisruptionBudget, InType: reflect.TypeOf(func() *PodDisruptionBudget { var x *PodDisruptionBudget; return x }())},
-		DeepCopy_v1alpha1_PodDisruptionBudgetList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PodDisruptionBudgetList, InType: reflect.TypeOf(func() *PodDisruptionBudgetList { var x *PodDisruptionBudgetList; return x }())},
-		DeepCopy_v1alpha1_PodDisruptionBudgetSpec,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PodDisruptionBudgetSpec, InType: reflect.TypeOf(func() *PodDisruptionBudgetSpec { var x *PodDisruptionBudgetSpec; return x }())},
-		DeepCopy_v1alpha1_PodDisruptionBudgetStatus,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PodDisruptionBudgetStatus, InType: reflect.TypeOf(func() *PodDisruptionBudgetStatus { var x *PodDisruptionBudgetStatus; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v1alpha1_PodDisruptionBudget(in PodDisruptionBudget, out *PodDisruptionBudget, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_PodDisruptionBudget(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*PodDisruptionBudget)
-		return err
+		out := out.(*PodDisruptionBudget)
-	}
+		out.TypeMeta = in.TypeMeta
-	if err := DeepCopy_v1alpha1_PodDisruptionBudgetSpec(in.Spec, &out.Spec, c); err != nil {
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	out.Status = in.Status
-	return nil
-}
-
-func DeepCopy_v1alpha1_PodDisruptionBudgetList(in PodDisruptionBudgetList, out *PodDisruptionBudgetList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]PodDisruptionBudget, len(in))
-		for i := range in {
-			if err := DeepCopy_v1alpha1_PodDisruptionBudget(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_v1alpha1_PodDisruptionBudgetSpec(in PodDisruptionBudgetSpec, out *PodDisruptionBudgetSpec, c *conversion.Cloner) error {
-	out.MinAvailable = in.MinAvailable
-	if in.Selector != nil {
-		in, out := in.Selector, &out.Selector
-		*out = new(unversioned.LabelSelector)
-		if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil {
 			return err
 		}
-	} else {
+		if err := DeepCopy_v1alpha1_PodDisruptionBudgetSpec(&in.Spec, &out.Spec, c); err != nil {
-		out.Selector = nil
+			return err
+		}
+		out.Status = in.Status
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_v1alpha1_PodDisruptionBudgetStatus(in PodDisruptionBudgetStatus, out *PodDisruptionBudgetStatus, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_PodDisruptionBudgetList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.PodDisruptionAllowed = in.PodDisruptionAllowed
+	{
-	out.CurrentHealthy = in.CurrentHealthy
+		in := in.(*PodDisruptionBudgetList)
-	out.DesiredHealthy = in.DesiredHealthy
+		out := out.(*PodDisruptionBudgetList)
-	out.ExpectedPods = in.ExpectedPods
+		out.TypeMeta = in.TypeMeta
-	return nil
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]PodDisruptionBudget, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1alpha1_PodDisruptionBudget(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1alpha1_PodDisruptionBudgetSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodDisruptionBudgetSpec)
+		out := out.(*PodDisruptionBudgetSpec)
+		out.MinAvailable = in.MinAvailable
+		if in.Selector != nil {
+			in, out := &in.Selector, &out.Selector
+			*out = new(unversioned.LabelSelector)
+			if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil {
+				return err
+			}
+		} else {
+			out.Selector = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1alpha1_PodDisruptionBudgetStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodDisruptionBudgetStatus)
+		out := out.(*PodDisruptionBudgetStatus)
+		out.PodDisruptionAllowed = in.PodDisruptionAllowed
+		out.CurrentHealthy = in.CurrentHealthy
+		out.DesiredHealthy = in.DesiredHealthy
+		out.ExpectedPods = in.ExpectedPods
+		return nil
+	}
 }

pkg/apis/rbac/deep_copy_generated.go

@@ -24,218 +24,259 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_rbac_ClusterRole,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRole, InType: reflect.TypeOf(func() *ClusterRole { var x *ClusterRole; return x }())},
-		DeepCopy_rbac_ClusterRoleBinding,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRoleBinding, InType: reflect.TypeOf(func() *ClusterRoleBinding { var x *ClusterRoleBinding; return x }())},
-		DeepCopy_rbac_ClusterRoleBindingList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRoleBindingList, InType: reflect.TypeOf(func() *ClusterRoleBindingList { var x *ClusterRoleBindingList; return x }())},
-		DeepCopy_rbac_ClusterRoleList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRoleList, InType: reflect.TypeOf(func() *ClusterRoleList { var x *ClusterRoleList; return x }())},
-		DeepCopy_rbac_PolicyRule,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_PolicyRule, InType: reflect.TypeOf(func() *PolicyRule { var x *PolicyRule; return x }())},
-		DeepCopy_rbac_Role,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_Role, InType: reflect.TypeOf(func() *Role { var x *Role; return x }())},
-		DeepCopy_rbac_RoleBinding,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleBinding, InType: reflect.TypeOf(func() *RoleBinding { var x *RoleBinding; return x }())},
-		DeepCopy_rbac_RoleBindingList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleBindingList, InType: reflect.TypeOf(func() *RoleBindingList { var x *RoleBindingList; return x }())},
-		DeepCopy_rbac_RoleList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleList, InType: reflect.TypeOf(func() *RoleList { var x *RoleList; return x }())},
-		DeepCopy_rbac_Subject,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_Subject, InType: reflect.TypeOf(func() *Subject { var x *Subject; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_rbac_ClusterRole(in ClusterRole, out *ClusterRole, c *conversion.Cloner) error {
+func DeepCopy_rbac_ClusterRole(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*ClusterRole)
-		return err
+		out := out.(*ClusterRole)
-	}
+		out.TypeMeta = in.TypeMeta
-	if in.Rules != nil {
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		in, out := in.Rules, &out.Rules
+			return err
-		*out = make([]PolicyRule, len(in))
+		}
-		for i := range in {
+		if in.Rules != nil {
-			if err := DeepCopy_rbac_PolicyRule(in[i], &(*out)[i], c); err != nil {
+			in, out := &in.Rules, &out.Rules
-				return err
+			*out = make([]PolicyRule, len(*in))
+			for i := range *in {
+				if err := DeepCopy_rbac_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
 			}
+		} else {
+			out.Rules = nil
 		}
-	} else {
+		return nil
-		out.Rules = nil
 	}
-	return nil
 }
 
-func DeepCopy_rbac_ClusterRoleBinding(in ClusterRoleBinding, out *ClusterRoleBinding, c *conversion.Cloner) error {
+func DeepCopy_rbac_ClusterRoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*ClusterRoleBinding)
-		return err
+		out := out.(*ClusterRoleBinding)
-	}
+		out.TypeMeta = in.TypeMeta
-	if in.Subjects != nil {
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		in, out := in.Subjects, &out.Subjects
+			return err
-		*out = make([]Subject, len(in))
-		for i := range in {
-			(*out)[i] = in[i]
 		}
-	} else {
+		if in.Subjects != nil {
-		out.Subjects = nil
+			in, out := &in.Subjects, &out.Subjects
-	}
+			*out = make([]Subject, len(*in))
-	out.RoleRef = in.RoleRef
+			for i := range *in {
-	return nil
+				(*out)[i] = (*in)[i]
-}
-
-func DeepCopy_rbac_ClusterRoleBindingList(in ClusterRoleBindingList, out *ClusterRoleBindingList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]ClusterRoleBinding, len(in))
-		for i := range in {
-			if err := DeepCopy_rbac_ClusterRoleBinding(in[i], &(*out)[i], c); err != nil {
-				return err
 			}
+		} else {
+			out.Subjects = nil
 		}
-	} else {
+		out.RoleRef = in.RoleRef
-		out.Items = nil
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_rbac_ClusterRoleList(in ClusterRoleList, out *ClusterRoleList, c *conversion.Cloner) error {
+func DeepCopy_rbac_ClusterRoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.ListMeta = in.ListMeta
+		in := in.(*ClusterRoleBindingList)
-	if in.Items != nil {
+		out := out.(*ClusterRoleBindingList)
-		in, out := in.Items, &out.Items
+		out.TypeMeta = in.TypeMeta
-		*out = make([]ClusterRole, len(in))
+		out.ListMeta = in.ListMeta
-		for i := range in {
+		if in.Items != nil {
-			if err := DeepCopy_rbac_ClusterRole(in[i], &(*out)[i], c); err != nil {
+			in, out := &in.Items, &out.Items
-				return err
+			*out = make([]ClusterRoleBinding, len(*in))
+			for i := range *in {
+				if err := DeepCopy_rbac_ClusterRoleBinding(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
 			}
+		} else {
+			out.Items = nil
 		}
-	} else {
+		return nil
-		out.Items = nil
 	}
-	return nil
 }
 
-func DeepCopy_rbac_PolicyRule(in PolicyRule, out *PolicyRule, c *conversion.Cloner) error {
+func DeepCopy_rbac_ClusterRoleList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.Verbs != nil {
+	{
-		in, out := in.Verbs, &out.Verbs
+		in := in.(*ClusterRoleList)
-		*out = make([]string, len(in))
+		out := out.(*ClusterRoleList)
-		copy(*out, in)
+		out.TypeMeta = in.TypeMeta
-	} else {
+		out.ListMeta = in.ListMeta
-		out.Verbs = nil
+		if in.Items != nil {
-	}
+			in, out := &in.Items, &out.Items
-	if in.AttributeRestrictions == nil {
+			*out = make([]ClusterRole, len(*in))
-		out.AttributeRestrictions = nil
+			for i := range *in {
-	} else if newVal, err := c.DeepCopy(in.AttributeRestrictions); err != nil {
+				if err := DeepCopy_rbac_ClusterRole(&(*in)[i], &(*out)[i], c); err != nil {
-		return err
+					return err
-	} else {
+				}
-		out.AttributeRestrictions = newVal.(runtime.Object)
-	}
-	if in.APIGroups != nil {
-		in, out := in.APIGroups, &out.APIGroups
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.APIGroups = nil
-	}
-	if in.Resources != nil {
-		in, out := in.Resources, &out.Resources
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Resources = nil
-	}
-	if in.ResourceNames != nil {
-		in, out := in.ResourceNames, &out.ResourceNames
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.ResourceNames = nil
-	}
-	if in.NonResourceURLs != nil {
-		in, out := in.NonResourceURLs, &out.NonResourceURLs
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.NonResourceURLs = nil
-	}
-	return nil
-}
-
-func DeepCopy_rbac_Role(in Role, out *Role, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if in.Rules != nil {
-		in, out := in.Rules, &out.Rules
-		*out = make([]PolicyRule, len(in))
-		for i := range in {
-			if err := DeepCopy_rbac_PolicyRule(in[i], &(*out)[i], c); err != nil {
-				return err
 			}
+		} else {
+			out.Items = nil
 		}
-	} else {
+		return nil
-		out.Rules = nil
 	}
-	return nil
 }
 
-func DeepCopy_rbac_RoleBinding(in RoleBinding, out *RoleBinding, c *conversion.Cloner) error {
+func DeepCopy_rbac_PolicyRule(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*PolicyRule)
-		return err
+		out := out.(*PolicyRule)
-	}
+		if in.Verbs != nil {
-	if in.Subjects != nil {
+			in, out := &in.Verbs, &out.Verbs
-		in, out := in.Subjects, &out.Subjects
+			*out = make([]string, len(*in))
-		*out = make([]Subject, len(in))
+			copy(*out, *in)
-		for i := range in {
+		} else {
-			(*out)[i] = in[i]
+			out.Verbs = nil
 		}
-	} else {
+		if in.AttributeRestrictions == nil {
-		out.Subjects = nil
+			out.AttributeRestrictions = nil
+		} else if newVal, err := c.DeepCopy(&in.AttributeRestrictions); err != nil {
+			return err
+		} else {
+			out.AttributeRestrictions = *newVal.(*runtime.Object)
+		}
+		if in.APIGroups != nil {
+			in, out := &in.APIGroups, &out.APIGroups
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.APIGroups = nil
+		}
+		if in.Resources != nil {
+			in, out := &in.Resources, &out.Resources
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Resources = nil
+		}
+		if in.ResourceNames != nil {
+			in, out := &in.ResourceNames, &out.ResourceNames
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.ResourceNames = nil
+		}
+		if in.NonResourceURLs != nil {
+			in, out := &in.NonResourceURLs, &out.NonResourceURLs
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.NonResourceURLs = nil
+		}
+		return nil
 	}
-	out.RoleRef = in.RoleRef
-	return nil
 }
 
-func DeepCopy_rbac_RoleBindingList(in RoleBindingList, out *RoleBindingList, c *conversion.Cloner) error {
+func DeepCopy_rbac_Role(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.ListMeta = in.ListMeta
+		in := in.(*Role)
-	if in.Items != nil {
+		out := out.(*Role)
-		in, out := in.Items, &out.Items
+		out.TypeMeta = in.TypeMeta
-		*out = make([]RoleBinding, len(in))
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		for i := range in {
+			return err
-			if err := DeepCopy_rbac_RoleBinding(in[i], &(*out)[i], c); err != nil {
+		}
-				return err
+		if in.Rules != nil {
+			in, out := &in.Rules, &out.Rules
+			*out = make([]PolicyRule, len(*in))
+			for i := range *in {
+				if err := DeepCopy_rbac_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
 			}
+		} else {
+			out.Rules = nil
 		}
-	} else {
+		return nil
-		out.Items = nil
 	}
-	return nil
 }
 
-func DeepCopy_rbac_RoleList(in RoleList, out *RoleList, c *conversion.Cloner) error {
+func DeepCopy_rbac_RoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.ListMeta = in.ListMeta
+		in := in.(*RoleBinding)
-	if in.Items != nil {
+		out := out.(*RoleBinding)
-		in, out := in.Items, &out.Items
+		out.TypeMeta = in.TypeMeta
-		*out = make([]Role, len(in))
+		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		for i := range in {
+			return err
-			if err := DeepCopy_rbac_Role(in[i], &(*out)[i], c); err != nil {
+		}
-				return err
+		if in.Subjects != nil {
+			in, out := &in.Subjects, &out.Subjects
+			*out = make([]Subject, len(*in))
+			for i := range *in {
+				(*out)[i] = (*in)[i]
 			}
+		} else {
+			out.Subjects = nil
 		}
-	} else {
+		out.RoleRef = in.RoleRef
-		out.Items = nil
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_rbac_Subject(in Subject, out *Subject, c *conversion.Cloner) error {
+func DeepCopy_rbac_RoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Kind = in.Kind
+	{
-	out.APIVersion = in.APIVersion
+		in := in.(*RoleBindingList)
-	out.Name = in.Name
+		out := out.(*RoleBindingList)
-	out.Namespace = in.Namespace
+		out.TypeMeta = in.TypeMeta
-	return nil
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]RoleBinding, len(*in))
+			for i := range *in {
+				if err := DeepCopy_rbac_RoleBinding(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_rbac_RoleList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RoleList)
+		out := out.(*RoleList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]Role, len(*in))
+			for i := range *in {
+				if err := DeepCopy_rbac_Role(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_rbac_Subject(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*Subject)
+		out := out.(*Subject)
+		out.Kind = in.Kind
+		out.APIVersion = in.APIVersion
+		out.Name = in.Name
+		out.Namespace = in.Namespace
+		return nil
+	}
 }

pkg/apis/rbac/v1alpha1/deep_copy_generated.go

@@ -25,214 +25,255 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
+	reflect "reflect"
 )
 
 func init() {
 	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_v1alpha1_ClusterRole,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRole, InType: reflect.TypeOf(func() *ClusterRole { var x *ClusterRole; return x }())},
-		DeepCopy_v1alpha1_ClusterRoleBinding,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRoleBinding, InType: reflect.TypeOf(func() *ClusterRoleBinding { var x *ClusterRoleBinding; return x }())},
-		DeepCopy_v1alpha1_ClusterRoleBindingList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRoleBindingList, InType: reflect.TypeOf(func() *ClusterRoleBindingList { var x *ClusterRoleBindingList; return x }())},
-		DeepCopy_v1alpha1_ClusterRoleList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRoleList, InType: reflect.TypeOf(func() *ClusterRoleList { var x *ClusterRoleList; return x }())},
-		DeepCopy_v1alpha1_PolicyRule,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PolicyRule, InType: reflect.TypeOf(func() *PolicyRule { var x *PolicyRule; return x }())},
-		DeepCopy_v1alpha1_Role,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_Role, InType: reflect.TypeOf(func() *Role { var x *Role; return x }())},
-		DeepCopy_v1alpha1_RoleBinding,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleBinding, InType: reflect.TypeOf(func() *RoleBinding { var x *RoleBinding; return x }())},
-		DeepCopy_v1alpha1_RoleBindingList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleBindingList, InType: reflect.TypeOf(func() *RoleBindingList { var x *RoleBindingList; return x }())},
-		DeepCopy_v1alpha1_RoleList,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleList, InType: reflect.TypeOf(func() *RoleList { var x *RoleList; return x }())},
-		DeepCopy_v1alpha1_Subject,
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_Subject, InType: reflect.TypeOf(func() *Subject { var x *Subject; return x }())},
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
 	}
 }
 
-func DeepCopy_v1alpha1_ClusterRole(in ClusterRole, out *ClusterRole, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_ClusterRole(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*ClusterRole)
-		return err
+		out := out.(*ClusterRole)
-	}
+		out.TypeMeta = in.TypeMeta
-	if in.Rules != nil {
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		in, out := in.Rules, &out.Rules
+			return err
-		*out = make([]PolicyRule, len(in))
+		}
-		for i := range in {
+		if in.Rules != nil {
-			if err := DeepCopy_v1alpha1_PolicyRule(in[i], &(*out)[i], c); err != nil {
+			in, out := &in.Rules, &out.Rules
-				return err
+			*out = make([]PolicyRule, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1alpha1_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
 			}
+		} else {
+			out.Rules = nil
 		}
-	} else {
+		return nil
-		out.Rules = nil
 	}
-	return nil
 }
 
-func DeepCopy_v1alpha1_ClusterRoleBinding(in ClusterRoleBinding, out *ClusterRoleBinding, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_ClusterRoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*ClusterRoleBinding)
-		return err
+		out := out.(*ClusterRoleBinding)
-	}
+		out.TypeMeta = in.TypeMeta
-	if in.Subjects != nil {
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		in, out := in.Subjects, &out.Subjects
+			return err
-		*out = make([]Subject, len(in))
-		for i := range in {
-			(*out)[i] = in[i]
 		}
-	} else {
+		if in.Subjects != nil {
-		out.Subjects = nil
+			in, out := &in.Subjects, &out.Subjects
-	}
+			*out = make([]Subject, len(*in))
-	out.RoleRef = in.RoleRef
+			for i := range *in {
-	return nil
+				(*out)[i] = (*in)[i]
-}
-
-func DeepCopy_v1alpha1_ClusterRoleBindingList(in ClusterRoleBindingList, out *ClusterRoleBindingList, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]ClusterRoleBinding, len(in))
-		for i := range in {
-			if err := DeepCopy_v1alpha1_ClusterRoleBinding(in[i], &(*out)[i], c); err != nil {
-				return err
 			}
+		} else {
+			out.Subjects = nil
 		}
-	} else {
+		out.RoleRef = in.RoleRef
-		out.Items = nil
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_v1alpha1_ClusterRoleList(in ClusterRoleList, out *ClusterRoleList, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_ClusterRoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.ListMeta = in.ListMeta
+		in := in.(*ClusterRoleBindingList)
-	if in.Items != nil {
+		out := out.(*ClusterRoleBindingList)
-		in, out := in.Items, &out.Items
+		out.TypeMeta = in.TypeMeta
-		*out = make([]ClusterRole, len(in))
+		out.ListMeta = in.ListMeta
-		for i := range in {
+		if in.Items != nil {
-			if err := DeepCopy_v1alpha1_ClusterRole(in[i], &(*out)[i], c); err != nil {
+			in, out := &in.Items, &out.Items
-				return err
+			*out = make([]ClusterRoleBinding, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1alpha1_ClusterRoleBinding(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
 			}
+		} else {
+			out.Items = nil
 		}
-	} else {
+		return nil
-		out.Items = nil
 	}
-	return nil
 }
 
-func DeepCopy_v1alpha1_PolicyRule(in PolicyRule, out *PolicyRule, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_ClusterRoleList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.Verbs != nil {
+	{
-		in, out := in.Verbs, &out.Verbs
+		in := in.(*ClusterRoleList)
-		*out = make([]string, len(in))
+		out := out.(*ClusterRoleList)
-		copy(*out, in)
+		out.TypeMeta = in.TypeMeta
-	} else {
+		out.ListMeta = in.ListMeta
-		out.Verbs = nil
+		if in.Items != nil {
-	}
+			in, out := &in.Items, &out.Items
-	if err := runtime.DeepCopy_runtime_RawExtension(in.AttributeRestrictions, &out.AttributeRestrictions, c); err != nil {
+			*out = make([]ClusterRole, len(*in))
-		return err
+			for i := range *in {
-	}
+				if err := DeepCopy_v1alpha1_ClusterRole(&(*in)[i], &(*out)[i], c); err != nil {
-	if in.APIGroups != nil {
+					return err
-		in, out := in.APIGroups, &out.APIGroups
+				}
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.APIGroups = nil
-	}
-	if in.Resources != nil {
-		in, out := in.Resources, &out.Resources
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Resources = nil
-	}
-	if in.ResourceNames != nil {
-		in, out := in.ResourceNames, &out.ResourceNames
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.ResourceNames = nil
-	}
-	if in.NonResourceURLs != nil {
-		in, out := in.NonResourceURLs, &out.NonResourceURLs
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.NonResourceURLs = nil
-	}
-	return nil
-}
-
-func DeepCopy_v1alpha1_Role(in Role, out *Role, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if in.Rules != nil {
-		in, out := in.Rules, &out.Rules
-		*out = make([]PolicyRule, len(in))
-		for i := range in {
-			if err := DeepCopy_v1alpha1_PolicyRule(in[i], &(*out)[i], c); err != nil {
-				return err
 			}
+		} else {
+			out.Items = nil
 		}
-	} else {
+		return nil
-		out.Rules = nil
 	}
-	return nil
 }
 
-func DeepCopy_v1alpha1_RoleBinding(in RoleBinding, out *RoleBinding, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_PolicyRule(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+		in := in.(*PolicyRule)
-		return err
+		out := out.(*PolicyRule)
-	}
+		if in.Verbs != nil {
-	if in.Subjects != nil {
+			in, out := &in.Verbs, &out.Verbs
-		in, out := in.Subjects, &out.Subjects
+			*out = make([]string, len(*in))
-		*out = make([]Subject, len(in))
+			copy(*out, *in)
-		for i := range in {
+		} else {
-			(*out)[i] = in[i]
+			out.Verbs = nil
 		}
-	} else {
+		if err := runtime.DeepCopy_runtime_RawExtension(&in.AttributeRestrictions, &out.AttributeRestrictions, c); err != nil {
-		out.Subjects = nil
+			return err
+		}
+		if in.APIGroups != nil {
+			in, out := &in.APIGroups, &out.APIGroups
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.APIGroups = nil
+		}
+		if in.Resources != nil {
+			in, out := &in.Resources, &out.Resources
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Resources = nil
+		}
+		if in.ResourceNames != nil {
+			in, out := &in.ResourceNames, &out.ResourceNames
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.ResourceNames = nil
+		}
+		if in.NonResourceURLs != nil {
+			in, out := &in.NonResourceURLs, &out.NonResourceURLs
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.NonResourceURLs = nil
+		}
+		return nil
 	}
-	out.RoleRef = in.RoleRef
-	return nil
 }
 
-func DeepCopy_v1alpha1_RoleBindingList(in RoleBindingList, out *RoleBindingList, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_Role(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.ListMeta = in.ListMeta
+		in := in.(*Role)
-	if in.Items != nil {
+		out := out.(*Role)
-		in, out := in.Items, &out.Items
+		out.TypeMeta = in.TypeMeta
-		*out = make([]RoleBinding, len(in))
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		for i := range in {
+			return err
-			if err := DeepCopy_v1alpha1_RoleBinding(in[i], &(*out)[i], c); err != nil {
+		}
-				return err
+		if in.Rules != nil {
+			in, out := &in.Rules, &out.Rules
+			*out = make([]PolicyRule, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1alpha1_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
 			}
+		} else {
+			out.Rules = nil
 		}
-	} else {
+		return nil
-		out.Items = nil
 	}
-	return nil
 }
 
-func DeepCopy_v1alpha1_RoleList(in RoleList, out *RoleList, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_RoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	out.ListMeta = in.ListMeta
+		in := in.(*RoleBinding)
-	if in.Items != nil {
+		out := out.(*RoleBinding)
-		in, out := in.Items, &out.Items
+		out.TypeMeta = in.TypeMeta
-		*out = make([]Role, len(in))
+		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		for i := range in {
+			return err
-			if err := DeepCopy_v1alpha1_Role(in[i], &(*out)[i], c); err != nil {
+		}
-				return err
+		if in.Subjects != nil {
+			in, out := &in.Subjects, &out.Subjects
+			*out = make([]Subject, len(*in))
+			for i := range *in {
+				(*out)[i] = (*in)[i]
 			}
+		} else {
+			out.Subjects = nil
 		}
-	} else {
+		out.RoleRef = in.RoleRef
-		out.Items = nil
+		return nil
 	}
-	return nil
 }
 
-func DeepCopy_v1alpha1_Subject(in Subject, out *Subject, c *conversion.Cloner) error {
+func DeepCopy_v1alpha1_RoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.Kind = in.Kind
+	{
-	out.APIVersion = in.APIVersion
+		in := in.(*RoleBindingList)
-	out.Name = in.Name
+		out := out.(*RoleBindingList)
-	out.Namespace = in.Namespace
+		out.TypeMeta = in.TypeMeta
-	return nil
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]RoleBinding, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1alpha1_RoleBinding(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1alpha1_RoleList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RoleList)
+		out := out.(*RoleList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]Role, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1alpha1_Role(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1alpha1_Subject(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*Subject)
+		out := out.(*Subject)
+		out.Kind = in.Kind
+		out.APIVersion = in.APIVersion
+		out.Name = in.Name
+		out.Namespace = in.Namespace
+		return nil
+	}
 }

pkg/conversion/cloner.go

@@ -25,14 +25,14 @@ import (
 type Cloner struct {
 	// Map from the type to a function which can do the deep copy.
 	deepCopyFuncs          map[reflect.Type]reflect.Value
-	generatedDeepCopyFuncs map[reflect.Type]reflect.Value
+	generatedDeepCopyFuncs map[reflect.Type]func(in interface{}, out interface{}, c *Cloner) error
 }
 
 // NewCloner creates a new Cloner object.
 func NewCloner() *Cloner {
 	c := &Cloner{
 		deepCopyFuncs:          map[reflect.Type]reflect.Value{},
-		generatedDeepCopyFuncs: map[reflect.Type]reflect.Value{},
+		generatedDeepCopyFuncs: map[reflect.Type]func(in interface{}, out interface{}, c *Cloner) error{},
 	}
 	if err := c.RegisterDeepCopyFunc(byteSliceDeepCopy); err != nil {
 		// If one of the deep-copy functions is malformed, detect it immediately.
@@ -42,10 +42,10 @@ func NewCloner() *Cloner {
 }
 
 // Prevent recursing into every byte...
-func byteSliceDeepCopy(in []byte, out *[]byte, c *Cloner) error {
+func byteSliceDeepCopy(in *[]byte, out *[]byte, c *Cloner) error {
-	if in != nil {
+	if *in != nil {
-		*out = make([]byte, len(in))
+		*out = make([]byte, len(*in))
-		copy(*out, in)
+		copy(*out, *in)
 	} else {
 		*out = nil
 	}
@@ -63,10 +63,10 @@ func verifyDeepCopyFunctionSignature(ft reflect.Type) error {
 	if ft.NumOut() != 1 {
 		return fmt.Errorf("expected one 'out' param, got %v", ft)
 	}
-	if ft.In(1).Kind() != reflect.Ptr {
+	if ft.In(0).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'in' param 1, got: %v", ft)
+		return fmt.Errorf("expected pointer arg for 'in' param 0, got: %v", ft)
 	}
-	if ft.In(1).Elem() != ft.In(0) {
+	if ft.In(1) != ft.In(0) {
 		return fmt.Errorf("expected 'in' param 0 the same as param 1, got: %v", ft)
 	}
 	var forClonerType Cloner
@@ -103,15 +103,17 @@ func (c *Cloner) RegisterDeepCopyFunc(deepCopyFunc interface{}) error {
 	return nil
 }
 
+// GeneratedDeepCopyFunc bundles an untyped generated deep-copy function of a type
+// with a reflection type object used as a key to lookup the deep-copy function.
+type GeneratedDeepCopyFunc struct {
+	Fn     func(in interface{}, out interface{}, c *Cloner) error
+	InType reflect.Type
+}
+
 // Similar to RegisterDeepCopyFunc, but registers deep copy function that were
 // automatically generated.
-func (c *Cloner) RegisterGeneratedDeepCopyFunc(deepCopyFunc interface{}) error {
+func (c *Cloner) RegisterGeneratedDeepCopyFunc(fn GeneratedDeepCopyFunc) error {
-	fv := reflect.ValueOf(deepCopyFunc)
+	c.generatedDeepCopyFuncs[fn.InType] = fn.Fn
-	ft := fv.Type()
-	if err := verifyDeepCopyFunctionSignature(ft); err != nil {
-		return err
-	}
-	c.generatedDeepCopyFuncs[ft.In(0)] = fv
 	return nil
 }
 
@@ -135,25 +137,35 @@ func (c *Cloner) DeepCopy(in interface{}) (interface{}, error) {
 func (c *Cloner) deepCopy(src reflect.Value) (reflect.Value, error) {
 	inType := src.Type()
 
+	switch src.Kind() {
+	case reflect.Interface, reflect.Ptr, reflect.Map, reflect.Slice:
+		if src.IsNil() {
+			return src, nil
+		}
+	}
+
 	if fv, ok := c.deepCopyFuncs[inType]; ok {
 		return c.customDeepCopy(src, fv)
 	}
 	if fv, ok := c.generatedDeepCopyFuncs[inType]; ok {
-		return c.customDeepCopy(src, fv)
+		var outValue reflect.Value
+		outValue = reflect.New(inType.Elem())
+		err := fv(src.Interface(), outValue.Interface(), c)
+		return outValue, err
 	}
 	return c.defaultDeepCopy(src)
 }
 
 func (c *Cloner) customDeepCopy(src, fv reflect.Value) (reflect.Value, error) {
-	outValue := reflect.New(src.Type())
+	outValue := reflect.New(src.Type().Elem())
 	args := []reflect.Value{src, outValue, reflect.ValueOf(c)}
 	result := fv.Call(args)[0].Interface()
 	// This convolution is necessary because nil interfaces won't convert
 	// to error.
 	if result == nil {
-		return outValue.Elem(), nil
+		return outValue, nil
 	}
-	return outValue.Elem(), result.(error)
+	return outValue, result.(error)
 }
 
 func (c *Cloner) defaultDeepCopy(src reflect.Value) (reflect.Value, error) {

pkg/runtime/deep_copy_generated.go

@@ -24,40 +24,52 @@ import (
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
 
-func DeepCopy_runtime_RawExtension(in RawExtension, out *RawExtension, c *conversion.Cloner) error {
+func DeepCopy_runtime_RawExtension(in interface{}, out interface{}, c *conversion.Cloner) error {
-	if in.Raw != nil {
+	{
-		in, out := in.Raw, &out.Raw
+		in := in.(*RawExtension)
-		*out = make([]byte, len(in))
+		out := out.(*RawExtension)
-		copy(*out, in)
+		if in.Raw != nil {
-	} else {
+			in, out := &in.Raw, &out.Raw
-		out.Raw = nil
+			*out = make([]byte, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Raw = nil
+		}
+		if in.Object == nil {
+			out.Object = nil
+		} else if newVal, err := c.DeepCopy(&in.Object); err != nil {
+			return err
+		} else {
+			out.Object = *newVal.(*Object)
+		}
+		return nil
 	}
-	if in.Object == nil {
-		out.Object = nil
-	} else if newVal, err := c.DeepCopy(in.Object); err != nil {
-		return err
-	} else {
-		out.Object = newVal.(Object)
-	}
-	return nil
 }
 
-func DeepCopy_runtime_TypeMeta(in TypeMeta, out *TypeMeta, c *conversion.Cloner) error {
+func DeepCopy_runtime_TypeMeta(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.APIVersion = in.APIVersion
+	{
-	out.Kind = in.Kind
+		in := in.(*TypeMeta)
-	return nil
+		out := out.(*TypeMeta)
+		out.APIVersion = in.APIVersion
+		out.Kind = in.Kind
+		return nil
+	}
 }
 
-func DeepCopy_runtime_Unknown(in Unknown, out *Unknown, c *conversion.Cloner) error {
+func DeepCopy_runtime_Unknown(in interface{}, out interface{}, c *conversion.Cloner) error {
-	out.TypeMeta = in.TypeMeta
+	{
-	if in.Raw != nil {
+		in := in.(*Unknown)
-		in, out := in.Raw, &out.Raw
+		out := out.(*Unknown)
-		*out = make([]byte, len(in))
+		out.TypeMeta = in.TypeMeta
-		copy(*out, in)
+		if in.Raw != nil {
-	} else {
+			in, out := &in.Raw, &out.Raw
-		out.Raw = nil
+			*out = make([]byte, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Raw = nil
+		}
+		out.ContentEncoding = in.ContentEncoding
+		out.ContentType = in.ContentType
+		return nil
 	}
-	out.ContentEncoding = in.ContentEncoding
-	out.ContentType = in.ContentType
-	return nil
 }

pkg/runtime/scheme.go

@@ -357,9 +357,9 @@ func (s *Scheme) AddDeepCopyFuncs(deepCopyFuncs ...interface{}) error {
 
 // Similar to AddDeepCopyFuncs, but registers deep-copy functions that were
 // automatically generated.
-func (s *Scheme) AddGeneratedDeepCopyFuncs(deepCopyFuncs ...interface{}) error {
+func (s *Scheme) AddGeneratedDeepCopyFuncs(deepCopyFuncs ...conversion.GeneratedDeepCopyFunc) error {
-	for _, f := range deepCopyFuncs {
+	for _, fn := range deepCopyFuncs {
-		if err := s.cloner.RegisterGeneratedDeepCopyFunc(f); err != nil {
+		if err := s.cloner.RegisterGeneratedDeepCopyFunc(fn); err != nil {
 			return err
 		}
 	}