Use file tags to generate conversions

This drives conversion generation from file tags like:
  // +conversion-gen=k8s.io/my/internal/version
.. rather than hardcoded lists of packages.

The only net change in generated code can be explained as correct.  Previously
it didn't know that conversion was available.

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

@@ -32,6 +32,19 @@ import (
 	"github.com/golang/glog"
 )
 
+// CustomArgs is used tby the go2idl framework to pass args specific to this
+// generator.
+type CustomArgs struct {
+	ExtraPeerDirs []string // Always consider these as last-ditch possibilities for conversions.
+}
+
+// This is the comment tag that carries parameters for conversion generation.
+const tagName = "k8s:conversion-gen"
+
+func extractTag(comments []string) []string {
+	return types.ExtractCommentTags("+", comments)[tagName]
+}
+
 // TODO: This is created only to reduce number of changes in a single PR.
 // Remove it and use PublicNamer instead.
 func conversionNamer() *namer.NameStrategy {
@@ -67,25 +80,17 @@ func DefaultNameSystem() string {
 	return "public"
 }
 
-var fallbackPackages = []string{
+func getPeerTypeFor(context *generator.Context, t *types.Type, potenialPeerPkgs []string) *types.Type {
-	"k8s.io/kubernetes/pkg/api/unversioned",
+	for _, ppp := range potenialPeerPkgs {
-	"k8s.io/kubernetes/pkg/apis/extensions",
+		p := context.Universe.Package(ppp)
-	"k8s.io/kubernetes/pkg/apis/autoscaling",
+		if p == nil {
-	"k8s.io/kubernetes/pkg/apis/batch",
+			continue
-}
+		}
-
+		if p.Has(t.Name.Name) {
-func getInternalTypeFor(context *generator.Context, t *types.Type) (*types.Type, bool) {
+			return p.Type(t.Name.Name)
-	internalPackage := filepath.Dir(t.Name.Package)
-	if !context.Universe.Package(internalPackage).Has(t.Name.Name) {
-		for _, fallbackPackage := range fallbackPackages {
-			if fallbackPackage == t.Name.Package || !context.Universe.Package(fallbackPackage).Has(t.Name.Name) {
-				continue
-			}
-			return context.Universe.Package(fallbackPackage).Type(t.Name.Name), true
 		}
-		return nil, false
 	}
-	return context.Universe.Package(internalPackage).Type(t.Name.Name), true
+	return nil
 }
 
 type conversionPair struct {
@@ -97,109 +102,103 @@ type conversionPair struct {
 // the underlying type being "Func".
 type conversionFuncMap map[conversionPair]*types.Type
 
-// Returns all manually-defined conversion functions that we are able to find.
+// Returns all manually-defined conversion functions in the package.
-func getManualConversionFunctions(context *generator.Context) conversionFuncMap {
+func getManualConversionFunctions(context *generator.Context, pkg *types.Package, manualMap conversionFuncMap) {
 	scopeName := types.Name{Package: conversionPackagePath, Name: "Scope"}
 	errorName := types.Name{Package: "", Name: "error"}
 	buffer := &bytes.Buffer{}
 	sw := generator.NewSnippetWriter(buffer, context, "$", "$")
 
-	manualMap := make(conversionFuncMap)
+	for _, f := range pkg.Functions {
-	for _, p := range context.Universe {
+		if f.Underlying == nil || f.Underlying.Kind != types.Func {
-		for _, f := range p.Functions {
+			glog.Errorf("Malformed function: %#v", f)
-			if f.Underlying == nil || f.Underlying.Kind != types.Func {
+			continue
-				glog.Errorf("Malformed function: %#v", f)
-				continue
-			}
-			if f.Underlying.Signature == nil {
-				glog.Errorf("Function without signature: %#v", f)
-				continue
-			}
-			signature := f.Underlying.Signature
-			// Check whether the function is conversion function.
-			// Note that all of them have signature:
-			// func Convert_inType_To_outType(inType, outType, conversion.Scope) error
-			if signature.Receiver != nil {
-				continue
-			}
-			if len(signature.Parameters) != 3 || signature.Parameters[2].Name != scopeName {
-				continue
-			}
-			if len(signature.Results) != 1 || signature.Results[0].Name != errorName {
-				continue
-			}
-			inType := signature.Parameters[0]
-			outType := signature.Parameters[1]
-			if inType.Kind != types.Pointer || outType.Kind != types.Pointer {
-				continue
-			}
-			// Now check if the name satisfies the convention.
-			args := argsFromType(inType.Elem, outType.Elem)
-			sw.Do("Convert_$.inType|public$_To_$.outType|public$", args)
-			if f.Name.Name == buffer.String() {
-				key := conversionPair{inType.Elem, outType.Elem}
-				if v, ok := manualMap[key]; ok && v != nil {
-					panic(fmt.Sprintf("duplicate static conversion defined: %#v", key))
-				}
-				manualMap[key] = f
-			}
-			buffer.Reset()
 		}
+		if f.Underlying.Signature == nil {
+			glog.Errorf("Function without signature: %#v", f)
+			continue
+		}
+		signature := f.Underlying.Signature
+		// Check whether the function is conversion function.
+		// Note that all of them have signature:
+		// func Convert_inType_To_outType(inType, outType, conversion.Scope) error
+		if signature.Receiver != nil {
+			continue
+		}
+		if len(signature.Parameters) != 3 || signature.Parameters[2].Name != scopeName {
+			continue
+		}
+		if len(signature.Results) != 1 || signature.Results[0].Name != errorName {
+			continue
+		}
+		inType := signature.Parameters[0]
+		outType := signature.Parameters[1]
+		if inType.Kind != types.Pointer || outType.Kind != types.Pointer {
+			continue
+		}
+		// Now check if the name satisfies the convention.
+		args := argsFromType(inType.Elem, outType.Elem)
+		sw.Do("Convert_$.inType|public$_To_$.outType|public$", args)
+		if f.Name.Name == buffer.String() {
+			key := conversionPair{inType.Elem, outType.Elem}
+			// We might scan the same package twice, and that's OK.
+			if v, ok := manualMap[key]; ok && v != nil && v.Name.Package != pkg.Path {
+				panic(fmt.Sprintf("duplicate static conversion defined: %#v", key))
+			}
+			manualMap[key] = f
+		}
+		buffer.Reset()
 	}
-	return manualMap
 }
 
 // All of the types in conversions map are of type "DeclarationOf" with
 // the underlying type being "Func".
 type defaulterFuncMap map[*types.Type]*types.Type
 
-// Returns all manually-defined defaulting functions that we are able to find.
+// Returns all manually-defined defaulting functions in the package.
-func getManualDefaultingFunctions(context *generator.Context) defaulterFuncMap {
+func getManualDefaultingFunctions(context *generator.Context, pkg *types.Package, manualMap defaulterFuncMap) {
 	buffer := &bytes.Buffer{}
 	sw := generator.NewSnippetWriter(buffer, context, "$", "$")
 
-	manualMap := make(defaulterFuncMap)
+	for _, f := range pkg.Functions {
-	for _, p := range context.Universe {
+		if f.Underlying == nil || f.Underlying.Kind != types.Func {
-		for _, f := range p.Functions {
+			glog.Errorf("Malformed function: %#v", f)
-			if f.Underlying == nil || f.Underlying.Kind != types.Func {
+			continue
-				glog.Errorf("Malformed function: %#v", f)
-				continue
-			}
-			if f.Underlying.Signature == nil {
-				glog.Errorf("Function without signature: %#v", f)
-				continue
-			}
-			signature := f.Underlying.Signature
-			// Check whether the function is conversion function.
-			// Note that all of them have signature:
-			// func Convert_inType_To_outType(inType, outType, conversion.Scope) error
-			if signature.Receiver != nil {
-				continue
-			}
-			if len(signature.Parameters) != 1 {
-				continue
-			}
-			if len(signature.Results) != 0 {
-				continue
-			}
-			inType := signature.Parameters[0]
-			if inType.Kind != types.Pointer {
-				continue
-			}
-			// Now check if the name satisfies the convention.
-			args := defaultingArgsFromType(inType.Elem)
-			sw.Do("$.inType|defaultfn$", args)
-			if f.Name.Name == buffer.String() {
-				key := inType.Elem
-				if v, ok := manualMap[key]; ok && v != nil {
-					panic(fmt.Sprintf("duplicate static defaulter defined: %#v", key))
-				}
-				manualMap[key] = f
-			}
-			buffer.Reset()
 		}
+		if f.Underlying.Signature == nil {
+			glog.Errorf("Function without signature: %#v", f)
+			continue
+		}
+		signature := f.Underlying.Signature
+		// Check whether the function is conversion function.
+		// Note that all of them have signature:
+		// func Convert_inType_To_outType(inType, outType, conversion.Scope) error
+		if signature.Receiver != nil {
+			continue
+		}
+		if len(signature.Parameters) != 1 {
+			continue
+		}
+		if len(signature.Results) != 0 {
+			continue
+		}
+		inType := signature.Parameters[0]
+		if inType.Kind != types.Pointer {
+			continue
+		}
+		// Now check if the name satisfies the convention.
+		args := defaultingArgsFromType(inType.Elem)
+		sw.Do("$.inType|defaultfn$", args)
+		if f.Name.Name == buffer.String() {
+			key := inType.Elem
+			// We might scan the same package twice, and that's OK.
+			if v, ok := manualMap[key]; ok && v != nil && v.Name.Package != pkg.Path {
+				panic(fmt.Sprintf("duplicate static defaulter defined: %#v", key))
+			}
+			manualMap[key] = f
+		}
+		buffer.Reset()
 	}
-	return manualMap
 }
 
 func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages {
@@ -208,7 +207,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 		glog.Fatalf("Failed loading boilerplate: %v", err)
 	}
 
-	inputs := sets.NewString(arguments.InputDirs...)
+	inputs := sets.NewString(context.Inputs...)
 	packages := generator.Packages{}
 	header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...)
 	header = append(header, []byte(
@@ -217,65 +216,89 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 
 `)...)
 
-	// Compute all pre-existing conversion functions.
+	// Accumulate pre-existing conversion and default functions.
-	manualConversions := getManualConversionFunctions(context)
+	// TODO: This is too ad-hoc.  We need a better way.
-	manualDefaulters := getManualDefaultingFunctions(context)
+	manualConversions := conversionFuncMap{}
+	manualDefaults := defaulterFuncMap{}
 
 	// We are generating conversions only for packages that are explicitly
-	// passed as InputDir, and only for those that have a corresponding type
+	// passed as InputDir.
-	// (in the directory one above) and can be automatically converted to.
+	for i := range inputs {
-	for _, p := range context.Universe {
+		glog.V(5).Infof("considering pkg %q", i)
-		path := p.Path
+		pkg := context.Universe[i]
-		if !inputs.Has(path) {
+		if pkg == nil {
-			continue
+			// If the input had no Go files, for example.
-		}
-		// Only generate conversions for package which explicitly requested it
-		// byt setting "+genversion=true" in their doc.go file.
-		filtered := false
-		if extractBoolTagOrDie("genconversion", false, p.DocComments) == true {
-			filtered = true
-		}
-		if !filtered {
 			continue
 		}
 
-		convertibleType := false
+		// Add conversion and defaulting functions.
-		for _, t := range p.Types {
+		getManualConversionFunctions(context, pkg, manualConversions)
-			// Check whether this type can be auto-converted to the internal
+		getManualDefaultingFunctions(context, pkg, manualDefaults)
-			// version.
+
-			internalType, exists := getInternalTypeFor(context, t)
+		// Only generate conversions for packages which explicitly request it
-			if !exists {
+		// by specifying one or more "+k8s:conversion-gen=<peer-pkg>"
-				// There is no corresponding type in the internal package.
+		// in their doc.go file.
+		peerPkgs := extractTag(pkg.Comments)
+		if peerPkgs != nil {
+			glog.V(5).Infof("  tags: %q", peerPkgs)
+		} else {
+			glog.V(5).Infof("  no tag")
+			continue
+		}
+		if customArgs, ok := arguments.CustomArgs.(*CustomArgs); ok {
+			if len(customArgs.ExtraPeerDirs) > 0 {
+				peerPkgs = append(peerPkgs, customArgs.ExtraPeerDirs...)
+			}
+		}
+		// Make sure our peer-packages are added and fully parsed.
+		for _, pp := range peerPkgs {
+			context.AddDir(pp)
+			getManualConversionFunctions(context, context.Universe[pp], manualConversions)
+			getManualDefaultingFunctions(context, context.Universe[pp], manualDefaults)
+		}
+
+		pkgNeedsGeneration := false
+		for _, t := range pkg.Types {
+			// Check whether this type can be auto-converted to the peer
+			// package type.
+			peerType := getPeerTypeFor(context, t, peerPkgs)
+			if peerType == nil {
+				// We did not find a corresponding type.
 				continue
 			}
-			// We won't be able to convert to private type.
+			if namer.IsPrivateGoName(peerType.Name.Name) {
-			if namer.IsPrivateGoName(internalType.Name.Name) {
+				// We won't be able to convert to a private type.
+				glog.V(5).Infof("  found a peer type %v, but it is a private name", t)
 				continue
 			}
+
 			// If we can generate conversion in any direction, we should
 			// generate this package.
-			if isConvertible(t, internalType, manualConversions) || isConvertible(internalType, t, manualConversions) {
+			if isConvertible(t, peerType, manualConversions) || isConvertible(peerType, t, manualConversions) {
-				convertibleType = true
+				pkgNeedsGeneration = true
+				break
 			}
 		}
-
+		if !pkgNeedsGeneration {
-		if convertibleType {
+			glog.V(5).Infof("  no viable conversions, not generating for this package")
-			packages = append(packages,
+			continue
-				&generator.DefaultPackage{
-					PackageName: filepath.Base(path),
-					PackagePath: path,
-					HeaderText:  header,
-					GeneratorFunc: func(c *generator.Context) (generators []generator.Generator) {
-						generators = []generator.Generator{}
-						generators = append(
-							generators, NewGenConversion("conversion_generated", path, manualConversions, manualDefaulters))
-						return generators
-					},
-					FilterFunc: func(c *generator.Context, t *types.Type) bool {
-						return t.Name.Package == path
-					},
-				})
 		}
+
+		packages = append(packages,
+			&generator.DefaultPackage{
+				PackageName: filepath.Base(pkg.Path),
+				PackagePath: pkg.Path,
+				HeaderText:  header,
+				GeneratorFunc: func(c *generator.Context) (generators []generator.Generator) {
+					generators = []generator.Generator{}
+					generators = append(
+						generators, NewGenConversion(arguments.OutputFileBaseName, pkg.Path, manualConversions, manualDefaults, peerPkgs))
+					return generators
+				},
+				FilterFunc: func(c *generator.Context, t *types.Type) bool {
+					return t.Name.Package == pkg.Path
+				},
+			})
 	}
 	return packages
 }
@@ -324,9 +347,6 @@ func isDirectlyConvertible(in, out *types.Type, manualConversions conversionFunc
 
 	switch in.Kind {
 	case types.Builtin:
-		if in == out {
-			return true
-		}
 		// TODO: Support more conversion types.
 		return types.IsInteger(in) && types.IsInteger(out)
 	case types.Struct:
@@ -335,11 +355,11 @@ func isDirectlyConvertible(in, out *types.Type, manualConversions conversionFunc
 			// Check if there is an out member with that name.
 			outMember, found := findMember(out, inMember.Name)
 			if !found {
-				// Check if the member doesn't have comment:
+				// Check if the member has opted out with:
-				// "+ genconversion=false"
+				//   "+k8s:conversion-gen=false"
-				// comment to ignore this field for conversion.
 				// TODO: Switch to SecondClosestCommentLines.
-				if extractBoolTagOrDie("genconversion", true, inMember.CommentLines) == false {
+				if tagvals := extractTag(inMember.CommentLines); tagvals != nil && tagvals[0] == "false" {
+					glog.V(5).Infof("field %v.%s requests no conversion generation, skipping", in, inMember.Name)
 					continue
 				}
 				return false
@@ -387,6 +407,7 @@ const (
 type genConversion struct {
 	generator.DefaultGen
 	targetPackage     string
+	peerPackages      []string
 	manualConversions conversionFuncMap
 	manualDefaulters  defaulterFuncMap
 	imports           namer.ImportTracker
@@ -395,12 +416,13 @@ type genConversion struct {
 	globalVariables map[string]interface{}
 }
 
-func NewGenConversion(sanitizedName, targetPackage string, manualConversions conversionFuncMap, manualDefaulters defaulterFuncMap) generator.Generator {
+func NewGenConversion(sanitizedName, targetPackage string, manualConversions conversionFuncMap, manualDefaulters defaulterFuncMap, peerPkgs []string) generator.Generator {
 	return &genConversion{
 		DefaultGen: generator.DefaultGen{
 			OptionalName: sanitizedName,
 		},
 		targetPackage:     targetPackage,
+		peerPackages:      peerPkgs,
 		manualConversions: manualConversions,
 		manualDefaulters:  manualDefaulters,
 		imports:           generator.NewImportTracker(),
@@ -425,7 +447,13 @@ func (g *genConversion) convertibleOnlyWithinPackage(inType, outType *types.Type
 	if t.Name.Package != g.targetPackage {
 		return false
 	}
-	if extractBoolTagOrDie("genconversion", true, t.CommentLines) == false {
+	// If the type has opted out, skip it.
+	tagvals := extractTag(t.CommentLines)
+	if tagvals != nil {
+		if tagvals[0] != "false" {
+			glog.Fatalf("Type %v: unsupported %s value: %q", t, tagName, tagvals[0])
+		}
+		glog.V(5).Infof("type %v requests no conversion generation, skipping", t)
 		return false
 	}
 	// TODO: Consider generating functions for other kinds too.
@@ -440,22 +468,22 @@ func (g *genConversion) convertibleOnlyWithinPackage(inType, outType *types.Type
 }
 
 func (g *genConversion) Filter(c *generator.Context, t *types.Type) bool {
-	internalType, exists := getInternalTypeFor(c, t)
+	peerType := getPeerTypeFor(c, t, g.peerPackages)
-	if !exists {
+	if peerType == nil {
 		return false
 	}
-	if !g.convertibleOnlyWithinPackage(t, internalType) {
+	if !g.convertibleOnlyWithinPackage(t, peerType) {
 		return false
 	}
 	// We explicitly return true if any conversion is possible - this needs
 	// to be checked again while generating code for that type.
 	convertible := false
-	if isConvertible(t, internalType, g.manualConversions) {
+	if isConvertible(t, peerType, g.manualConversions) {
-		g.typesForInit = append(g.typesForInit, conversionPair{t, internalType})
+		g.typesForInit = append(g.typesForInit, conversionPair{t, peerType})
 		convertible = true
 	}
-	if isConvertible(internalType, t, g.manualConversions) {
+	if isConvertible(peerType, t, g.manualConversions) {
-		g.typesForInit = append(g.typesForInit, conversionPair{internalType, t})
+		g.typesForInit = append(g.typesForInit, conversionPair{peerType, t})
 		convertible = true
 	}
 	return convertible
@@ -542,13 +570,14 @@ func (g *genConversion) Init(c *generator.Context, w io.Writer) error {
 }
 
 func (g *genConversion) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error {
+	glog.V(5).Infof("generating for type %v", t)
 	sw := generator.NewSnippetWriter(w, c, "$", "$")
-	internalType, _ := getInternalTypeFor(c, t)
+	peerType := getPeerTypeFor(c, t, g.peerPackages)
-	if isDirectlyConvertible(t, internalType, g.manualConversions) {
+	if isDirectlyConvertible(t, peerType, g.manualConversions) {
-		g.generateConversion(t, internalType, sw)
+		g.generateConversion(t, peerType, sw)
 	}
-	if isDirectlyConvertible(internalType, t, g.manualConversions) {
+	if isDirectlyConvertible(peerType, t, g.manualConversions) {
-		g.generateConversion(internalType, t, sw)
+		g.generateConversion(peerType, t, sw)
 	}
 	return sw.Error()
 }
@@ -681,7 +710,7 @@ func (g *genConversion) doStruct(inType, outType *types.Type, sw *generator.Snip
 		outMember, isOutMember := findMember(outType, m.Name)
 		if !isOutMember {
 			// Since this object wasn't filtered out, this means that
-			// this field has "genconversion=false" comment to ignore it.
+			// this field has "+k8s:conversion-gen=false" comment to ignore it.
 			continue
 		}
 		t, outT := m.Type, outMember.Type

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

@@ -1,33 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package generators
-
-import (
-	"github.com/golang/glog"
-	"k8s.io/kubernetes/cmd/libs/go2idl/types"
-)
-
-// extractBoolTagOrDie gets the comment-tags for the key and asserts that, if
-// it exists, the value is boolean.  If the tag did not exist, it returns
-// defaultVal.
-func extractBoolTagOrDie(key string, defaultVal bool, lines []string) bool {
-	val, err := types.ExtractSingleBoolCommentTag("+", key, defaultVal, lines)
-	if err != nil {
-		glog.Fatalf(err.Error())
-	}
-	return val
-}

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

@@ -16,9 +16,22 @@ limitations under the License.
 
 // conversion-gen is a tool for auto-generating Conversion functions.
 //
-// Structs in the input directories with the below line in their comments
+// Given a list of input directories, it will scan for "peer" packages and
-// will be ignored during generation.
+// generate functions that efficiently convert between same-name types in each
-// // +genconversion=false
+// package.  For any pair of types that has a
+//     `Convert_<pkg1>_<type>_To_<pkg2>_<Type()`
+// function (and its reciprocal), it will simply call that.  use standard value
+// assignment whenever possible.  The resulting file will be stored in the same
+// directory as the processed source package.
+//
+// Generation is governed by comment tags in the source.  Any package may
+// request Conversion generation by including a comment in the file-comments of
+// one file, of the form:
+//   // +k8s:conversion-gen=<import-path-of-peer-package>
+//
+// When generating for a package, individual types or fields of structs may opt
+// out of Conversion generation by specifying a comment on the of the form:
+//   // +k8s:conversion-gen=false
 package main
 
 import (
@@ -26,42 +39,30 @@ import (
 	"k8s.io/kubernetes/cmd/libs/go2idl/conversion-gen/generators"
 
 	"github.com/golang/glog"
+	"github.com/spf13/pflag"
 )
 
 func main() {
 	arguments := args.Default()
 
-	// Override defaults. These are Kubernetes specific input locations.
+	// Override defaults.
-	arguments.InputDirs = []string{
+	arguments.OutputFileBaseName = "conversion_generated"
-		"k8s.io/kubernetes/pkg/api/v1",
-		"k8s.io/kubernetes/pkg/api",
-		"k8s.io/kubernetes/pkg/apis/authentication.k8s.io",
-		"k8s.io/kubernetes/pkg/apis/authentication.k8s.io/v1beta1",
-		"k8s.io/kubernetes/pkg/apis/authorization",
-		"k8s.io/kubernetes/pkg/apis/authorization/v1beta1",
-		"k8s.io/kubernetes/pkg/apis/autoscaling",
-		"k8s.io/kubernetes/pkg/apis/autoscaling/v1",
-		"k8s.io/kubernetes/pkg/apis/batch",
-		"k8s.io/kubernetes/pkg/apis/batch/v1",
-		"k8s.io/kubernetes/pkg/apis/batch/v2alpha1",
-		"k8s.io/kubernetes/pkg/apis/apps",
-		"k8s.io/kubernetes/pkg/apis/apps/v1alpha1",
-		"k8s.io/kubernetes/pkg/apis/certificates",
-		"k8s.io/kubernetes/pkg/apis/certificates/v1alpha1",
-		"k8s.io/kubernetes/pkg/apis/componentconfig",
-		"k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1",
-		"k8s.io/kubernetes/pkg/apis/policy",
-		"k8s.io/kubernetes/pkg/apis/policy/v1alpha1",
-		"k8s.io/kubernetes/pkg/apis/extensions",
-		"k8s.io/kubernetes/pkg/apis/extensions/v1beta1",
-		"k8s.io/kubernetes/pkg/apis/rbac",
-		"k8s.io/kubernetes/pkg/apis/rbac/v1alpha1",
-		"k8s.io/kubernetes/federation/apis/federation",
-		"k8s.io/kubernetes/federation/apis/federation/v1beta1",
-		"k8s.io/kubernetes/pkg/conversion",
-		"k8s.io/kubernetes/pkg/runtime",
-	}
 
+	// Custom args.
+	customArgs := &generators.CustomArgs{
+		ExtraPeerDirs: []string{
+			"k8s.io/kubernetes/pkg/api",
+			"k8s.io/kubernetes/pkg/api/v1",
+			"k8s.io/kubernetes/pkg/api/unversioned",
+			"k8s.io/kubernetes/pkg/conversion",
+			"k8s.io/kubernetes/pkg/runtime",
+		},
+	}
+	pflag.CommandLine.StringSliceVar(&customArgs.ExtraPeerDirs, "extra-peer-dirs", customArgs.ExtraPeerDirs,
+		"Comma-separated list of import paths which are considered, after tag-specified peers, for conversions.")
+	arguments.CustomArgs = customArgs
+
+	// Run it.
 	if err := arguments.Execute(
 		generators.NameSystems(),
 		generators.DefaultNameSystem(),

docs/devel/adding-an-APIGroup.md

@@ -79,9 +79,10 @@ cmd/libs/go2idl/ tool.
     2. Make sure your pkg/apis/`<group>`/`<version>` directory has a doc.go file
        with the comment `// +k8s:deepcopy-gen=package,register`, to catch the
        attention of our generation tools.
-    3. Make sure your pkg/apis/`<group>`/`<version>` directory has a doc.go file
+    3. Make sure your `pkg/apis/<group>/<version>` directory has a doc.go file
-       with the comment `// +genconversion=true`, to catch the attention of our
+       with the comment `// +k8s:conversion-gen=<internal-pkg>`, to catch the
-       gen-conversion script.
+       attention of our generation tools.  For most APIs the only target you
+       need is `k8s.io/kubernetes/pkg/apis/<group>` (your internal API).
     4. Run hack/update-all.sh.
 
 2. Generate files for Ugorji codec:

federation/apis/federation/v1beta1/doc.go

@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/federation/apis/federation
 
-// +genconversion=true
 package v1beta1

hack/update-codegen.sh

@@ -47,7 +47,6 @@ ${clientgen} --clientset-name="release_1_4" --input="api/v1,extensions/v1beta1,a
 # Clientgen for federation clientset.
 ${clientgen} --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/","api/" --included-types-overrides="api/Service"   "$@"
 ${clientgen} --clientset-name=federation_release_1_4 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/v1beta1","api/v1" --included-types-overrides="api/v1/Service"   "$@"
-${conversiongen} "$@"
 ${setgen} "$@"
 
 # You may add additional calls of code generators like set-gen above.
@@ -73,9 +72,22 @@ DEEP_COPY_DIRS=$(
         | xargs dirname \
         | sort -u
     )
-INPUTS=$(
+DEEPCOPY_INPUTS=$(
     for d in ${DEEP_COPY_DIRS}; do
         echo k8s.io/kubernetes/$d
     done | paste -sd,
     )
-${deepcopygen} -i ${INPUTS}
+${deepcopygen} -i ${DEEPCOPY_INPUTS}
+
+CONVERSION_DIRS=$(
+    grep '^// *+k8s:conversion-gen=' ${ALL_K8S_TAG_FILES} \
+        | cut -f1 -d:                                     \
+        | xargs dirname                                   \
+        | sort -u                                         \
+    )
+CONVERSION_INPUTS=$(
+     for d in ${CONVERSION_DIRS}; do
+         echo k8s.io/kubernetes/$d
+     done | paste -sd,
+     )
+${conversiongen} -i ${CONVERSION_INPUTS}

hack/verify-flags/known-flags.txt

@@ -150,13 +150,14 @@ executor-bindall
 executor-logv
 executor-path
 executor-suicide-timeout
+exit-on-lock-contention
 experimental-flannel-overlay
 experimental-keystone-url
 experimental-nvidia-gpus
 experimental-prefix
 external-hostname
 external-ip
-exit-on-lock-contention
+extra-peer-dirs
 failover-timeout
 failure-domains
 fake-clientset

pkg/api/v1/doc.go

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/api
 
 // Package v1 is the v1 version of the API.
-// +genconversion=true
 package v1

pkg/api/v1/generated.proto

@@ -2481,7 +2481,7 @@ message Secret {
   // It is provided as a write-only convenience method.
   // All keys and values are merged into the data field on write, overwriting any existing values.
   // It is never output when reading from the API.
-  // +genconversion=false
+  // +k8s:conversion-gen=false
   map<string, string> stringData = 4;
 
   // Used to facilitate programmatic handling of secret data.
@@ -2715,7 +2715,7 @@ message ServiceSpec {
   // API for compatibility until at least 8/20/2016.  It will be removed from
   // any new API revisions.  If both deprecatedPublicIPs *and* externalIPs are
   // set, deprecatedPublicIPs is used.
-  // +genconversion=false
+  // +k8s:conversion-gen=false
   repeated string deprecatedPublicIPs = 6;
 
   // Supports "ClientIP" and "None". Used to maintain session affinity.

pkg/api/v1/types.go

@@ -2081,7 +2081,7 @@ type ServiceSpec struct {
 	// API for compatibility until at least 8/20/2016.  It will be removed from
 	// any new API revisions.  If both deprecatedPublicIPs *and* externalIPs are
 	// set, deprecatedPublicIPs is used.
-	// +genconversion=false
+	// +k8s:conversion-gen=false
 	DeprecatedPublicIPs []string `json:"deprecatedPublicIPs,omitempty" protobuf:"bytes,6,rep,name=deprecatedPublicIPs"`
 
 	// Supports "ClientIP" and "None". Used to maintain session affinity.
@@ -3096,7 +3096,7 @@ type Secret struct {
 	// It is provided as a write-only convenience method.
 	// All keys and values are merged into the data field on write, overwriting any existing values.
 	// It is never output when reading from the API.
-	// +genconversion=false
+	// +k8s:conversion-gen=false
 	StringData map[string]string `json:"stringData,omitempty" protobuf:"bytes,4,rep,name=stringData"`
 
 	// Used to facilitate programmatic handling of secret data.

pkg/apis/apps/v1alpha1/doc.go

@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/apps
 
-// +genconversion=true
 package v1alpha1

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

@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/authentication.k8s.io
 
-// +genconversion=true
 package v1beta1

pkg/apis/authorization/v1beta1/doc.go

@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/authorization
 
-// +genconversion=true
 package v1beta1

pkg/apis/autoscaling/v1/doc.go

@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
 
-// +genconversion=true
 package v1

pkg/apis/batch/v1/doc.go

@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
 
-// +genconversion=true
 package v1

pkg/apis/batch/v2alpha1/doc.go

@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
 
-// +genconversion=true
 package v2alpha1

pkg/apis/certificates/v1alpha1/doc.go

@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/certificates
 
-// +genconversion=true
 package v1alpha1

pkg/apis/componentconfig/v1alpha1/doc.go

@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/componentconfig
 
-// +genconversion=true
 package v1alpha1

pkg/apis/extensions/v1beta1/conversion_generated.go

@@ -62,6 +62,8 @@ func init() {
 		Convert_extensions_DeploymentStatus_To_v1beta1_DeploymentStatus,
 		Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy,
 		Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy,
+		Convert_v1beta1_ExportOptions_To_api_ExportOptions,
+		Convert_api_ExportOptions_To_v1beta1_ExportOptions,
 		Convert_v1beta1_FSGroupStrategyOptions_To_extensions_FSGroupStrategyOptions,
 		Convert_extensions_FSGroupStrategyOptions_To_v1beta1_FSGroupStrategyOptions,
 		Convert_v1beta1_HTTPIngressPath_To_extensions_HTTPIngressPath,
@@ -110,6 +112,8 @@ func init() {
 		Convert_unversioned_LabelSelector_To_v1beta1_LabelSelector,
 		Convert_v1beta1_LabelSelectorRequirement_To_unversioned_LabelSelectorRequirement,
 		Convert_unversioned_LabelSelectorRequirement_To_v1beta1_LabelSelectorRequirement,
+		Convert_v1beta1_ListOptions_To_api_ListOptions,
+		Convert_api_ListOptions_To_v1beta1_ListOptions,
 		Convert_v1beta1_NetworkPolicy_To_extensions_NetworkPolicy,
 		Convert_extensions_NetworkPolicy_To_v1beta1_NetworkPolicy,
 		Convert_v1beta1_NetworkPolicyIngressRule_To_extensions_NetworkPolicyIngressRule,
@@ -644,6 +648,32 @@ func autoConvert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in
 	return nil
 }
 
+func autoConvert_v1beta1_ExportOptions_To_api_ExportOptions(in *ExportOptions, out *api.ExportOptions, s conversion.Scope) error {
+	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
+		return err
+	}
+	out.Export = in.Export
+	out.Exact = in.Exact
+	return nil
+}
+
+func Convert_v1beta1_ExportOptions_To_api_ExportOptions(in *ExportOptions, out *api.ExportOptions, s conversion.Scope) error {
+	return autoConvert_v1beta1_ExportOptions_To_api_ExportOptions(in, out, s)
+}
+
+func autoConvert_api_ExportOptions_To_v1beta1_ExportOptions(in *api.ExportOptions, out *ExportOptions, s conversion.Scope) error {
+	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
+		return err
+	}
+	out.Export = in.Export
+	out.Exact = in.Exact
+	return nil
+}
+
+func Convert_api_ExportOptions_To_v1beta1_ExportOptions(in *api.ExportOptions, out *ExportOptions, s conversion.Scope) error {
+	return autoConvert_api_ExportOptions_To_v1beta1_ExportOptions(in, out, s)
+}
+
 func autoConvert_v1beta1_FSGroupStrategyOptions_To_extensions_FSGroupStrategyOptions(in *FSGroupStrategyOptions, out *extensions.FSGroupStrategyOptions, s conversion.Scope) error {
 	out.Rule = extensions.FSGroupStrategyType(in.Rule)
 	if in.Ranges != nil {
@@ -1440,6 +1470,46 @@ func Convert_unversioned_LabelSelectorRequirement_To_v1beta1_LabelSelectorRequir
 	return autoConvert_unversioned_LabelSelectorRequirement_To_v1beta1_LabelSelectorRequirement(in, out, s)
 }
 
+func autoConvert_v1beta1_ListOptions_To_api_ListOptions(in *ListOptions, out *api.ListOptions, s conversion.Scope) error {
+	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
+		return err
+	}
+	if err := api.Convert_string_To_labels_Selector(&in.LabelSelector, &out.LabelSelector, s); err != nil {
+		return err
+	}
+	if err := api.Convert_string_To_fields_Selector(&in.FieldSelector, &out.FieldSelector, s); err != nil {
+		return err
+	}
+	out.Watch = in.Watch
+	out.ResourceVersion = in.ResourceVersion
+	out.TimeoutSeconds = in.TimeoutSeconds
+	return nil
+}
+
+func Convert_v1beta1_ListOptions_To_api_ListOptions(in *ListOptions, out *api.ListOptions, s conversion.Scope) error {
+	return autoConvert_v1beta1_ListOptions_To_api_ListOptions(in, out, s)
+}
+
+func autoConvert_api_ListOptions_To_v1beta1_ListOptions(in *api.ListOptions, out *ListOptions, s conversion.Scope) error {
+	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
+		return err
+	}
+	if err := api.Convert_labels_Selector_To_string(&in.LabelSelector, &out.LabelSelector, s); err != nil {
+		return err
+	}
+	if err := api.Convert_fields_Selector_To_string(&in.FieldSelector, &out.FieldSelector, s); err != nil {
+		return err
+	}
+	out.Watch = in.Watch
+	out.ResourceVersion = in.ResourceVersion
+	out.TimeoutSeconds = in.TimeoutSeconds
+	return nil
+}
+
+func Convert_api_ListOptions_To_v1beta1_ListOptions(in *api.ListOptions, out *ListOptions, s conversion.Scope) error {
+	return autoConvert_api_ListOptions_To_v1beta1_ListOptions(in, out, s)
+}
+
 func autoConvert_v1beta1_NetworkPolicy_To_extensions_NetworkPolicy(in *NetworkPolicy, out *extensions.NetworkPolicy, s conversion.Scope) error {
 	SetDefaults_NetworkPolicy(in)
 	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {

pkg/apis/extensions/v1beta1/doc.go

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/extensions
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
 
-// +genconversion=true
 package v1beta1

pkg/apis/policy/v1alpha1/doc.go

@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/policy
 
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are PodDisruptionBudget, PodSecurityPolicy,
 // NetworkPolicy, etc.
-// +genconversion=true
 package v1alpha1

pkg/apis/rbac/v1alpha1/doc.go

@@ -16,6 +16,6 @@ limitations under the License.
 
 // +groupName=rbac.authorization.k8s.io
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/rbac
 
-// +genconversion=true
 package v1alpha1