diff --git a/cmd/libs/go2idl/args/args.go b/cmd/libs/go2idl/args/args.go
index 4e6db325d5a..9ca3497a496 100644
--- a/cmd/libs/go2idl/args/args.go
+++ b/cmd/libs/go2idl/args/args.go
@@ -93,6 +93,9 @@ func (g *GeneratorArgs) LoadGoBoilerplate() ([]byte, error) {
 // directories.
 func (g *GeneratorArgs) NewBuilder() (*parser.Builder, error) {
 	b := parser.New()
+	// Ignore all auto-generated files.
+	b.AddBuildTags("ignore_autogenerated")
+
 	for _, d := range g.InputDirs {
 		if g.Recursive {
 			if err := b.AddDirRecursive(d); err != nil {
diff --git a/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go b/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go
index 1062c57776c..69d16996dc4 100644
--- a/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go
+++ b/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/kubernetes/cmd/libs/go2idl/generator"
 	"k8s.io/kubernetes/cmd/libs/go2idl/namer"
 	"k8s.io/kubernetes/cmd/libs/go2idl/types"
+	"k8s.io/kubernetes/pkg/util/sets"
 
 	"github.com/golang/glog"
 )
@@ -55,48 +56,52 @@ func DefaultNameSystem() string {
 	return "public"
 }
 
-func Packages(_ *generator.Context, arguments *args.GeneratorArgs) generator.Packages {
+func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages {
 	boilerplate, err := arguments.LoadGoBoilerplate()
 	if err != nil {
 		glog.Fatalf("Failed loading boilerplate: %v", err)
 	}
 
+	inputs := sets.NewString(arguments.InputDirs...)
 	packages := generator.Packages{}
-	for _, inputDir := range arguments.InputDirs {
-		packages = append(packages,
-			&generator.DefaultPackage{
-				PackageName: filepath.Base(inputDir),
-				PackagePath: inputDir,
-				HeaderText: append(boilerplate, []byte(
-					`
+	header := append([]byte(
+		`
+// +build !ignore_autogenerated
+
+`), boilerplate...)
+	header = append(header, []byte(
+		`
 // This file was autogenerated by deepcopy-gen. Do not edit it manually!
 
-`)...),
-				GeneratorFunc: func(c *generator.Context) (generators []generator.Generator) {
-					generators = []generator.Generator{}
-					// TODO: Check whether anything will be generated.
-					generators = append(generators, NewGenDeepCopy("deep_copy_generated", inputDir))
-					return generators
-				},
-				FilterFunc: func(c *generator.Context, t *types.Type) bool {
-					switch t.Kind {
-					case types.Func, types.Chan:
-						// These types can't be copied.
-						return false
-					case types.Unknown, types.Unsupported:
-						// These types are explicitly ignored.
-						return false
-					case types.Array:
-						// We don't support arrays.
-						return false
-					}
-					// Also, filter out private types.
-					if namer.IsPrivateGoName(t.Name.Name) {
-						return false
-					}
-					return true
-				},
-			})
+`)...)
+	for _, p := range context.Universe {
+		copyableType := false
+		for _, t := range p.Types {
+			if copyableWithinPackage(t) {
+				copyableType = true
+			}
+		}
+		if copyableType {
+			path := p.Path
+			packages = append(packages,
+				&generator.DefaultPackage{
+					PackageName: filepath.Base(path),
+					PackagePath: path,
+					HeaderText:  header,
+					GeneratorFunc: func(c *generator.Context) (generators []generator.Generator) {
+						generators = []generator.Generator{}
+						generators = append(
+							generators, NewGenDeepCopy("deep_copy_generated", path, inputs.Has(path)))
+						return generators
+					},
+					FilterFunc: func(c *generator.Context, t *types.Type) bool {
+						if t.Name.Package != path {
+							return false
+						}
+						return copyableWithinPackage(t)
+					},
+				})
+		}
 	}
 	return packages
 }
@@ -109,19 +114,21 @@ const (
 // genDeepCopy produces a file with a set for a single type.
 type genDeepCopy struct {
 	generator.DefaultGen
-	targetPackage string
-	imports       namer.ImportTracker
-	typesForInit  []*types.Type
+	targetPackage    string
+	imports          namer.ImportTracker
+	typesForInit     []*types.Type
+	generateInitFunc bool
 }
 
-func NewGenDeepCopy(sanitizedName, targetPackage string) generator.Generator {
+func NewGenDeepCopy(sanitizedName, targetPackage string, generateInitFunc bool) generator.Generator {
 	return &genDeepCopy{
 		DefaultGen: generator.DefaultGen{
 			OptionalName: sanitizedName,
 		},
-		targetPackage: targetPackage,
-		imports:       generator.NewImportTracker(),
-		typesForInit:  make([]*types.Type, 0),
+		targetPackage:    targetPackage,
+		imports:          generator.NewImportTracker(),
+		typesForInit:     make([]*types.Type, 0),
+		generateInitFunc: generateInitFunc,
 	}
 }
 
@@ -133,21 +140,14 @@ func (g *genDeepCopy) Namers(c *generator.Context) namer.NameSystems {
 // Filter ignores all but one type because we're making a single file per type.
 func (g *genDeepCopy) Filter(c *generator.Context, t *types.Type) bool {
 	// Filter out all types not copyable within the package.
-	copyable := g.copyableWithinPackage(t)
+	copyable := copyableWithinPackage(t)
 	if copyable {
 		g.typesForInit = append(g.typesForInit, t)
 	}
 	return copyable
 }
 
-func (g *genDeepCopy) copyableWithinPackage(t *types.Type) bool {
-	// TODO: We should generate public DeepCopy functions per directory, instead
-	// of generating everything everywhere.
-	// This is done that way only to minimize number of changes per PR.
-	// Once this is done, we should replace HasPrefix with:
-	//if t.Name.Package != g.targetPackage {
-	//	return false
-	//}
+func copyableWithinPackage(t *types.Type) bool {
 	if !strings.HasPrefix(t.Name.Package, "k8s.io/kubernetes/") {
 		return false
 	}
@@ -158,21 +158,9 @@ func (g *genDeepCopy) copyableWithinPackage(t *types.Type) bool {
 	if t.Kind != types.Struct {
 		return false
 	}
-	// TODO: This should be removed once we start generating public DeepCopy
-	// functions per directory.
-	if t.Name.Package != g.targetPackage {
-		// We won't be able to access private fields.
-		// Thus, this type cannot have private fields.
-		for _, member := range t.Members {
-			if namer.IsPrivateGoName(member.Name) {
-				return false
-			}
-			// TODO: This is a temporary hack, to make avoid generating function
-			// for conversion.Equalities. We should get rid of it.
-			if member.Embedded {
-				return false
-			}
-		}
+	// Also, filter out private types.
+	if namer.IsPrivateGoName(t.Name.Name) {
+		return false
 	}
 	return true
 }
@@ -189,7 +177,7 @@ func (g *genDeepCopy) isOtherPackage(pkg string) bool {
 
 func (g *genDeepCopy) Imports(c *generator.Context) (imports []string) {
 	importLines := []string{}
-	if g.isOtherPackage(apiPackagePath) {
+	if g.isOtherPackage(apiPackagePath) && g.generateInitFunc {
 		importLines = append(importLines, "api \""+apiPackagePath+"\"")
 	}
 	if g.isOtherPackage(conversionPackagePath) {
@@ -210,10 +198,21 @@ func argsFromType(t *types.Type) interface{} {
 }
 
 func (g *genDeepCopy) funcNameTmpl(t *types.Type) string {
-	return "DeepCopy_$.type|public$"
+	tmpl := "DeepCopy_$.type|public$"
+	g.imports.AddType(t)
+	if t.Name.Package != g.targetPackage {
+		tmpl = g.imports.LocalNameOf(t.Name.Package) + "." + tmpl
+	}
+	return tmpl
 }
 
 func (g *genDeepCopy) Init(c *generator.Context, w io.Writer) error {
+	if !g.generateInitFunc {
+		// TODO: We should come up with a solution to register all generated
+		// deep-copy functions. However, for now, to avoid import cycles
+		// we register only those explicitly requested.
+		return nil
+	}
 	sw := generator.NewSnippetWriter(w, c, "$", "$")
 	sw.Do("func init() {\n", nil)
 	if g.targetPackage == apiPackagePath {
@@ -236,7 +235,11 @@ func (g *genDeepCopy) Init(c *generator.Context, w io.Writer) error {
 func (g *genDeepCopy) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error {
 	sw := generator.NewSnippetWriter(w, c, "$", "$")
 	funcName := g.funcNameTmpl(t)
-	sw.Do(fmt.Sprintf("func %s(in $.type|raw$, out *$.type|raw$, c *conversion.Cloner) error {\n", funcName), argsFromType(t))
+	if g.targetPackage == conversionPackagePath {
+		sw.Do(fmt.Sprintf("func %s(in $.type|raw$, out *$.type|raw$, c *Cloner) error {\n", funcName), argsFromType(t))
+	} else {
+		sw.Do(fmt.Sprintf("func %s(in $.type|raw$, out *$.type|raw$, c *conversion.Cloner) error {\n", funcName), argsFromType(t))
+	}
 	g.generateFor(t, sw)
 	sw.Do("return nil\n", nil)
 	sw.Do("}\n\n", nil)
@@ -275,12 +278,12 @@ func (g *genDeepCopy) doBuiltin(t *types.Type, sw *generator.SnippetWriter) {
 
 func (g *genDeepCopy) doMap(t *types.Type, sw *generator.SnippetWriter) {
 	sw.Do("*out = make($.|raw$)\n", t)
-	sw.Do("for key, val := range in {\n", nil)
 	if t.Key.IsAssignable() {
+		sw.Do("for key, val := range in {\n", nil)
 		if t.Elem.IsAssignable() {
 			sw.Do("(*out)[key] = val\n", nil)
 		} else {
-			if g.copyableWithinPackage(t.Elem) {
+			if copyableWithinPackage(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))
@@ -297,6 +300,7 @@ func (g *genDeepCopy) doMap(t *types.Type, sw *generator.SnippetWriter) {
 		}
 	} else {
 		// TODO: Implement it when necessary.
+		sw.Do("for range in {\n", nil)
 		sw.Do("// FIXME: Copying unassignable keys unsupported $.|raw$\n", t.Key)
 	}
 	sw.Do("}\n", nil)
@@ -310,7 +314,7 @@ func (g *genDeepCopy) doSlice(t *types.Type, sw *generator.SnippetWriter) {
 		sw.Do("for i := range in {\n", nil)
 		if t.Elem.IsAssignable() {
 			sw.Do("(*out)[i] = in[i]\n", nil)
-		} else if g.copyableWithinPackage(t.Elem) {
+		} else if copyableWithinPackage(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("return err\n", nil)
@@ -343,7 +347,7 @@ func (g *genDeepCopy) doStruct(t *types.Type, sw *generator.SnippetWriter) {
 			sw.Do("out.$.name$ = nil\n", args)
 			sw.Do("}\n", nil)
 		case types.Struct:
-			if g.copyableWithinPackage(m.Type) {
+			if copyableWithinPackage(m.Type) {
 				funcName := g.funcNameTmpl(m.Type)
 				sw.Do(fmt.Sprintf("if err := %s(in.$.name$, &out.$.name$, c); err != nil {\n", funcName), args)
 				sw.Do("return err\n", nil)
@@ -378,7 +382,7 @@ func (g *genDeepCopy) doPointer(t *types.Type, sw *generator.SnippetWriter) {
 	sw.Do("*out = new($.Elem|raw$)\n", t)
 	if t.Elem.Kind == types.Builtin {
 		sw.Do("**out = *in", nil)
-	} else if g.copyableWithinPackage(t.Elem) {
+	} else if copyableWithinPackage(t.Elem) {
 		funcName := g.funcNameTmpl(t.Elem)
 		sw.Do(fmt.Sprintf("if err := %s(*in, *out, c); err != nil {\n", funcName), argsFromType(t.Elem))
 		sw.Do("return err\n", nil)
diff --git a/pkg/api/deep_copy_generated.go b/pkg/api/deep_copy_generated.go
index aa2712e1025..b4d9f103649 100644
--- a/pkg/api/deep_copy_generated.go
+++ b/pkg/api/deep_copy_generated.go
@@ -1,3 +1,5 @@
+// +build !ignore_autogenerated
+
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
 
@@ -26,7 +28,6 @@ import (
 	labels "k8s.io/kubernetes/pkg/labels"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	intstr "k8s.io/kubernetes/pkg/util/intstr"
-	sets "k8s.io/kubernetes/pkg/util/sets"
 )
 
 func init() {
@@ -171,16 +172,6 @@ func init() {
 		DeepCopy_api_Volume,
 		DeepCopy_api_VolumeMount,
 		DeepCopy_api_VolumeSource,
-		DeepCopy_conversion_Meta,
-		DeepCopy_intstr_IntOrString,
-		DeepCopy_sets_Empty,
-		DeepCopy_unversioned_GroupKind,
-		DeepCopy_unversioned_GroupResource,
-		DeepCopy_unversioned_GroupVersion,
-		DeepCopy_unversioned_GroupVersionKind,
-		DeepCopy_unversioned_GroupVersionResource,
-		DeepCopy_unversioned_ListMeta,
-		DeepCopy_unversioned_TypeMeta,
 	); err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.
 		panic(err)
@@ -216,7 +207,7 @@ func DeepCopy_api_AzureFileVolumeSource(in AzureFileVolumeSource, out *AzureFile
 }
 
 func DeepCopy_api_Binding(in Binding, out *Binding, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -290,7 +281,7 @@ func DeepCopy_api_ComponentCondition(in ComponentCondition, out *ComponentCondit
 }
 
 func DeepCopy_api_ComponentStatus(in ComponentStatus, out *ComponentStatus, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -311,10 +302,10 @@ func DeepCopy_api_ComponentStatus(in ComponentStatus, out *ComponentStatus, c *c
 }
 
 func DeepCopy_api_ComponentStatusList(in ComponentStatusList, out *ComponentStatusList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -332,7 +323,7 @@ func DeepCopy_api_ComponentStatusList(in ComponentStatusList, out *ComponentStat
 }
 
 func DeepCopy_api_ConfigMap(in ConfigMap, out *ConfigMap, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -359,10 +350,10 @@ func DeepCopy_api_ConfigMapKeySelector(in ConfigMapKeySelector, out *ConfigMapKe
 }
 
 func DeepCopy_api_ConfigMapList(in ConfigMapList, out *ConfigMapList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -548,10 +539,8 @@ func DeepCopy_api_ContainerState(in ContainerState, out *ContainerState, c *conv
 }
 
 func DeepCopy_api_ContainerStateRunning(in ContainerStateRunning, out *ContainerStateRunning, c *conversion.Cloner) error {
-	if newVal, err := c.DeepCopy(in.StartedAt); err != nil {
+	if err := unversioned.DeepCopy_unversioned_Time(in.StartedAt, &out.StartedAt, c); err != nil {
 		return err
-	} else {
-		out.StartedAt = newVal.(unversioned.Time)
 	}
 	return nil
 }
@@ -561,15 +550,11 @@ func DeepCopy_api_ContainerStateTerminated(in ContainerStateTerminated, out *Con
 	out.Signal = in.Signal
 	out.Reason = in.Reason
 	out.Message = in.Message
-	if newVal, err := c.DeepCopy(in.StartedAt); err != nil {
+	if err := unversioned.DeepCopy_unversioned_Time(in.StartedAt, &out.StartedAt, c); err != nil {
 		return err
-	} else {
-		out.StartedAt = newVal.(unversioned.Time)
 	}
-	if newVal, err := c.DeepCopy(in.FinishedAt); err != nil {
+	if err := unversioned.DeepCopy_unversioned_Time(in.FinishedAt, &out.FinishedAt, c); err != nil {
 		return err
-	} else {
-		out.FinishedAt = newVal.(unversioned.Time)
 	}
 	out.ContainerID = in.ContainerID
 	return nil
@@ -618,7 +603,7 @@ func DeepCopy_api_DaemonEndpoint(in DaemonEndpoint, out *DaemonEndpoint, c *conv
 }
 
 func DeepCopy_api_DeleteOptions(in DeleteOptions, out *DeleteOptions, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if in.GracePeriodSeconds != nil {
@@ -718,7 +703,7 @@ func DeepCopy_api_EndpointSubset(in EndpointSubset, out *EndpointSubset, c *conv
 }
 
 func DeepCopy_api_Endpoints(in Endpoints, out *Endpoints, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -739,10 +724,10 @@ func DeepCopy_api_Endpoints(in Endpoints, out *Endpoints, c *conversion.Cloner)
 }
 
 func DeepCopy_api_EndpointsList(in EndpointsList, out *EndpointsList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -806,7 +791,7 @@ func DeepCopy_api_EnvVarSource(in EnvVarSource, out *EnvVarSource, c *conversion
 }
 
 func DeepCopy_api_Event(in Event, out *Event, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -820,15 +805,11 @@ func DeepCopy_api_Event(in Event, out *Event, c *conversion.Cloner) error {
 	if err := DeepCopy_api_EventSource(in.Source, &out.Source, c); err != nil {
 		return err
 	}
-	if newVal, err := c.DeepCopy(in.FirstTimestamp); err != nil {
+	if err := unversioned.DeepCopy_unversioned_Time(in.FirstTimestamp, &out.FirstTimestamp, c); err != nil {
 		return err
-	} else {
-		out.FirstTimestamp = newVal.(unversioned.Time)
 	}
-	if newVal, err := c.DeepCopy(in.LastTimestamp); err != nil {
+	if err := unversioned.DeepCopy_unversioned_Time(in.LastTimestamp, &out.LastTimestamp, c); err != nil {
 		return err
-	} else {
-		out.LastTimestamp = newVal.(unversioned.Time)
 	}
 	out.Count = in.Count
 	out.Type = in.Type
@@ -836,10 +817,10 @@ func DeepCopy_api_Event(in Event, out *Event, c *conversion.Cloner) error {
 }
 
 func DeepCopy_api_EventList(in EventList, out *EventList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -874,7 +855,7 @@ func DeepCopy_api_ExecAction(in ExecAction, out *ExecAction, c *conversion.Clone
 }
 
 func DeepCopy_api_ExportOptions(in ExportOptions, out *ExportOptions, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	out.Export = in.Export
@@ -956,7 +937,7 @@ func DeepCopy_api_GlusterfsVolumeSource(in GlusterfsVolumeSource, out *Glusterfs
 
 func DeepCopy_api_HTTPGetAction(in HTTPGetAction, out *HTTPGetAction, c *conversion.Cloner) error {
 	out.Path = in.Path
-	if err := DeepCopy_intstr_IntOrString(in.Port, &out.Port, c); err != nil {
+	if err := intstr.DeepCopy_intstr_IntOrString(in.Port, &out.Port, c); err != nil {
 		return err
 	}
 	out.Host = in.Host
@@ -1056,7 +1037,7 @@ func DeepCopy_api_Lifecycle(in Lifecycle, out *Lifecycle, c *conversion.Cloner)
 }
 
 func DeepCopy_api_LimitRange(in LimitRange, out *LimitRange, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -1074,11 +1055,11 @@ func DeepCopy_api_LimitRangeItem(in LimitRangeItem, out *LimitRangeItem, c *conv
 		in, out := in.Max, &out.Max
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Max = nil
@@ -1087,11 +1068,11 @@ func DeepCopy_api_LimitRangeItem(in LimitRangeItem, out *LimitRangeItem, c *conv
 		in, out := in.Min, &out.Min
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Min = nil
@@ -1100,11 +1081,11 @@ func DeepCopy_api_LimitRangeItem(in LimitRangeItem, out *LimitRangeItem, c *conv
 		in, out := in.Default, &out.Default
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Default = nil
@@ -1113,11 +1094,11 @@ func DeepCopy_api_LimitRangeItem(in LimitRangeItem, out *LimitRangeItem, c *conv
 		in, out := in.DefaultRequest, &out.DefaultRequest
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.DefaultRequest = nil
@@ -1126,11 +1107,11 @@ func DeepCopy_api_LimitRangeItem(in LimitRangeItem, out *LimitRangeItem, c *conv
 		in, out := in.MaxLimitRequestRatio, &out.MaxLimitRequestRatio
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.MaxLimitRequestRatio = nil
@@ -1139,10 +1120,10 @@ func DeepCopy_api_LimitRangeItem(in LimitRangeItem, out *LimitRangeItem, c *conv
 }
 
 func DeepCopy_api_LimitRangeList(in LimitRangeList, out *LimitRangeList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -1175,10 +1156,10 @@ func DeepCopy_api_LimitRangeSpec(in LimitRangeSpec, out *LimitRangeSpec, c *conv
 }
 
 func DeepCopy_api_List(in List, out *List, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -1198,7 +1179,7 @@ func DeepCopy_api_List(in List, out *List, c *conversion.Cloner) error {
 }
 
 func DeepCopy_api_ListOptions(in ListOptions, out *ListOptions, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if newVal, err := c.DeepCopy(in.LabelSelector); err != nil {
@@ -1257,7 +1238,7 @@ func DeepCopy_api_NFSVolumeSource(in NFSVolumeSource, out *NFSVolumeSource, c *c
 }
 
 func DeepCopy_api_Namespace(in Namespace, out *Namespace, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -1273,10 +1254,10 @@ func DeepCopy_api_Namespace(in Namespace, out *Namespace, c *conversion.Cloner)
 }
 
 func DeepCopy_api_NamespaceList(in NamespaceList, out *NamespaceList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -1312,7 +1293,7 @@ func DeepCopy_api_NamespaceStatus(in NamespaceStatus, out *NamespaceStatus, c *c
 }
 
 func DeepCopy_api_Node(in Node, out *Node, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -1360,15 +1341,11 @@ func DeepCopy_api_NodeAffinity(in NodeAffinity, out *NodeAffinity, c *conversion
 func DeepCopy_api_NodeCondition(in NodeCondition, out *NodeCondition, c *conversion.Cloner) error {
 	out.Type = in.Type
 	out.Status = in.Status
-	if newVal, err := c.DeepCopy(in.LastHeartbeatTime); err != nil {
+	if err := unversioned.DeepCopy_unversioned_Time(in.LastHeartbeatTime, &out.LastHeartbeatTime, c); err != nil {
 		return err
-	} else {
-		out.LastHeartbeatTime = newVal.(unversioned.Time)
 	}
-	if newVal, err := c.DeepCopy(in.LastTransitionTime); err != nil {
+	if err := unversioned.DeepCopy_unversioned_Time(in.LastTransitionTime, &out.LastTransitionTime, c); err != nil {
 		return err
-	} else {
-		out.LastTransitionTime = newVal.(unversioned.Time)
 	}
 	out.Reason = in.Reason
 	out.Message = in.Message
@@ -1383,10 +1360,10 @@ func DeepCopy_api_NodeDaemonEndpoints(in NodeDaemonEndpoints, out *NodeDaemonEnd
 }
 
 func DeepCopy_api_NodeList(in NodeList, out *NodeList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -1404,7 +1381,7 @@ func DeepCopy_api_NodeList(in NodeList, out *NodeList, c *conversion.Cloner) err
 }
 
 func DeepCopy_api_NodeProxyOptions(in NodeProxyOptions, out *NodeProxyOptions, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	out.Path = in.Path
@@ -1416,11 +1393,11 @@ func DeepCopy_api_NodeResources(in NodeResources, out *NodeResources, c *convers
 		in, out := in.Capacity, &out.Capacity
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Capacity = nil
@@ -1484,11 +1461,11 @@ func DeepCopy_api_NodeStatus(in NodeStatus, out *NodeStatus, c *conversion.Clone
 		in, out := in.Capacity, &out.Capacity
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Capacity = nil
@@ -1497,11 +1474,11 @@ func DeepCopy_api_NodeStatus(in NodeStatus, out *NodeStatus, c *conversion.Clone
 		in, out := in.Allocatable, &out.Allocatable
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Allocatable = nil
@@ -1575,18 +1552,14 @@ func DeepCopy_api_ObjectMeta(in ObjectMeta, out *ObjectMeta, c *conversion.Clone
 	out.UID = in.UID
 	out.ResourceVersion = in.ResourceVersion
 	out.Generation = in.Generation
-	if newVal, err := c.DeepCopy(in.CreationTimestamp); err != nil {
+	if err := unversioned.DeepCopy_unversioned_Time(in.CreationTimestamp, &out.CreationTimestamp, c); err != nil {
 		return err
-	} else {
-		out.CreationTimestamp = newVal.(unversioned.Time)
 	}
 	if in.DeletionTimestamp != nil {
 		in, out := in.DeletionTimestamp, &out.DeletionTimestamp
 		*out = new(unversioned.Time)
-		if newVal, err := c.DeepCopy(*in); err != nil {
+		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
 			return err
-		} else {
-			**out = newVal.(unversioned.Time)
 		}
 	} else {
 		out.DeletionTimestamp = nil
@@ -1631,7 +1604,7 @@ func DeepCopy_api_ObjectReference(in ObjectReference, out *ObjectReference, c *c
 }
 
 func DeepCopy_api_PersistentVolume(in PersistentVolume, out *PersistentVolume, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -1647,7 +1620,7 @@ func DeepCopy_api_PersistentVolume(in PersistentVolume, out *PersistentVolume, c
 }
 
 func DeepCopy_api_PersistentVolumeClaim(in PersistentVolumeClaim, out *PersistentVolumeClaim, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -1663,10 +1636,10 @@ func DeepCopy_api_PersistentVolumeClaim(in PersistentVolumeClaim, out *Persisten
 }
 
 func DeepCopy_api_PersistentVolumeClaimList(in PersistentVolumeClaimList, out *PersistentVolumeClaimList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -1715,11 +1688,11 @@ func DeepCopy_api_PersistentVolumeClaimStatus(in PersistentVolumeClaimStatus, ou
 		in, out := in.Capacity, &out.Capacity
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Capacity = nil
@@ -1734,10 +1707,10 @@ func DeepCopy_api_PersistentVolumeClaimVolumeSource(in PersistentVolumeClaimVolu
 }
 
 func DeepCopy_api_PersistentVolumeList(in PersistentVolumeList, out *PersistentVolumeList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -1880,11 +1853,11 @@ func DeepCopy_api_PersistentVolumeSpec(in PersistentVolumeSpec, out *PersistentV
 		in, out := in.Capacity, &out.Capacity
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Capacity = nil
@@ -1922,7 +1895,7 @@ func DeepCopy_api_PersistentVolumeStatus(in PersistentVolumeStatus, out *Persist
 }
 
 func DeepCopy_api_Pod(in Pod, out *Pod, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -1938,7 +1911,7 @@ func DeepCopy_api_Pod(in Pod, out *Pod, c *conversion.Cloner) error {
 }
 
 func DeepCopy_api_PodAttachOptions(in PodAttachOptions, out *PodAttachOptions, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	out.Stdin = in.Stdin
@@ -1952,15 +1925,11 @@ func DeepCopy_api_PodAttachOptions(in PodAttachOptions, out *PodAttachOptions, c
 func DeepCopy_api_PodCondition(in PodCondition, out *PodCondition, c *conversion.Cloner) error {
 	out.Type = in.Type
 	out.Status = in.Status
-	if newVal, err := c.DeepCopy(in.LastProbeTime); err != nil {
+	if err := unversioned.DeepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil {
 		return err
-	} else {
-		out.LastProbeTime = newVal.(unversioned.Time)
 	}
-	if newVal, err := c.DeepCopy(in.LastTransitionTime); err != nil {
+	if err := unversioned.DeepCopy_unversioned_Time(in.LastTransitionTime, &out.LastTransitionTime, c); err != nil {
 		return err
-	} else {
-		out.LastTransitionTime = newVal.(unversioned.Time)
 	}
 	out.Reason = in.Reason
 	out.Message = in.Message
@@ -1968,7 +1937,7 @@ func DeepCopy_api_PodCondition(in PodCondition, out *PodCondition, c *conversion
 }
 
 func DeepCopy_api_PodExecOptions(in PodExecOptions, out *PodExecOptions, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	out.Stdin = in.Stdin
@@ -1987,10 +1956,10 @@ func DeepCopy_api_PodExecOptions(in PodExecOptions, out *PodExecOptions, c *conv
 }
 
 func DeepCopy_api_PodList(in PodList, out *PodList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -2008,7 +1977,7 @@ func DeepCopy_api_PodList(in PodList, out *PodList, c *conversion.Cloner) error
 }
 
 func DeepCopy_api_PodLogOptions(in PodLogOptions, out *PodLogOptions, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	out.Container = in.Container
@@ -2024,10 +1993,8 @@ func DeepCopy_api_PodLogOptions(in PodLogOptions, out *PodLogOptions, c *convers
 	if in.SinceTime != nil {
 		in, out := in.SinceTime, &out.SinceTime
 		*out = new(unversioned.Time)
-		if newVal, err := c.DeepCopy(*in); err != nil {
+		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
 			return err
-		} else {
-			**out = newVal.(unversioned.Time)
 		}
 	} else {
 		out.SinceTime = nil
@@ -2051,7 +2018,7 @@ func DeepCopy_api_PodLogOptions(in PodLogOptions, out *PodLogOptions, c *convers
 }
 
 func DeepCopy_api_PodProxyOptions(in PodProxyOptions, out *PodProxyOptions, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	out.Path = in.Path
@@ -2195,10 +2162,8 @@ func DeepCopy_api_PodStatus(in PodStatus, out *PodStatus, c *conversion.Cloner)
 	if in.StartTime != nil {
 		in, out := in.StartTime, &out.StartTime
 		*out = new(unversioned.Time)
-		if newVal, err := c.DeepCopy(*in); err != nil {
+		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
 			return err
-		} else {
-			**out = newVal.(unversioned.Time)
 		}
 	} else {
 		out.StartTime = nil
@@ -2218,7 +2183,7 @@ func DeepCopy_api_PodStatus(in PodStatus, out *PodStatus, c *conversion.Cloner)
 }
 
 func DeepCopy_api_PodStatusResult(in PodStatusResult, out *PodStatusResult, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -2231,7 +2196,7 @@ func DeepCopy_api_PodStatusResult(in PodStatusResult, out *PodStatusResult, c *c
 }
 
 func DeepCopy_api_PodTemplate(in PodTemplate, out *PodTemplate, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -2244,10 +2209,10 @@ func DeepCopy_api_PodTemplate(in PodTemplate, out *PodTemplate, c *conversion.Cl
 }
 
 func DeepCopy_api_PodTemplateList(in PodTemplateList, out *PodTemplateList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -2321,7 +2286,7 @@ func DeepCopy_api_RBDVolumeSource(in RBDVolumeSource, out *RBDVolumeSource, c *c
 }
 
 func DeepCopy_api_RangeAllocation(in RangeAllocation, out *RangeAllocation, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -2339,7 +2304,7 @@ func DeepCopy_api_RangeAllocation(in RangeAllocation, out *RangeAllocation, c *c
 }
 
 func DeepCopy_api_ReplicationController(in ReplicationController, out *ReplicationController, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -2355,10 +2320,10 @@ func DeepCopy_api_ReplicationController(in ReplicationController, out *Replicati
 }
 
 func DeepCopy_api_ReplicationControllerList(in ReplicationControllerList, out *ReplicationControllerList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -2406,7 +2371,7 @@ func DeepCopy_api_ReplicationControllerStatus(in ReplicationControllerStatus, ou
 }
 
 func DeepCopy_api_ResourceQuota(in ResourceQuota, out *ResourceQuota, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -2422,10 +2387,10 @@ func DeepCopy_api_ResourceQuota(in ResourceQuota, out *ResourceQuota, c *convers
 }
 
 func DeepCopy_api_ResourceQuotaList(in ResourceQuotaList, out *ResourceQuotaList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -2447,11 +2412,11 @@ func DeepCopy_api_ResourceQuotaSpec(in ResourceQuotaSpec, out *ResourceQuotaSpec
 		in, out := in.Hard, &out.Hard
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Hard = nil
@@ -2473,11 +2438,11 @@ func DeepCopy_api_ResourceQuotaStatus(in ResourceQuotaStatus, out *ResourceQuota
 		in, out := in.Hard, &out.Hard
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Hard = nil
@@ -2486,11 +2451,11 @@ func DeepCopy_api_ResourceQuotaStatus(in ResourceQuotaStatus, out *ResourceQuota
 		in, out := in.Used, &out.Used
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Used = nil
@@ -2503,11 +2468,11 @@ func DeepCopy_api_ResourceRequirements(in ResourceRequirements, out *ResourceReq
 		in, out := in.Limits, &out.Limits
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Limits = nil
@@ -2516,11 +2481,11 @@ func DeepCopy_api_ResourceRequirements(in ResourceRequirements, out *ResourceReq
 		in, out := in.Requests, &out.Requests
 		*out = make(ResourceList)
 		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
+			newVal := new(resource.Quantity)
+			if err := resource.DeepCopy_resource_Quantity(val, newVal, c); err != nil {
 				return err
-			} else {
-				(*out)[key] = newVal.(resource.Quantity)
 			}
+			(*out)[key] = *newVal
 		}
 	} else {
 		out.Requests = nil
@@ -2537,7 +2502,7 @@ func DeepCopy_api_SELinuxOptions(in SELinuxOptions, out *SELinuxOptions, c *conv
 }
 
 func DeepCopy_api_Secret(in Secret, out *Secret, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -2569,10 +2534,10 @@ func DeepCopy_api_SecretKeySelector(in SecretKeySelector, out *SecretKeySelector
 }
 
 func DeepCopy_api_SecretList(in SecretList, out *SecretList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -2645,7 +2610,7 @@ func DeepCopy_api_SecurityContext(in SecurityContext, out *SecurityContext, c *c
 }
 
 func DeepCopy_api_SerializedReference(in SerializedReference, out *SerializedReference, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectReference(in.Reference, &out.Reference, c); err != nil {
@@ -2655,7 +2620,7 @@ func DeepCopy_api_SerializedReference(in SerializedReference, out *SerializedRef
 }
 
 func DeepCopy_api_Service(in Service, out *Service, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -2671,7 +2636,7 @@ func DeepCopy_api_Service(in Service, out *Service, c *conversion.Cloner) error
 }
 
 func DeepCopy_api_ServiceAccount(in ServiceAccount, out *ServiceAccount, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	if err := DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
@@ -2703,10 +2668,10 @@ func DeepCopy_api_ServiceAccount(in ServiceAccount, out *ServiceAccount, c *conv
 }
 
 func DeepCopy_api_ServiceAccountList(in ServiceAccountList, out *ServiceAccountList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -2724,10 +2689,10 @@ func DeepCopy_api_ServiceAccountList(in ServiceAccountList, out *ServiceAccountL
 }
 
 func DeepCopy_api_ServiceList(in ServiceList, out *ServiceList, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
-	if err := DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
 		return err
 	}
 	if in.Items != nil {
@@ -2748,7 +2713,7 @@ func DeepCopy_api_ServicePort(in ServicePort, out *ServicePort, c *conversion.Cl
 	out.Name = in.Name
 	out.Protocol = in.Protocol
 	out.Port = in.Port
-	if err := DeepCopy_intstr_IntOrString(in.TargetPort, &out.TargetPort, c); err != nil {
+	if err := intstr.DeepCopy_intstr_IntOrString(in.TargetPort, &out.TargetPort, c); err != nil {
 		return err
 	}
 	out.NodePort = in.NodePort
@@ -2756,7 +2721,7 @@ func DeepCopy_api_ServicePort(in ServicePort, out *ServicePort, c *conversion.Cl
 }
 
 func DeepCopy_api_ServiceProxyOptions(in ServiceProxyOptions, out *ServiceProxyOptions, c *conversion.Cloner) error {
-	if err := DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
 		return err
 	}
 	out.Path = in.Path
@@ -2806,7 +2771,7 @@ func DeepCopy_api_ServiceStatus(in ServiceStatus, out *ServiceStatus, c *convers
 }
 
 func DeepCopy_api_TCPSocketAction(in TCPSocketAction, out *TCPSocketAction, c *conversion.Cloner) error {
-	if err := DeepCopy_intstr_IntOrString(in.Port, &out.Port, c); err != nil {
+	if err := intstr.DeepCopy_intstr_IntOrString(in.Port, &out.Port, c); err != nil {
 		return err
 	}
 	return nil
@@ -3001,69 +2966,3 @@ func DeepCopy_api_VolumeSource(in VolumeSource, out *VolumeSource, c *conversion
 	}
 	return nil
 }
-
-func DeepCopy_conversion_Meta(in conversion.Meta, out *conversion.Meta, c *conversion.Cloner) error {
-	out.SrcVersion = in.SrcVersion
-	out.DestVersion = in.DestVersion
-	if newVal, err := c.DeepCopy(in.KeyNameMapping); err != nil {
-		return err
-	} else {
-		out.KeyNameMapping = newVal.(conversion.FieldMappingFunc)
-	}
-	return nil
-}
-
-func DeepCopy_intstr_IntOrString(in intstr.IntOrString, out *intstr.IntOrString, c *conversion.Cloner) error {
-	out.Type = in.Type
-	out.IntVal = in.IntVal
-	out.StrVal = in.StrVal
-	return nil
-}
-
-func DeepCopy_sets_Empty(in sets.Empty, out *sets.Empty, c *conversion.Cloner) error {
-	return nil
-}
-
-func DeepCopy_unversioned_GroupKind(in unversioned.GroupKind, out *unversioned.GroupKind, c *conversion.Cloner) error {
-	out.Group = in.Group
-	out.Kind = in.Kind
-	return nil
-}
-
-func DeepCopy_unversioned_GroupResource(in unversioned.GroupResource, out *unversioned.GroupResource, c *conversion.Cloner) error {
-	out.Group = in.Group
-	out.Resource = in.Resource
-	return nil
-}
-
-func DeepCopy_unversioned_GroupVersion(in unversioned.GroupVersion, out *unversioned.GroupVersion, c *conversion.Cloner) error {
-	out.Group = in.Group
-	out.Version = in.Version
-	return nil
-}
-
-func DeepCopy_unversioned_GroupVersionKind(in unversioned.GroupVersionKind, out *unversioned.GroupVersionKind, c *conversion.Cloner) error {
-	out.Group = in.Group
-	out.Version = in.Version
-	out.Kind = in.Kind
-	return nil
-}
-
-func DeepCopy_unversioned_GroupVersionResource(in unversioned.GroupVersionResource, out *unversioned.GroupVersionResource, c *conversion.Cloner) error {
-	out.Group = in.Group
-	out.Version = in.Version
-	out.Resource = in.Resource
-	return nil
-}
-
-func DeepCopy_unversioned_ListMeta(in unversioned.ListMeta, out *unversioned.ListMeta, c *conversion.Cloner) error {
-	out.SelfLink = in.SelfLink
-	out.ResourceVersion = in.ResourceVersion
-	return nil
-}
-
-func DeepCopy_unversioned_TypeMeta(in unversioned.TypeMeta, out *unversioned.TypeMeta, c *conversion.Cloner) error {
-	out.Kind = in.Kind
-	out.APIVersion = in.APIVersion
-	return nil
-}
diff --git a/pkg/api/meta/deep_copy_generated.go b/pkg/api/meta/deep_copy_generated.go
new file mode 100644
index 00000000000..1910713a63b
--- /dev/null
+++ b/pkg/api/meta/deep_copy_generated.go
@@ -0,0 +1,142 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package meta
+
+import (
+	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
+	conversion "k8s.io/kubernetes/pkg/conversion"
+	runtime "k8s.io/kubernetes/pkg/runtime"
+)
+
+func DeepCopy_meta_DefaultRESTMapper(in DefaultRESTMapper, out *DefaultRESTMapper, c *conversion.Cloner) error {
+	if in.defaultGroupVersions != nil {
+		in, out := in.defaultGroupVersions, &out.defaultGroupVersions
+		*out = make([]unversioned.GroupVersion, len(in))
+		for i := range in {
+			if err := unversioned.DeepCopy_unversioned_GroupVersion(in[i], &(*out)[i], c); err != nil {
+				return err
+			}
+		}
+	} else {
+		out.defaultGroupVersions = nil
+	}
+	if in.resourceToKind != nil {
+		in, out := in.resourceToKind, &out.resourceToKind
+		*out = make(map[unversioned.GroupVersionResource]unversioned.GroupVersionKind)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionResource
+		}
+	} else {
+		out.resourceToKind = nil
+	}
+	if in.kindToPluralResource != nil {
+		in, out := in.kindToPluralResource, &out.kindToPluralResource
+		*out = make(map[unversioned.GroupVersionKind]unversioned.GroupVersionResource)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionKind
+		}
+	} else {
+		out.kindToPluralResource = nil
+	}
+	if in.kindToScope != nil {
+		in, out := in.kindToScope, &out.kindToScope
+		*out = make(map[unversioned.GroupVersionKind]RESTScope)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionKind
+		}
+	} else {
+		out.kindToScope = nil
+	}
+	if in.singularToPlural != nil {
+		in, out := in.singularToPlural, &out.singularToPlural
+		*out = make(map[unversioned.GroupVersionResource]unversioned.GroupVersionResource)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionResource
+		}
+	} else {
+		out.singularToPlural = nil
+	}
+	if in.pluralToSingular != nil {
+		in, out := in.pluralToSingular, &out.pluralToSingular
+		*out = make(map[unversioned.GroupVersionResource]unversioned.GroupVersionResource)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionResource
+		}
+	} else {
+		out.pluralToSingular = nil
+	}
+	if newVal, err := c.DeepCopy(in.interfacesFunc); err != nil {
+		return err
+	} else {
+		out.interfacesFunc = newVal.(VersionInterfacesFunc)
+	}
+	if in.aliasToResource != nil {
+		in, out := in.aliasToResource, &out.aliasToResource
+		*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.aliasToResource = nil
+	}
+	return nil
+}
+
+func DeepCopy_meta_RESTMapping(in RESTMapping, out *RESTMapping, c *conversion.Cloner) error {
+	out.Resource = in.Resource
+	if err := unversioned.DeepCopy_unversioned_GroupVersionKind(in.GroupVersionKind, &out.GroupVersionKind, c); err != nil {
+		return err
+	}
+	if newVal, err := c.DeepCopy(in.Scope); err != nil {
+		return err
+	} else {
+		out.Scope = newVal.(RESTScope)
+	}
+	if newVal, err := c.DeepCopy(in.ObjectConvertor); err != nil {
+		return err
+	} else {
+		out.ObjectConvertor = newVal.(runtime.ObjectConvertor)
+	}
+	if newVal, err := c.DeepCopy(in.MetadataAccessor); err != nil {
+		return err
+	} else {
+		out.MetadataAccessor = newVal.(MetadataAccessor)
+	}
+	return nil
+}
+
+func DeepCopy_meta_VersionInterfaces(in VersionInterfaces, out *VersionInterfaces, c *conversion.Cloner) error {
+	if newVal, err := c.DeepCopy(in.ObjectConvertor); err != nil {
+		return err
+	} else {
+		out.ObjectConvertor = newVal.(runtime.ObjectConvertor)
+	}
+	if newVal, err := c.DeepCopy(in.MetadataAccessor); err != nil {
+		return err
+	} else {
+		out.MetadataAccessor = newVal.(MetadataAccessor)
+	}
+	return nil
+}
diff --git a/pkg/api/resource/deep_copy_generated.go b/pkg/api/resource/deep_copy_generated.go
new file mode 100644
index 00000000000..af6e3194d29
--- /dev/null
+++ b/pkg/api/resource/deep_copy_generated.go
@@ -0,0 +1,42 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package resource
+
+import (
+	conversion "k8s.io/kubernetes/pkg/conversion"
+	inf "speter.net/go/exp/math/dec/inf"
+)
+
+func DeepCopy_resource_Quantity(in Quantity, out *Quantity, c *conversion.Cloner) error {
+	if in.Amount != nil {
+		in, out := in.Amount, &out.Amount
+		*out = new(inf.Dec)
+		if newVal, err := c.DeepCopy(*in); err != nil {
+			return err
+		} else {
+			**out = newVal.(inf.Dec)
+		}
+	} else {
+		out.Amount = nil
+	}
+	out.Format = in.Format
+	return nil
+}
diff --git a/pkg/api/unversioned/deep_copy_generated.go b/pkg/api/unversioned/deep_copy_generated.go
new file mode 100644
index 00000000000..3344a9d9569
--- /dev/null
+++ b/pkg/api/unversioned/deep_copy_generated.go
@@ -0,0 +1,79 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package unversioned
+
+import (
+	conversion "k8s.io/kubernetes/pkg/conversion"
+	time "time"
+)
+
+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_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_ListMeta(in ListMeta, out *ListMeta, c *conversion.Cloner) error {
+	out.SelfLink = in.SelfLink
+	out.ResourceVersion = in.ResourceVersion
+	return nil
+}
+
+func DeepCopy_unversioned_Time(in Time, out *Time, c *conversion.Cloner) error {
+	if newVal, err := c.DeepCopy(in.Time); err != nil {
+		return err
+	} else {
+		out.Time = newVal.(time.Time)
+	}
+	return nil
+}
+
+func DeepCopy_unversioned_TypeMeta(in TypeMeta, out *TypeMeta, c *conversion.Cloner) error {
+	out.Kind = in.Kind
+	out.APIVersion = in.APIVersion
+	return nil
+}
diff --git a/pkg/conversion/deep_copy_generated.go b/pkg/conversion/deep_copy_generated.go
new file mode 100644
index 00000000000..59a6b98c0e0
--- /dev/null
+++ b/pkg/conversion/deep_copy_generated.go
@@ -0,0 +1,168 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package conversion
+
+import (
+	forked_reflect "k8s.io/kubernetes/third_party/forked/reflect"
+	reflect "reflect"
+)
+
+func DeepCopy_conversion_Cloner(in Cloner, out *Cloner, c *Cloner) error {
+	if in.deepCopyFuncs != nil {
+		in, out := in.deepCopyFuncs, &out.deepCopyFuncs
+		*out = make(map[reflect.Type]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.deepCopyFuncs = nil
+	}
+	if in.generatedDeepCopyFuncs != nil {
+		in, out := in.generatedDeepCopyFuncs, &out.generatedDeepCopyFuncs
+		*out = make(map[reflect.Type]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.generatedDeepCopyFuncs = nil
+	}
+	return nil
+}
+
+func DeepCopy_conversion_ConversionFuncs(in ConversionFuncs, out *ConversionFuncs, c *Cloner) error {
+	if in.fns != nil {
+		in, out := in.fns, &out.fns
+		*out = make(map[typePair]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typePair
+		}
+	} else {
+		out.fns = nil
+	}
+	return nil
+}
+
+func DeepCopy_conversion_Converter(in Converter, out *Converter, c *Cloner) error {
+	if err := DeepCopy_conversion_ConversionFuncs(in.conversionFuncs, &out.conversionFuncs, c); err != nil {
+		return err
+	}
+	if err := DeepCopy_conversion_ConversionFuncs(in.generatedConversionFuncs, &out.generatedConversionFuncs, c); err != nil {
+		return err
+	}
+	if in.ignoredConversions != nil {
+		in, out := in.ignoredConversions, &out.ignoredConversions
+		*out = make(map[typePair]struct{})
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typePair
+		}
+	} else {
+		out.ignoredConversions = nil
+	}
+	if in.structFieldDests != nil {
+		in, out := in.structFieldDests, &out.structFieldDests
+		*out = make(map[typeNamePair][]typeNamePair)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typeNamePair
+		}
+	} else {
+		out.structFieldDests = nil
+	}
+	if in.structFieldSources != nil {
+		in, out := in.structFieldSources, &out.structFieldSources
+		*out = make(map[typeNamePair][]typeNamePair)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typeNamePair
+		}
+	} else {
+		out.structFieldSources = nil
+	}
+	if in.defaultingFuncs != nil {
+		in, out := in.defaultingFuncs, &out.defaultingFuncs
+		*out = make(map[reflect.Type]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.defaultingFuncs = nil
+	}
+	if in.defaultingInterfaces != nil {
+		in, out := in.defaultingInterfaces, &out.defaultingInterfaces
+		*out = make(map[reflect.Type]interface{})
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.defaultingInterfaces = nil
+	}
+	if in.inputFieldMappingFuncs != nil {
+		in, out := in.inputFieldMappingFuncs, &out.inputFieldMappingFuncs
+		*out = make(map[reflect.Type]FieldMappingFunc)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.inputFieldMappingFuncs = nil
+	}
+	if in.inputDefaultFlags != nil {
+		in, out := in.inputDefaultFlags, &out.inputDefaultFlags
+		*out = make(map[reflect.Type]FieldMatchingFlags)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.inputDefaultFlags = nil
+	}
+	if newVal, err := c.DeepCopy(in.Debug); err != nil {
+		return err
+	} else {
+		out.Debug = newVal.(DebugLogger)
+	}
+	if newVal, err := c.DeepCopy(in.nameFunc); err != nil {
+		return err
+	} else {
+		out.nameFunc = newVal.(func(reflect.Type) string)
+	}
+	return nil
+}
+
+func DeepCopy_conversion_Equalities(in Equalities, out *Equalities, c *Cloner) error {
+	if in.Equalities != nil {
+		in, out := in.Equalities, &out.Equalities
+		*out = make(forked_reflect.Equalities)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.Equalities = nil
+	}
+	return nil
+}
+
+func DeepCopy_conversion_Meta(in Meta, out *Meta, c *Cloner) error {
+	out.SrcVersion = in.SrcVersion
+	out.DestVersion = in.DestVersion
+	if newVal, err := c.DeepCopy(in.KeyNameMapping); err != nil {
+		return err
+	} else {
+		out.KeyNameMapping = newVal.(FieldMappingFunc)
+	}
+	return nil
+}
diff --git a/pkg/labels/deep_copy_generated.go b/pkg/labels/deep_copy_generated.go
new file mode 100644
index 00000000000..e48099d2df4
--- /dev/null
+++ b/pkg/labels/deep_copy_generated.go
@@ -0,0 +1,45 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package labels
+
+import (
+	conversion "k8s.io/kubernetes/pkg/conversion"
+	sets "k8s.io/kubernetes/pkg/util/sets"
+)
+
+func DeepCopy_labels_Requirement(in Requirement, out *Requirement, c *conversion.Cloner) error {
+	out.key = in.key
+	out.operator = in.operator
+	if in.strValues != nil {
+		in, out := in.strValues, &out.strValues
+		*out = make(sets.String)
+		for key, val := range in {
+			newVal := new(sets.Empty)
+			if err := sets.DeepCopy_sets_Empty(val, newVal, c); err != nil {
+				return err
+			}
+			(*out)[key] = *newVal
+		}
+	} else {
+		out.strValues = nil
+	}
+	return nil
+}
diff --git a/pkg/runtime/deep_copy_generated.go b/pkg/runtime/deep_copy_generated.go
new file mode 100644
index 00000000000..5a735e7a862
--- /dev/null
+++ b/pkg/runtime/deep_copy_generated.go
@@ -0,0 +1,102 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package runtime
+
+import (
+	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
+	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
+)
+
+func DeepCopy_runtime_Scheme(in Scheme, out *Scheme, c *conversion.Cloner) error {
+	if in.gvkToType != nil {
+		in, out := in.gvkToType, &out.gvkToType
+		*out = make(map[unversioned.GroupVersionKind]reflect.Type)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionKind
+		}
+	} else {
+		out.gvkToType = nil
+	}
+	if in.typeToGVK != nil {
+		in, out := in.typeToGVK, &out.typeToGVK
+		*out = make(map[reflect.Type][]unversioned.GroupVersionKind)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.typeToGVK = nil
+	}
+	if in.unversionedTypes != nil {
+		in, out := in.unversionedTypes, &out.unversionedTypes
+		*out = make(map[reflect.Type]unversioned.GroupVersionKind)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.unversionedTypes = nil
+	}
+	if in.unversionedKinds != nil {
+		in, out := in.unversionedKinds, &out.unversionedKinds
+		*out = make(map[string]reflect.Type)
+		for key, val := range in {
+			if newVal, err := c.DeepCopy(val); err != nil {
+				return err
+			} else {
+				(*out)[key] = newVal.(reflect.Type)
+			}
+		}
+	} else {
+		out.unversionedKinds = nil
+	}
+	if in.fieldLabelConversionFuncs != nil {
+		in, out := in.fieldLabelConversionFuncs, &out.fieldLabelConversionFuncs
+		*out = make(map[string]map[string]FieldLabelConversionFunc)
+		for key, val := range in {
+			if newVal, err := c.DeepCopy(val); err != nil {
+				return err
+			} else {
+				(*out)[key] = newVal.(map[string]FieldLabelConversionFunc)
+			}
+		}
+	} else {
+		out.fieldLabelConversionFuncs = nil
+	}
+	if in.converter != nil {
+		in, out := in.converter, &out.converter
+		*out = new(conversion.Converter)
+		if err := conversion.DeepCopy_conversion_Converter(*in, *out, c); err != nil {
+			return err
+		}
+	} else {
+		out.converter = nil
+	}
+	if in.cloner != nil {
+		in, out := in.cloner, &out.cloner
+		*out = new(conversion.Cloner)
+		if err := conversion.DeepCopy_conversion_Cloner(*in, *out, c); err != nil {
+			return err
+		}
+	} else {
+		out.cloner = nil
+	}
+	return nil
+}
diff --git a/pkg/runtime/serializer/deep_copy_generated.go b/pkg/runtime/serializer/deep_copy_generated.go
new file mode 100644
index 00000000000..bf9676a688d
--- /dev/null
+++ b/pkg/runtime/serializer/deep_copy_generated.go
@@ -0,0 +1,69 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package serializer
+
+import (
+	conversion "k8s.io/kubernetes/pkg/conversion"
+	runtime "k8s.io/kubernetes/pkg/runtime"
+)
+
+func DeepCopy_serializer_CodecFactory(in CodecFactory, out *CodecFactory, c *conversion.Cloner) error {
+	if in.scheme != nil {
+		in, out := in.scheme, &out.scheme
+		*out = new(runtime.Scheme)
+		if err := runtime.DeepCopy_runtime_Scheme(*in, *out, c); err != nil {
+			return err
+		}
+	} else {
+		out.scheme = nil
+	}
+	if in.serializers != nil {
+		in, out := in.serializers, &out.serializers
+		*out = make([]serializerType, len(in))
+		for i := range in {
+			if newVal, err := c.DeepCopy(in[i]); err != nil {
+				return err
+			} else {
+				(*out)[i] = newVal.(serializerType)
+			}
+		}
+	} else {
+		out.serializers = nil
+	}
+	if newVal, err := c.DeepCopy(in.universal); err != nil {
+		return err
+	} else {
+		out.universal = newVal.(runtime.Decoder)
+	}
+	if in.accepts != nil {
+		in, out := in.accepts, &out.accepts
+		*out = make([]string, len(in))
+		copy(*out, in)
+	} else {
+		out.accepts = nil
+	}
+	if newVal, err := c.DeepCopy(in.legacySerializer); err != nil {
+		return err
+	} else {
+		out.legacySerializer = newVal.(runtime.Serializer)
+	}
+	return nil
+}
diff --git a/pkg/util/intstr/deep_copy_generated.go b/pkg/util/intstr/deep_copy_generated.go
new file mode 100644
index 00000000000..29aef022349
--- /dev/null
+++ b/pkg/util/intstr/deep_copy_generated.go
@@ -0,0 +1,32 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package intstr
+
+import (
+	conversion "k8s.io/kubernetes/pkg/conversion"
+)
+
+func DeepCopy_intstr_IntOrString(in IntOrString, out *IntOrString, c *conversion.Cloner) error {
+	out.Type = in.Type
+	out.IntVal = in.IntVal
+	out.StrVal = in.StrVal
+	return nil
+}
diff --git a/pkg/util/sets/deep_copy_generated.go b/pkg/util/sets/deep_copy_generated.go
new file mode 100644
index 00000000000..f11c387441d
--- /dev/null
+++ b/pkg/util/sets/deep_copy_generated.go
@@ -0,0 +1,29 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package sets
+
+import (
+	conversion "k8s.io/kubernetes/pkg/conversion"
+)
+
+func DeepCopy_sets_Empty(in Empty, out *Empty, c *conversion.Cloner) error {
+	return nil
+}