Merge pull request #23768 from wojtek-t/conversions_with_framework_6

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

@@ -57,9 +57,20 @@ func DefaultNameSystem() string {
 	return "public"
 }
 
+var fallbackPackages = []string{
+	"k8s.io/kubernetes/pkg/api/unversioned",
+	"k8s.io/kubernetes/pkg/apis/extensions",
+}
+
 func getInternalTypeFor(context *generator.Context, t *types.Type) (*types.Type, bool) {
 	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
@@ -148,13 +159,21 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 	// (in the directory one above) and can be automatically converted to.
 	for _, p := range context.Universe {
 		path := p.Path
-		// TODO: Only a subset of InputDirs is actually where we would like
-		// to generate conversions, the rest of files are added, because either
-		// conversion methods are generated there or they contain types
-		// necessary for conversions.
 		if !inputs.Has(path) {
 			continue
 		}
+		// Only generate conversions for package which explicitly requested it
+		// byt setting "+genversion=true" in their doc.go file.
+		filtered := false
+		for _, comment := range p.DocComments {
+			comment := strings.Trim(comment, "//")
+			if types.ExtractCommentTags("+", comment)["genconversion"] == "true" {
+				filtered = true
+			}
+		}
+		if !filtered {
+			continue
+		}
 
 		convertibleType := false
 		for _, t := range p.Types {
@@ -165,6 +184,10 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 				// There is no corresponding type in the internal package.
 				continue
 			}
+			// We won't be able to convert to private type.
+			if namer.IsPrivateGoName(internalType.Name.Name) {
+				continue
+			}
 			// If we can generate conversion in any direction, we should
 			// generate this package.
 			if isConvertible(t, internalType, preexisting) || isConvertible(internalType, t, preexisting) {
@@ -307,10 +330,11 @@ func (g *genConversion) Namers(c *generator.Context) namer.NameSystems {
 
 func (g *genConversion) convertibleOnlyWithinPackage(inType, outType *types.Type) bool {
 	var t *types.Type
+	var other *types.Type
 	if inType.Name.Package == g.targetPackage {
-		t = inType
+		t, other = inType, outType
 	} else {
-		t = outType
+		t, other = outType, inType
 	}
 
 	if t.Name.Package != g.targetPackage {
@@ -324,7 +348,7 @@ func (g *genConversion) convertibleOnlyWithinPackage(inType, outType *types.Type
 		return false
 	}
 	// Also, filter out private types.
-	if namer.IsPrivateGoName(t.Name.Name) {
+	if namer.IsPrivateGoName(other.Name.Name) {
 		return false
 	}
 	return true

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

@@ -35,6 +35,18 @@ func main() {
 	arguments.InputDirs = []string{
 		"k8s.io/kubernetes/pkg/api/v1",
 		"k8s.io/kubernetes/pkg/api",
+		"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/componentconfig",
+		"k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1",
+		"k8s.io/kubernetes/pkg/apis/extensions",
+		"k8s.io/kubernetes/pkg/apis/extensions/v1beta1",
+		"k8s.io/kubernetes/pkg/apis/metrics",
+		"k8s.io/kubernetes/pkg/apis/metrics/v1alpha1",
 		"k8s.io/kubernetes/pkg/conversion",
 		"k8s.io/kubernetes/pkg/runtime",
 	}

cmd/libs/go2idl/parser/parse.go

@@ -42,7 +42,7 @@ type Builder struct {
 
 	fset *token.FileSet
 	// map of package id to list of parsed files
-	parsed map[string][]*ast.File
+	parsed map[string][]parsedFile
 
 	// Set by makePackages, used by importer() and friends.
 	pkgs map[string]*tc.Package
@@ -58,6 +58,12 @@ type Builder struct {
 	importGraph map[string]map[string]struct{}
 }
 
+// parsedFile is for tracking files with name
+type parsedFile struct {
+	name string
+	file *ast.File
+}
+
 // key type for finding comments.
 type fileLine struct {
 	file string
@@ -79,7 +85,7 @@ func New() *Builder {
 		context:               &c,
 		buildInfo:             map[string]*build.Package{},
 		fset:                  token.NewFileSet(),
-		parsed:                map[string][]*ast.File{},
+		parsed:                map[string][]parsedFile{},
 		userRequested:         map[string]bool{},
 		endLineToCommentGroup: map[fileLine]*ast.CommentGroup{},
 		importGraph:           map[string]map[string]struct{}{},
@@ -135,7 +141,7 @@ func (b *Builder) addFile(name string, src []byte, userRequested bool) error {
 		return err
 	}
 	pkg := filepath.Dir(name)
-	b.parsed[pkg] = append(b.parsed[pkg], p)
+	b.parsed[pkg] = append(b.parsed[pkg], parsedFile{name, p})
 	b.userRequested[pkg] = userRequested
 	for _, c := range p.Comments {
 		position := b.fset.Position(c.End())
@@ -272,10 +278,14 @@ func (b *Builder) typeCheckPackage(id string) (*tc.Package, error) {
 		// already processing this package.
 		return nil, fmt.Errorf("circular dependency for %q", id)
 	}
-	files, ok := b.parsed[id]
+	parsedFiles, ok := b.parsed[id]
 	if !ok {
 		return nil, fmt.Errorf("No files for pkg %q: %#v", id, b.parsed)
 	}
+	files := make([]*ast.File, len(parsedFiles))
+	for i := range parsedFiles {
+		files[i] = parsedFiles[i].file
+	}
 	b.pkgs[id] = nil
 	c := tc.Config{
 		IgnoreFuncBodies: true,
@@ -325,6 +335,18 @@ func (b *Builder) FindTypes() (types.Universe, error) {
 			// *packages* they depend on.
 			continue
 		}
+
+		for _, f := range b.parsed[pkgPath] {
+			if strings.HasSuffix(f.name, "/doc.go") {
+				if f.file.Doc != nil {
+					tp := u.Package(pkgPath)
+					for _, c := range f.file.Doc.List {
+						tp.DocComments = append(tp.DocComments, c.Text)
+					}
+				}
+			}
+		}
+
 		s := pkg.Scope()
 		for _, n := range s.Names() {
 			obj := s.Lookup(n)

cmd/libs/go2idl/types/types.go

@@ -89,6 +89,9 @@ type Package struct {
 	// 'package x' line.
 	Name string
 
+	// Comments from doc.go file.
+	DocComments []string
+
 	// Types within this package, indexed by their name (*not* including
 	// package name).
 	Types map[string]*Type

hack/after-build/update-generated-conversions.sh

@@ -43,7 +43,7 @@ EOF
 }
 
 # TODO(lavalamp): get this list by listing the pkg/apis/ directory?
-DEFAULT_GROUP_VERSIONS="authorization/v1beta1 autoscaling/v1 batch/v1 extensions/v1beta1 componentconfig/v1alpha1 metrics/v1alpha1"
+DEFAULT_GROUP_VERSIONS=""
 VERSIONS=${VERSIONS:-$DEFAULT_GROUP_VERSIONS}
 for ver in $VERSIONS; do
   # Ensure that the version being processed is registered by setting

pkg/api/v1/doc.go

@@ -15,4 +15,5 @@ limitations under the License.
 */
 
 // Package v1 is the v1 version of the API.
+// +genconversion=true
 package v1

pkg/apis/authorization/v1beta1/doc.go

+/*
+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.
+*/
+
+// +genconversion=true
+package v1beta1

pkg/apis/autoscaling/v1/doc.go

+/*
+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.
+*/
+
+// +genconversion=true
+package v1

pkg/apis/batch/v1/conversion.go

@@ -20,17 +20,12 @@ import (
 	"fmt"
 
 	"k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/conversion"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 
 func addConversionFuncs(scheme *runtime.Scheme) {
 	// Add non-generated conversion functions
-	err := scheme.AddConversionFuncs(
-		Convert_api_PodSpec_To_v1_PodSpec,
-		Convert_v1_PodSpec_To_api_PodSpec,
-	)
+	err := scheme.AddConversionFuncs()
 	if err != nil {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
@@ -50,14 +45,3 @@ func addConversionFuncs(scheme *runtime.Scheme) {
 		panic(err)
 	}
 }
-
-// The following two PodSpec conversions functions where copied from pkg/api/conversion.go
-// for the generated functions to work properly.
-// This should be fixed: https://github.com/kubernetes/kubernetes/issues/12977
-func Convert_api_PodSpec_To_v1_PodSpec(in *api.PodSpec, out *v1.PodSpec, s conversion.Scope) error {
-	return v1.Convert_api_PodSpec_To_v1_PodSpec(in, out, s)
-}
-
-func Convert_v1_PodSpec_To_api_PodSpec(in *v1.PodSpec, out *api.PodSpec, s conversion.Scope) error {
-	return v1.Convert_v1_PodSpec_To_api_PodSpec(in, out, s)
-}

pkg/apis/batch/v1/doc.go

+/*
+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.
+*/
+
+// +genconversion=true
+package v1

pkg/apis/componentconfig/v1alpha1/doc.go

+/*
+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.
+*/
+
+// +genconversion=true
+package v1alpha1

pkg/apis/extensions/v1beta1/conversion.go

@@ -32,8 +32,6 @@ import (
 func addConversionFuncs(scheme *runtime.Scheme) {
 	// Add non-generated conversion functions
 	err := scheme.AddConversionFuncs(
-		Convert_api_PodSpec_To_v1_PodSpec,
-		Convert_v1_PodSpec_To_api_PodSpec,
 		Convert_extensions_ScaleStatus_To_v1beta1_ScaleStatus,
 		Convert_v1beta1_ScaleStatus_To_extensions_ScaleStatus,
 		Convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec,
@@ -84,17 +82,6 @@ func addConversionFuncs(scheme *runtime.Scheme) {
 	}
 }
 
-// The following two PodSpec conversions functions where copied from pkg/api/conversion.go
-// for the generated functions to work properly.
-// This should be fixed: https://github.com/kubernetes/kubernetes/issues/12977
-func Convert_api_PodSpec_To_v1_PodSpec(in *api.PodSpec, out *v1.PodSpec, s conversion.Scope) error {
-	return v1.Convert_api_PodSpec_To_v1_PodSpec(in, out, s)
-}
-
-func Convert_v1_PodSpec_To_api_PodSpec(in *v1.PodSpec, out *api.PodSpec, s conversion.Scope) error {
-	return v1.Convert_v1_PodSpec_To_api_PodSpec(in, out, s)
-}
-
 func Convert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(in *extensions.ScaleStatus, out *ScaleStatus, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*extensions.ScaleStatus))(in)
@@ -371,7 +358,7 @@ func Convert_extensions_JobSpec_To_v1beta1_JobSpec(in *extensions.JobSpec, out *
 	}
 	// END non-standard conversion
 
-	if err := Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
+	if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
 	}
 	return nil
@@ -423,7 +410,7 @@ func Convert_v1beta1_JobSpec_To_extensions_JobSpec(in *JobSpec, out *extensions.
 	}
 	// END non-standard conversion
 
-	if err := Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
+	if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
 	}
 	return nil

pkg/apis/extensions/v1beta1/doc.go

+/*
+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.
+*/
+
+// +genconversion=true
+package v1beta1

pkg/apis/metrics/v1alpha1/conversion_generated.go

+// +build !ignore_autogenerated
+
 /*
-Copyright 2015 The Kubernetes Authors All rights reserved.
+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.
@@ -14,35 +16,32 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-conversions.sh
+// This file was autogenerated by conversion-gen. Do not edit it manually!
 
 package v1alpha1
 
 import (
-	reflect "reflect"
-
 	api "k8s.io/kubernetes/pkg/api"
 	metrics "k8s.io/kubernetes/pkg/apis/metrics"
 	conversion "k8s.io/kubernetes/pkg/conversion"
+	reflect "reflect"
 )
 
-func autoConvert_metrics_RawNode_To_v1alpha1_RawNode(in *metrics.RawNode, out *RawNode, s conversion.Scope) error {
-	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
-		defaulting.(func(*metrics.RawNode))(in)
-	}
-	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
-		return err
+func init() {
+	if err := api.Scheme.AddGeneratedConversionFuncs(
+		Convert_v1alpha1_RawNode_To_metrics_RawNode,
+		Convert_metrics_RawNode_To_v1alpha1_RawNode,
+		Convert_v1alpha1_RawPod_To_metrics_RawPod,
+		Convert_metrics_RawPod_To_v1alpha1_RawPod,
+	); err != nil {
+		// if one of the conversion functions is malformed, detect it immediately.
+		panic(err)
 	}
-	return nil
-}
-
-func Convert_metrics_RawNode_To_v1alpha1_RawNode(in *metrics.RawNode, out *RawNode, s conversion.Scope) error {
-	return autoConvert_metrics_RawNode_To_v1alpha1_RawNode(in, out, s)
 }
 
-func autoConvert_metrics_RawPod_To_v1alpha1_RawPod(in *metrics.RawPod, out *RawPod, s conversion.Scope) error {
+func autoConvert_v1alpha1_RawNode_To_metrics_RawNode(in *RawNode, out *metrics.RawNode, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
-		defaulting.(func(*metrics.RawPod))(in)
+		defaulting.(func(*RawNode))(in)
 	}
 	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
 		return err
@@ -50,13 +49,13 @@ func autoConvert_metrics_RawPod_To_v1alpha1_RawPod(in *metrics.RawPod, out *RawP
 	return nil
 }
 
-func Convert_metrics_RawPod_To_v1alpha1_RawPod(in *metrics.RawPod, out *RawPod, s conversion.Scope) error {
-	return autoConvert_metrics_RawPod_To_v1alpha1_RawPod(in, out, s)
+func Convert_v1alpha1_RawNode_To_metrics_RawNode(in *RawNode, out *metrics.RawNode, s conversion.Scope) error {
+	return autoConvert_v1alpha1_RawNode_To_metrics_RawNode(in, out, s)
 }
 
-func autoConvert_v1alpha1_RawNode_To_metrics_RawNode(in *RawNode, out *metrics.RawNode, s conversion.Scope) error {
+func autoConvert_metrics_RawNode_To_v1alpha1_RawNode(in *metrics.RawNode, out *RawNode, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
-		defaulting.(func(*RawNode))(in)
+		defaulting.(func(*metrics.RawNode))(in)
 	}
 	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
 		return err
@@ -64,8 +63,8 @@ func autoConvert_v1alpha1_RawNode_To_metrics_RawNode(in *RawNode, out *metrics.R
 	return nil
 }
 
-func Convert_v1alpha1_RawNode_To_metrics_RawNode(in *RawNode, out *metrics.RawNode, s conversion.Scope) error {
-	return autoConvert_v1alpha1_RawNode_To_metrics_RawNode(in, out, s)
+func Convert_metrics_RawNode_To_v1alpha1_RawNode(in *metrics.RawNode, out *RawNode, s conversion.Scope) error {
+	return autoConvert_metrics_RawNode_To_v1alpha1_RawNode(in, out, s)
 }
 
 func autoConvert_v1alpha1_RawPod_To_metrics_RawPod(in *RawPod, out *metrics.RawPod, s conversion.Scope) error {
@@ -82,15 +81,16 @@ func Convert_v1alpha1_RawPod_To_metrics_RawPod(in *RawPod, out *metrics.RawPod,
 	return autoConvert_v1alpha1_RawPod_To_metrics_RawPod(in, out, s)
 }
 
-func init() {
-	err := api.Scheme.AddGeneratedConversionFuncs(
-		autoConvert_metrics_RawNode_To_v1alpha1_RawNode,
-		autoConvert_metrics_RawPod_To_v1alpha1_RawPod,
-		autoConvert_v1alpha1_RawNode_To_metrics_RawNode,
-		autoConvert_v1alpha1_RawPod_To_metrics_RawPod,
-	)
-	if err != nil {
-		// If one of the conversion functions is malformed, detect it immediately.
-		panic(err)
+func autoConvert_metrics_RawPod_To_v1alpha1_RawPod(in *metrics.RawPod, out *RawPod, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*metrics.RawPod))(in)
+	}
+	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
+		return err
 	}
+	return nil
+}
+
+func Convert_metrics_RawPod_To_v1alpha1_RawPod(in *metrics.RawPod, out *RawPod, s conversion.Scope) error {
+	return autoConvert_metrics_RawPod_To_v1alpha1_RawPod(in, out, s)
 }

pkg/apis/metrics/v1alpha1/doc.go

+/*
+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.
+*/
+
+// +genconversion=true
+package v1alpha1