Merge pull request #8299 from thockin/import-names

cmd/kube-conversion/conversion.go

@@ -56,8 +56,6 @@ func main() {
 	generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw())
 	// TODO(wojtek-t): Change the overwrites to a flag.
 	generator.OverwritePackage(*version, "")
-	// TODO(wojtek-t): Get rid of this overwrite.
-	generator.OverwritePackage("api", "newer")
 	for _, knownType := range api.Scheme.KnownTypes(*version) {
 		if err := generator.GenerateConversionsForType(*version, knownType); err != nil {
 			glog.Errorf("error while generating conversion functions for %v: %v", knownType, err)

docs/devel/api_changes.md

@@ -255,7 +255,7 @@ regenerate auto-generated ones. To regenerate them:
 ```
    - replace all conversion functions (convert\* functions) in the
      `pkg/api/<version>/conversion_generated.go` with the contents of \<file1.txt\>
-   - replace arguments of `newer.Scheme.AddGeneratedConversionFuncs` in the
+   - replace arguments of `api.Scheme.AddGeneratedConversionFuncs` in the
      `pkg/api/<version>/conversion_generated.go` with the contents of \<file2.txt\>
 
 Unsurprisingly, adding manually written conversion also requires you to add tests to

hack/update-generated-conversions.sh

@@ -34,7 +34,7 @@ package ${version}
 import (
 	"reflect"
 
-	newer "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
 )

pkg/api/v1/conversion.go

@@ -19,18 +19,18 @@ package v1
 import (
 	"fmt"
 
-	newer "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 )
 
 func addConversionFuncs() {
-	err := newer.Scheme.AddConversionFuncs()
+	err := api.Scheme.AddConversionFuncs()
 	if err != nil {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
 
 	// Add field conversion funcs.
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1", "Pod",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1", "Pod",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "metadata.name",
@@ -46,7 +46,7 @@ func addConversionFuncs() {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1", "Node",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1", "Node",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "metadata.name":
@@ -61,7 +61,7 @@ func addConversionFuncs() {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1", "ReplicationController",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1", "ReplicationController",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "metadata.name",
@@ -75,7 +75,7 @@ func addConversionFuncs() {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1", "Event",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1", "Event",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "involvedObject.kind",
@@ -96,7 +96,7 @@ func addConversionFuncs() {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1", "Namespace",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1", "Namespace",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "status.phase":

pkg/api/v1/conversion_test.go

@@ -19,29 +19,29 @@ package v1_test
 import (
 	"testing"
 
-	newer "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	current "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	versioned "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
 )
 
 func TestNodeConversion(t *testing.T) {
-	obj, err := current.Codec.Decode([]byte(`{"kind":"Minion","apiVersion":"v1"}`))
+	obj, err := versioned.Codec.Decode([]byte(`{"kind":"Minion","apiVersion":"v1"}`))
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if _, ok := obj.(*newer.Node); !ok {
+	if _, ok := obj.(*api.Node); !ok {
 		t.Errorf("unexpected type: %#v", obj)
 	}
 
-	obj, err = current.Codec.Decode([]byte(`{"kind":"MinionList","apiVersion":"v1"}`))
+	obj, err = versioned.Codec.Decode([]byte(`{"kind":"MinionList","apiVersion":"v1"}`))
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if _, ok := obj.(*newer.NodeList); !ok {
+	if _, ok := obj.(*api.NodeList); !ok {
 		t.Errorf("unexpected type: %#v", obj)
 	}
 
-	obj = &newer.Node{}
-	if err := current.Codec.DecodeInto([]byte(`{"kind":"Minion","apiVersion":"v1"}`), obj); err != nil {
+	obj = &api.Node{}
+	if err := versioned.Codec.DecodeInto([]byte(`{"kind":"Minion","apiVersion":"v1"}`), obj); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 }

pkg/api/v1beta3/conversion.go

@@ -20,13 +20,13 @@ import (
 	"fmt"
 	"reflect"
 
-	newer "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
 )
 
 func addConversionFuncs() {
 	// Add non-generated conversion functions
-	err := newer.Scheme.AddConversionFuncs(
+	err := api.Scheme.AddConversionFuncs(
 		convert_v1beta3_Container_To_api_Container,
 		convert_api_Container_To_v1beta3_Container,
 	)
@@ -36,7 +36,7 @@ func addConversionFuncs() {
 	}
 
 	// Add field conversion funcs.
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1beta3", "Pod",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1beta3", "Pod",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "metadata.name",
@@ -52,7 +52,7 @@ func addConversionFuncs() {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1beta3", "Node",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1beta3", "Node",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "metadata.name":
@@ -67,7 +67,7 @@ func addConversionFuncs() {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1beta3", "ReplicationController",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1beta3", "ReplicationController",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "metadata.name",
@@ -81,7 +81,7 @@ func addConversionFuncs() {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1beta3", "Event",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1beta3", "Event",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "involvedObject.kind",
@@ -102,7 +102,7 @@ func addConversionFuncs() {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1beta3", "Namespace",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1beta3", "Namespace",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "status.phase":
@@ -115,7 +115,7 @@ func addConversionFuncs() {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1beta3", "Secret",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1beta3", "Secret",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "type":
@@ -128,7 +128,7 @@ func addConversionFuncs() {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
-	err = newer.Scheme.AddFieldLabelConversionFunc("v1beta3", "ServiceAccount",
+	err = api.Scheme.AddFieldLabelConversionFunc("v1beta3", "ServiceAccount",
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "metadata.name":
@@ -143,7 +143,7 @@ func addConversionFuncs() {
 	}
 }
 
-func convert_v1beta3_Container_To_api_Container(in *Container, out *newer.Container, s conversion.Scope) error {
+func convert_v1beta3_Container_To_api_Container(in *Container, out *api.Container, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*Container))(in)
 	}
@@ -163,7 +163,7 @@ func convert_v1beta3_Container_To_api_Container(in *Container, out *newer.Contai
 	}
 	out.WorkingDir = in.WorkingDir
 	if in.Ports != nil {
-		out.Ports = make([]newer.ContainerPort, len(in.Ports))
+		out.Ports = make([]api.ContainerPort, len(in.Ports))
 		for i := range in.Ports {
 			if err := convert_v1beta3_ContainerPort_To_api_ContainerPort(&in.Ports[i], &out.Ports[i], s); err != nil {
 				return err
@@ -171,7 +171,7 @@ func convert_v1beta3_Container_To_api_Container(in *Container, out *newer.Contai
 		}
 	}
 	if in.Env != nil {
-		out.Env = make([]newer.EnvVar, len(in.Env))
+		out.Env = make([]api.EnvVar, len(in.Env))
 		for i := range in.Env {
 			if err := convert_v1beta3_EnvVar_To_api_EnvVar(&in.Env[i], &out.Env[i], s); err != nil {
 				return err
@@ -182,7 +182,7 @@ func convert_v1beta3_Container_To_api_Container(in *Container, out *newer.Contai
 		return err
 	}
 	if in.VolumeMounts != nil {
-		out.VolumeMounts = make([]newer.VolumeMount, len(in.VolumeMounts))
+		out.VolumeMounts = make([]api.VolumeMount, len(in.VolumeMounts))
 		for i := range in.VolumeMounts {
 			if err := convert_v1beta3_VolumeMount_To_api_VolumeMount(&in.VolumeMounts[i], &out.VolumeMounts[i], s); err != nil {
 				return err
@@ -190,7 +190,7 @@ func convert_v1beta3_Container_To_api_Container(in *Container, out *newer.Contai
 		}
 	}
 	if in.LivenessProbe != nil {
-		out.LivenessProbe = new(newer.Probe)
+		out.LivenessProbe = new(api.Probe)
 		if err := convert_v1beta3_Probe_To_api_Probe(in.LivenessProbe, out.LivenessProbe, s); err != nil {
 			return err
 		}
@@ -198,7 +198,7 @@ func convert_v1beta3_Container_To_api_Container(in *Container, out *newer.Contai
 		out.LivenessProbe = nil
 	}
 	if in.ReadinessProbe != nil {
-		out.ReadinessProbe = new(newer.Probe)
+		out.ReadinessProbe = new(api.Probe)
 		if err := convert_v1beta3_Probe_To_api_Probe(in.ReadinessProbe, out.ReadinessProbe, s); err != nil {
 			return err
 		}
@@ -206,7 +206,7 @@ func convert_v1beta3_Container_To_api_Container(in *Container, out *newer.Contai
 		out.ReadinessProbe = nil
 	}
 	if in.Lifecycle != nil {
-		out.Lifecycle = new(newer.Lifecycle)
+		out.Lifecycle = new(api.Lifecycle)
 		if err := convert_v1beta3_Lifecycle_To_api_Lifecycle(in.Lifecycle, out.Lifecycle, s); err != nil {
 			return err
 		}
@@ -214,7 +214,7 @@ func convert_v1beta3_Container_To_api_Container(in *Container, out *newer.Contai
 		out.Lifecycle = nil
 	}
 	out.TerminationMessagePath = in.TerminationMessagePath
-	out.ImagePullPolicy = newer.PullPolicy(in.ImagePullPolicy)
+	out.ImagePullPolicy = api.PullPolicy(in.ImagePullPolicy)
 	if in.SecurityContext != nil {
 		if in.SecurityContext.Capabilities != nil {
 			if !reflect.DeepEqual(in.SecurityContext.Capabilities.Add, in.Capabilities.Add) ||
@@ -229,7 +229,7 @@ func convert_v1beta3_Container_To_api_Container(in *Container, out *newer.Contai
 		}
 	}
 	if in.SecurityContext != nil {
-		out.SecurityContext = new(newer.SecurityContext)
+		out.SecurityContext = new(api.SecurityContext)
 		if err := convert_v1beta3_SecurityContext_To_api_SecurityContext(in.SecurityContext, out.SecurityContext, s); err != nil {
 			return err
 		}
@@ -239,9 +239,9 @@ func convert_v1beta3_Container_To_api_Container(in *Container, out *newer.Contai
 	return nil
 }
 
-func convert_api_Container_To_v1beta3_Container(in *newer.Container, out *Container, s conversion.Scope) error {
+func convert_api_Container_To_v1beta3_Container(in *api.Container, out *Container, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
-		defaulting.(func(*newer.Container))(in)
+		defaulting.(func(*api.Container))(in)
 	}
 	out.Name = in.Name
 	out.Image = in.Image

pkg/api/v1beta3/conversion_test.go

@@ -19,29 +19,29 @@ package v1beta3_test
 import (
 	"testing"
 
-	newer "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	current "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	versioned "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3"
 )
 
 func TestNodeConversion(t *testing.T) {
-	obj, err := current.Codec.Decode([]byte(`{"kind":"Minion","apiVersion":"v1beta3"}`))
+	obj, err := versioned.Codec.Decode([]byte(`{"kind":"Minion","apiVersion":"v1beta3"}`))
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if _, ok := obj.(*newer.Node); !ok {
+	if _, ok := obj.(*api.Node); !ok {
 		t.Errorf("unexpected type: %#v", obj)
 	}
 
-	obj, err = current.Codec.Decode([]byte(`{"kind":"MinionList","apiVersion":"v1beta3"}`))
+	obj, err = versioned.Codec.Decode([]byte(`{"kind":"MinionList","apiVersion":"v1beta3"}`))
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if _, ok := obj.(*newer.NodeList); !ok {
+	if _, ok := obj.(*api.NodeList); !ok {
 		t.Errorf("unexpected type: %#v", obj)
 	}
 
-	obj = &newer.Node{}
-	if err := current.Codec.DecodeInto([]byte(`{"kind":"Minion","apiVersion":"v1beta3"}`), obj); err != nil {
+	obj = &api.Node{}
+	if err := versioned.Codec.DecodeInto([]byte(`{"kind":"Minion","apiVersion":"v1beta3"}`), obj); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 }
@@ -49,42 +49,42 @@ func TestNodeConversion(t *testing.T) {
 func TestBadSecurityContextConversion(t *testing.T) {
 	priv := false
 	testCases := map[string]struct {
-		c   *current.Container
+		c   *versioned.Container
 		err string
 	}{
 		// this use case must use true for the container and false for the sc.  Otherwise the defaulter
 		// will assume privileged was left undefined (since it is the default value) and copy the
 		// sc setting upwards
 		"mismatched privileged": {
-			c: &current.Container{
+			c: &versioned.Container{
 				Privileged: true,
-				SecurityContext: &current.SecurityContext{
+				SecurityContext: &versioned.SecurityContext{
 					Privileged: &priv,
 				},
 			},
 			err: "container privileged settings do not match security context settings, cannot convert",
 		},
 		"mismatched caps add": {
-			c: &current.Container{
-				Capabilities: current.Capabilities{
-					Add: []current.Capability{"foo"},
+			c: &versioned.Container{
+				Capabilities: versioned.Capabilities{
+					Add: []versioned.Capability{"foo"},
 				},
-				SecurityContext: &current.SecurityContext{
-					Capabilities: &current.Capabilities{
-						Add: []current.Capability{"bar"},
+				SecurityContext: &versioned.SecurityContext{
+					Capabilities: &versioned.Capabilities{
+						Add: []versioned.Capability{"bar"},
 					},
 				},
 			},
 			err: "container capability settings do not match security context settings, cannot convert",
 		},
 		"mismatched caps drop": {
-			c: &current.Container{
-				Capabilities: current.Capabilities{
-					Drop: []current.Capability{"foo"},
+			c: &versioned.Container{
+				Capabilities: versioned.Capabilities{
+					Drop: []versioned.Capability{"foo"},
 				},
-				SecurityContext: &current.SecurityContext{
-					Capabilities: &current.Capabilities{
-						Drop: []current.Capability{"bar"},
+				SecurityContext: &versioned.SecurityContext{
+					Capabilities: &versioned.Capabilities{
+						Drop: []versioned.Capability{"bar"},
 					},
 				},
 			},
@@ -93,8 +93,8 @@ func TestBadSecurityContextConversion(t *testing.T) {
 	}
 
 	for k, v := range testCases {
-		got := newer.Container{}
-		err := newer.Scheme.Convert(v.c, &got)
+		got := api.Container{}
+		err := api.Scheme.Convert(v.c, &got)
 		if err == nil {
 			t.Errorf("expected error for case %s but got none", k)
 		} else {

pkg/client/clientcmd/api/v1/conversion.go

@@ -19,53 +19,53 @@ package v1
 import (
 	"sort"
 
-	newer "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 )
 
 func init() {
-	err := newer.Scheme.AddConversionFuncs(
-		func(in *Cluster, out *newer.Cluster, s conversion.Scope) error {
+	err := api.Scheme.AddConversionFuncs(
+		func(in *Cluster, out *api.Cluster, s conversion.Scope) error {
 			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)
 		},
-		func(in *newer.Cluster, out *Cluster, s conversion.Scope) error {
+		func(in *api.Cluster, out *Cluster, s conversion.Scope) error {
 			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)
 		},
-		func(in *Preferences, out *newer.Preferences, s conversion.Scope) error {
+		func(in *Preferences, out *api.Preferences, s conversion.Scope) error {
 			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)
 		},
-		func(in *newer.Preferences, out *Preferences, s conversion.Scope) error {
+		func(in *api.Preferences, out *Preferences, s conversion.Scope) error {
 			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)
 		},
-		func(in *AuthInfo, out *newer.AuthInfo, s conversion.Scope) error {
+		func(in *AuthInfo, out *api.AuthInfo, s conversion.Scope) error {
 			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)
 		},
-		func(in *newer.AuthInfo, out *AuthInfo, s conversion.Scope) error {
+		func(in *api.AuthInfo, out *AuthInfo, s conversion.Scope) error {
 			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)
 		},
-		func(in *Context, out *newer.Context, s conversion.Scope) error {
+		func(in *Context, out *api.Context, s conversion.Scope) error {
 			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)
 		},
-		func(in *newer.Context, out *Context, s conversion.Scope) error {
+		func(in *api.Context, out *Context, s conversion.Scope) error {
 			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)
 		},
 
-		func(in *Config, out *newer.Config, s conversion.Scope) error {
+		func(in *Config, out *api.Config, s conversion.Scope) error {
 			out.CurrentContext = in.CurrentContext
 			if err := s.Convert(&in.Preferences, &out.Preferences, 0); err != nil {
 				return err
 			}
 
-			out.Clusters = make(map[string]newer.Cluster)
+			out.Clusters = make(map[string]api.Cluster)
 			if err := s.Convert(&in.Clusters, &out.Clusters, 0); err != nil {
 				return err
 			}
-			out.AuthInfos = make(map[string]newer.AuthInfo)
+			out.AuthInfos = make(map[string]api.AuthInfo)
 			if err := s.Convert(&in.AuthInfos, &out.AuthInfos, 0); err != nil {
 				return err
 			}
-			out.Contexts = make(map[string]newer.Context)
+			out.Contexts = make(map[string]api.Context)
 			if err := s.Convert(&in.Contexts, &out.Contexts, 0); err != nil {
 				return err
 			}
@@ -75,7 +75,7 @@ func init() {
 			}
 			return nil
 		},
-		func(in *newer.Config, out *Config, s conversion.Scope) error {
+		func(in *api.Config, out *Config, s conversion.Scope) error {
 			out.CurrentContext = in.CurrentContext
 			if err := s.Convert(&in.Preferences, &out.Preferences, 0); err != nil {
 				return err
@@ -99,9 +99,9 @@ func init() {
 			}
 			return nil
 		},
-		func(in *[]NamedCluster, out *map[string]newer.Cluster, s conversion.Scope) error {
+		func(in *[]NamedCluster, out *map[string]api.Cluster, s conversion.Scope) error {
 			for _, curr := range *in {
-				newCluster := newer.NewCluster()
+				newCluster := api.NewCluster()
 				if err := s.Convert(&curr.Cluster, newCluster, 0); err != nil {
 					return err
 				}
@@ -110,7 +110,7 @@ func init() {
 
 			return nil
 		},
-		func(in *map[string]newer.Cluster, out *[]NamedCluster, s conversion.Scope) error {
+		func(in *map[string]api.Cluster, out *[]NamedCluster, s conversion.Scope) error {
 			allKeys := make([]string, 0, len(*in))
 			for key := range *in {
 				allKeys = append(allKeys, key)
@@ -130,9 +130,9 @@ func init() {
 
 			return nil
 		},
-		func(in *[]NamedAuthInfo, out *map[string]newer.AuthInfo, s conversion.Scope) error {
+		func(in *[]NamedAuthInfo, out *map[string]api.AuthInfo, s conversion.Scope) error {
 			for _, curr := range *in {
-				newAuthInfo := newer.NewAuthInfo()
+				newAuthInfo := api.NewAuthInfo()
 				if err := s.Convert(&curr.AuthInfo, newAuthInfo, 0); err != nil {
 					return err
 				}
@@ -141,7 +141,7 @@ func init() {
 
 			return nil
 		},
-		func(in *map[string]newer.AuthInfo, out *[]NamedAuthInfo, s conversion.Scope) error {
+		func(in *map[string]api.AuthInfo, out *[]NamedAuthInfo, s conversion.Scope) error {
 			allKeys := make([]string, 0, len(*in))
 			for key := range *in {
 				allKeys = append(allKeys, key)
@@ -161,9 +161,9 @@ func init() {
 
 			return nil
 		},
-		func(in *[]NamedContext, out *map[string]newer.Context, s conversion.Scope) error {
+		func(in *[]NamedContext, out *map[string]api.Context, s conversion.Scope) error {
 			for _, curr := range *in {
-				newContext := newer.NewContext()
+				newContext := api.NewContext()
 				if err := s.Convert(&curr.Context, newContext, 0); err != nil {
 					return err
 				}
@@ -172,7 +172,7 @@ func init() {
 
 			return nil
 		},
-		func(in *map[string]newer.Context, out *[]NamedContext, s conversion.Scope) error {
+		func(in *map[string]api.Context, out *[]NamedContext, s conversion.Scope) error {
 			allKeys := make([]string, 0, len(*in))
 			for key := range *in {
 				allKeys = append(allKeys, key)

pkg/runtime/conversion_generation_test.go

@@ -36,7 +36,6 @@ import (
 func generateConversions(t *testing.T, version string) bytes.Buffer {
 	g := runtime.NewConversionGenerator(api.Scheme.Raw())
 	g.OverwritePackage(version, "")
-	g.OverwritePackage("api", "newer")
 	for _, knownType := range api.Scheme.KnownTypes(version) {
 		if err := g.GenerateConversionsForType(version, knownType); err != nil {
 			glog.Errorf("error while generating conversion functions for %v: %v", knownType, err)
@@ -126,8 +125,8 @@ func compareBuffers(t *testing.T, generatedFile string, existing, generated byte
 		}
 		if existingLine != generatedLine {
 			ok = false
-			diff := fmt.Sprintf("first difference: expected %s, got %s", generatedLine, existingLine)
-			t.Errorf("please update conversion functions; generated: %s; diff: %s", generatedFile, diff)
+			diff := fmt.Sprintf("\nexpected: %s\n     got: %s", generatedLine, existingLine)
+			t.Errorf("please update conversion functions; generated: %s; first diff: %s", generatedFile, diff)
 			return ok
 		}
 	}

pkg/runtime/conversion_generator.go

@@ -265,7 +265,7 @@ func (g *conversionGenerator) WriteConversionFunctions(w io.Writer) error {
 
 func (g *conversionGenerator) writeRegisterHeader(b *buffer, indent int) {
 	b.addLine("func init() {\n", indent)
-	b.addLine("err := newer.Scheme.AddGeneratedConversionFuncs(\n", indent+1)
+	b.addLine("err := api.Scheme.AddGeneratedConversionFuncs(\n", indent+1)
 }
 
 func (g *conversionGenerator) writeRegisterFooter(b *buffer, indent int) {