diff --git a/cmd/kube-conversion/conversion.go b/cmd/kube-conversion/conversion.go index 3a607c416b5..3589397fc7c 100644 --- a/cmd/kube-conversion/conversion.go +++ b/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) diff --git a/docs/devel/api_changes.md b/docs/devel/api_changes.md index 6e29c3f6e57..6eff094be66 100644 --- a/docs/devel/api_changes.md +++ b/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//conversion_generated.go` with the contents of \ - - replace arguments of `newer.Scheme.AddGeneratedConversionFuncs` in the + - replace arguments of `api.Scheme.AddGeneratedConversionFuncs` in the `pkg/api//conversion_generated.go` with the contents of \ Unsurprisingly, adding manually written conversion also requires you to add tests to diff --git a/hack/update-generated-conversions.sh b/hack/update-generated-conversions.sh index 29030137192..7b0c5ddd675 100755 --- a/hack/update-generated-conversions.sh +++ b/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" ) diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go index 4a8f57e0bf1..1276ef5d1cb 100644 --- a/pkg/api/v1/conversion.go +++ b/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": diff --git a/pkg/api/v1/conversion_generated.go b/pkg/api/v1/conversion_generated.go index 0169de49a8e..7e38d19f2f2 100644 --- a/pkg/api/v1/conversion_generated.go +++ b/pkg/api/v1/conversion_generated.go @@ -19,13 +19,13 @@ package v1 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" ) // AUTO-GENERATED FUNCTIONS START HERE -func convert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in *AWSElasticBlockStoreVolumeSource, out *newer.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { +func convert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in *AWSElasticBlockStoreVolumeSource, out *api.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*AWSElasticBlockStoreVolumeSource))(in) } @@ -36,9 +36,9 @@ func convert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolu return nil } -func convert_api_AWSElasticBlockStoreVolumeSource_To_v1_AWSElasticBlockStoreVolumeSource(in *newer.AWSElasticBlockStoreVolumeSource, out *AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { +func convert_api_AWSElasticBlockStoreVolumeSource_To_v1_AWSElasticBlockStoreVolumeSource(in *api.AWSElasticBlockStoreVolumeSource, out *AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.AWSElasticBlockStoreVolumeSource))(in) + defaulting.(func(*api.AWSElasticBlockStoreVolumeSource))(in) } out.VolumeID = in.VolumeID out.FSType = in.FSType @@ -47,7 +47,7 @@ func convert_api_AWSElasticBlockStoreVolumeSource_To_v1_AWSElasticBlockStoreVolu return nil } -func convert_v1_Binding_To_api_Binding(in *Binding, out *newer.Binding, s conversion.Scope) error { +func convert_v1_Binding_To_api_Binding(in *Binding, out *api.Binding, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Binding))(in) } @@ -63,9 +63,9 @@ func convert_v1_Binding_To_api_Binding(in *Binding, out *newer.Binding, s conver return nil } -func convert_api_Binding_To_v1_Binding(in *newer.Binding, out *Binding, s conversion.Scope) error { +func convert_api_Binding_To_v1_Binding(in *api.Binding, out *Binding, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Binding))(in) + defaulting.(func(*api.Binding))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -79,22 +79,22 @@ func convert_api_Binding_To_v1_Binding(in *newer.Binding, out *Binding, s conver return nil } -func convert_v1_Capabilities_To_api_Capabilities(in *Capabilities, out *newer.Capabilities, s conversion.Scope) error { +func convert_v1_Capabilities_To_api_Capabilities(in *Capabilities, out *api.Capabilities, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Capabilities))(in) } if in.Add != nil { - out.Add = make([]newer.Capability, len(in.Add)) + out.Add = make([]api.Capability, len(in.Add)) for i := range in.Add { - out.Add[i] = newer.Capability(in.Add[i]) + out.Add[i] = api.Capability(in.Add[i]) } } else { out.Add = nil } if in.Drop != nil { - out.Drop = make([]newer.Capability, len(in.Drop)) + out.Drop = make([]api.Capability, len(in.Drop)) for i := range in.Drop { - out.Drop[i] = newer.Capability(in.Drop[i]) + out.Drop[i] = api.Capability(in.Drop[i]) } } else { out.Drop = nil @@ -102,9 +102,9 @@ func convert_v1_Capabilities_To_api_Capabilities(in *Capabilities, out *newer.Ca return nil } -func convert_api_Capabilities_To_v1_Capabilities(in *newer.Capabilities, out *Capabilities, s conversion.Scope) error { +func convert_api_Capabilities_To_v1_Capabilities(in *api.Capabilities, out *Capabilities, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Capabilities))(in) + defaulting.(func(*api.Capabilities))(in) } if in.Add != nil { out.Add = make([]Capability, len(in.Add)) @@ -125,20 +125,20 @@ func convert_api_Capabilities_To_v1_Capabilities(in *newer.Capabilities, out *Ca return nil } -func convert_v1_ComponentCondition_To_api_ComponentCondition(in *ComponentCondition, out *newer.ComponentCondition, s conversion.Scope) error { +func convert_v1_ComponentCondition_To_api_ComponentCondition(in *ComponentCondition, out *api.ComponentCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ComponentCondition))(in) } - out.Type = newer.ComponentConditionType(in.Type) - out.Status = newer.ConditionStatus(in.Status) + out.Type = api.ComponentConditionType(in.Type) + out.Status = api.ConditionStatus(in.Status) out.Message = in.Message out.Error = in.Error return nil } -func convert_api_ComponentCondition_To_v1_ComponentCondition(in *newer.ComponentCondition, out *ComponentCondition, s conversion.Scope) error { +func convert_api_ComponentCondition_To_v1_ComponentCondition(in *api.ComponentCondition, out *ComponentCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ComponentCondition))(in) + defaulting.(func(*api.ComponentCondition))(in) } out.Type = ComponentConditionType(in.Type) out.Status = ConditionStatus(in.Status) @@ -147,7 +147,7 @@ func convert_api_ComponentCondition_To_v1_ComponentCondition(in *newer.Component return nil } -func convert_v1_ComponentStatus_To_api_ComponentStatus(in *ComponentStatus, out *newer.ComponentStatus, s conversion.Scope) error { +func convert_v1_ComponentStatus_To_api_ComponentStatus(in *ComponentStatus, out *api.ComponentStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ComponentStatus))(in) } @@ -158,7 +158,7 @@ func convert_v1_ComponentStatus_To_api_ComponentStatus(in *ComponentStatus, out return err } if in.Conditions != nil { - out.Conditions = make([]newer.ComponentCondition, len(in.Conditions)) + out.Conditions = make([]api.ComponentCondition, len(in.Conditions)) for i := range in.Conditions { if err := convert_v1_ComponentCondition_To_api_ComponentCondition(&in.Conditions[i], &out.Conditions[i], s); err != nil { return err @@ -170,9 +170,9 @@ func convert_v1_ComponentStatus_To_api_ComponentStatus(in *ComponentStatus, out return nil } -func convert_api_ComponentStatus_To_v1_ComponentStatus(in *newer.ComponentStatus, out *ComponentStatus, s conversion.Scope) error { +func convert_api_ComponentStatus_To_v1_ComponentStatus(in *api.ComponentStatus, out *ComponentStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ComponentStatus))(in) + defaulting.(func(*api.ComponentStatus))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -193,7 +193,7 @@ func convert_api_ComponentStatus_To_v1_ComponentStatus(in *newer.ComponentStatus return nil } -func convert_v1_ComponentStatusList_To_api_ComponentStatusList(in *ComponentStatusList, out *newer.ComponentStatusList, s conversion.Scope) error { +func convert_v1_ComponentStatusList_To_api_ComponentStatusList(in *ComponentStatusList, out *api.ComponentStatusList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ComponentStatusList))(in) } @@ -204,7 +204,7 @@ func convert_v1_ComponentStatusList_To_api_ComponentStatusList(in *ComponentStat return err } if in.Items != nil { - out.Items = make([]newer.ComponentStatus, len(in.Items)) + out.Items = make([]api.ComponentStatus, len(in.Items)) for i := range in.Items { if err := convert_v1_ComponentStatus_To_api_ComponentStatus(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -216,9 +216,9 @@ func convert_v1_ComponentStatusList_To_api_ComponentStatusList(in *ComponentStat return nil } -func convert_api_ComponentStatusList_To_v1_ComponentStatusList(in *newer.ComponentStatusList, out *ComponentStatusList, s conversion.Scope) error { +func convert_api_ComponentStatusList_To_v1_ComponentStatusList(in *api.ComponentStatusList, out *ComponentStatusList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ComponentStatusList))(in) + defaulting.(func(*api.ComponentStatusList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -239,7 +239,7 @@ func convert_api_ComponentStatusList_To_v1_ComponentStatusList(in *newer.Compone return nil } -func convert_v1_Container_To_api_Container(in *Container, out *newer.Container, s conversion.Scope) error { +func convert_v1_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) } @@ -263,7 +263,7 @@ func convert_v1_Container_To_api_Container(in *Container, out *newer.Container, } 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_v1_ContainerPort_To_api_ContainerPort(&in.Ports[i], &out.Ports[i], s); err != nil { return err @@ -273,7 +273,7 @@ func convert_v1_Container_To_api_Container(in *Container, out *newer.Container, out.Ports = nil } 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_v1_EnvVar_To_api_EnvVar(&in.Env[i], &out.Env[i], s); err != nil { return err @@ -286,7 +286,7 @@ func convert_v1_Container_To_api_Container(in *Container, out *newer.Container, 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_v1_VolumeMount_To_api_VolumeMount(&in.VolumeMounts[i], &out.VolumeMounts[i], s); err != nil { return err @@ -296,7 +296,7 @@ func convert_v1_Container_To_api_Container(in *Container, out *newer.Container, out.VolumeMounts = nil } if in.LivenessProbe != nil { - out.LivenessProbe = new(newer.Probe) + out.LivenessProbe = new(api.Probe) if err := convert_v1_Probe_To_api_Probe(in.LivenessProbe, out.LivenessProbe, s); err != nil { return err } @@ -304,7 +304,7 @@ func convert_v1_Container_To_api_Container(in *Container, out *newer.Container, out.LivenessProbe = nil } if in.ReadinessProbe != nil { - out.ReadinessProbe = new(newer.Probe) + out.ReadinessProbe = new(api.Probe) if err := convert_v1_Probe_To_api_Probe(in.ReadinessProbe, out.ReadinessProbe, s); err != nil { return err } @@ -312,7 +312,7 @@ func convert_v1_Container_To_api_Container(in *Container, out *newer.Container, out.ReadinessProbe = nil } if in.Lifecycle != nil { - out.Lifecycle = new(newer.Lifecycle) + out.Lifecycle = new(api.Lifecycle) if err := convert_v1_Lifecycle_To_api_Lifecycle(in.Lifecycle, out.Lifecycle, s); err != nil { return err } @@ -320,9 +320,9 @@ func convert_v1_Container_To_api_Container(in *Container, out *newer.Container, out.Lifecycle = nil } out.TerminationMessagePath = in.TerminationMessagePath - out.ImagePullPolicy = newer.PullPolicy(in.ImagePullPolicy) + out.ImagePullPolicy = api.PullPolicy(in.ImagePullPolicy) if in.SecurityContext != nil { - out.SecurityContext = new(newer.SecurityContext) + out.SecurityContext = new(api.SecurityContext) if err := convert_v1_SecurityContext_To_api_SecurityContext(in.SecurityContext, out.SecurityContext, s); err != nil { return err } @@ -332,9 +332,9 @@ func convert_v1_Container_To_api_Container(in *Container, out *newer.Container, return nil } -func convert_api_Container_To_v1_Container(in *newer.Container, out *Container, s conversion.Scope) error { +func convert_api_Container_To_v1_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 @@ -425,21 +425,21 @@ func convert_api_Container_To_v1_Container(in *newer.Container, out *Container, return nil } -func convert_v1_ContainerPort_To_api_ContainerPort(in *ContainerPort, out *newer.ContainerPort, s conversion.Scope) error { +func convert_v1_ContainerPort_To_api_ContainerPort(in *ContainerPort, out *api.ContainerPort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerPort))(in) } out.Name = in.Name out.HostPort = in.HostPort out.ContainerPort = in.ContainerPort - out.Protocol = newer.Protocol(in.Protocol) + out.Protocol = api.Protocol(in.Protocol) out.HostIP = in.HostIP return nil } -func convert_api_ContainerPort_To_v1_ContainerPort(in *newer.ContainerPort, out *ContainerPort, s conversion.Scope) error { +func convert_api_ContainerPort_To_v1_ContainerPort(in *api.ContainerPort, out *ContainerPort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerPort))(in) + defaulting.(func(*api.ContainerPort))(in) } out.Name = in.Name out.HostPort = in.HostPort @@ -449,12 +449,12 @@ func convert_api_ContainerPort_To_v1_ContainerPort(in *newer.ContainerPort, out return nil } -func convert_v1_ContainerState_To_api_ContainerState(in *ContainerState, out *newer.ContainerState, s conversion.Scope) error { +func convert_v1_ContainerState_To_api_ContainerState(in *ContainerState, out *api.ContainerState, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerState))(in) } if in.Waiting != nil { - out.Waiting = new(newer.ContainerStateWaiting) + out.Waiting = new(api.ContainerStateWaiting) if err := convert_v1_ContainerStateWaiting_To_api_ContainerStateWaiting(in.Waiting, out.Waiting, s); err != nil { return err } @@ -462,7 +462,7 @@ func convert_v1_ContainerState_To_api_ContainerState(in *ContainerState, out *ne out.Waiting = nil } if in.Running != nil { - out.Running = new(newer.ContainerStateRunning) + out.Running = new(api.ContainerStateRunning) if err := convert_v1_ContainerStateRunning_To_api_ContainerStateRunning(in.Running, out.Running, s); err != nil { return err } @@ -470,7 +470,7 @@ func convert_v1_ContainerState_To_api_ContainerState(in *ContainerState, out *ne out.Running = nil } if in.Termination != nil { - out.Termination = new(newer.ContainerStateTerminated) + out.Termination = new(api.ContainerStateTerminated) if err := convert_v1_ContainerStateTerminated_To_api_ContainerStateTerminated(in.Termination, out.Termination, s); err != nil { return err } @@ -480,9 +480,9 @@ func convert_v1_ContainerState_To_api_ContainerState(in *ContainerState, out *ne return nil } -func convert_api_ContainerState_To_v1_ContainerState(in *newer.ContainerState, out *ContainerState, s conversion.Scope) error { +func convert_api_ContainerState_To_v1_ContainerState(in *api.ContainerState, out *ContainerState, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerState))(in) + defaulting.(func(*api.ContainerState))(in) } if in.Waiting != nil { out.Waiting = new(ContainerStateWaiting) @@ -511,7 +511,7 @@ func convert_api_ContainerState_To_v1_ContainerState(in *newer.ContainerState, o return nil } -func convert_v1_ContainerStateRunning_To_api_ContainerStateRunning(in *ContainerStateRunning, out *newer.ContainerStateRunning, s conversion.Scope) error { +func convert_v1_ContainerStateRunning_To_api_ContainerStateRunning(in *ContainerStateRunning, out *api.ContainerStateRunning, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerStateRunning))(in) } @@ -521,9 +521,9 @@ func convert_v1_ContainerStateRunning_To_api_ContainerStateRunning(in *Container return nil } -func convert_api_ContainerStateRunning_To_v1_ContainerStateRunning(in *newer.ContainerStateRunning, out *ContainerStateRunning, s conversion.Scope) error { +func convert_api_ContainerStateRunning_To_v1_ContainerStateRunning(in *api.ContainerStateRunning, out *ContainerStateRunning, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerStateRunning))(in) + defaulting.(func(*api.ContainerStateRunning))(in) } if err := s.Convert(&in.StartedAt, &out.StartedAt, 0); err != nil { return err @@ -531,7 +531,7 @@ func convert_api_ContainerStateRunning_To_v1_ContainerStateRunning(in *newer.Con return nil } -func convert_v1_ContainerStateTerminated_To_api_ContainerStateTerminated(in *ContainerStateTerminated, out *newer.ContainerStateTerminated, s conversion.Scope) error { +func convert_v1_ContainerStateTerminated_To_api_ContainerStateTerminated(in *ContainerStateTerminated, out *api.ContainerStateTerminated, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerStateTerminated))(in) } @@ -549,9 +549,9 @@ func convert_v1_ContainerStateTerminated_To_api_ContainerStateTerminated(in *Con return nil } -func convert_api_ContainerStateTerminated_To_v1_ContainerStateTerminated(in *newer.ContainerStateTerminated, out *ContainerStateTerminated, s conversion.Scope) error { +func convert_api_ContainerStateTerminated_To_v1_ContainerStateTerminated(in *api.ContainerStateTerminated, out *ContainerStateTerminated, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerStateTerminated))(in) + defaulting.(func(*api.ContainerStateTerminated))(in) } out.ExitCode = in.ExitCode out.Signal = in.Signal @@ -567,7 +567,7 @@ func convert_api_ContainerStateTerminated_To_v1_ContainerStateTerminated(in *new return nil } -func convert_v1_ContainerStateWaiting_To_api_ContainerStateWaiting(in *ContainerStateWaiting, out *newer.ContainerStateWaiting, s conversion.Scope) error { +func convert_v1_ContainerStateWaiting_To_api_ContainerStateWaiting(in *ContainerStateWaiting, out *api.ContainerStateWaiting, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerStateWaiting))(in) } @@ -575,15 +575,15 @@ func convert_v1_ContainerStateWaiting_To_api_ContainerStateWaiting(in *Container return nil } -func convert_api_ContainerStateWaiting_To_v1_ContainerStateWaiting(in *newer.ContainerStateWaiting, out *ContainerStateWaiting, s conversion.Scope) error { +func convert_api_ContainerStateWaiting_To_v1_ContainerStateWaiting(in *api.ContainerStateWaiting, out *ContainerStateWaiting, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerStateWaiting))(in) + defaulting.(func(*api.ContainerStateWaiting))(in) } out.Reason = in.Reason return nil } -func convert_v1_ContainerStatus_To_api_ContainerStatus(in *ContainerStatus, out *newer.ContainerStatus, s conversion.Scope) error { +func convert_v1_ContainerStatus_To_api_ContainerStatus(in *ContainerStatus, out *api.ContainerStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerStatus))(in) } @@ -602,9 +602,9 @@ func convert_v1_ContainerStatus_To_api_ContainerStatus(in *ContainerStatus, out return nil } -func convert_api_ContainerStatus_To_v1_ContainerStatus(in *newer.ContainerStatus, out *ContainerStatus, s conversion.Scope) error { +func convert_api_ContainerStatus_To_v1_ContainerStatus(in *api.ContainerStatus, out *ContainerStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerStatus))(in) + defaulting.(func(*api.ContainerStatus))(in) } out.Name = in.Name if err := convert_api_ContainerState_To_v1_ContainerState(&in.State, &out.State, s); err != nil { @@ -621,7 +621,7 @@ func convert_api_ContainerStatus_To_v1_ContainerStatus(in *newer.ContainerStatus return nil } -func convert_v1_DeleteOptions_To_api_DeleteOptions(in *DeleteOptions, out *newer.DeleteOptions, s conversion.Scope) error { +func convert_v1_DeleteOptions_To_api_DeleteOptions(in *DeleteOptions, out *api.DeleteOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*DeleteOptions))(in) } @@ -637,9 +637,9 @@ func convert_v1_DeleteOptions_To_api_DeleteOptions(in *DeleteOptions, out *newer return nil } -func convert_api_DeleteOptions_To_v1_DeleteOptions(in *newer.DeleteOptions, out *DeleteOptions, s conversion.Scope) error { +func convert_api_DeleteOptions_To_v1_DeleteOptions(in *api.DeleteOptions, out *DeleteOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.DeleteOptions))(in) + defaulting.(func(*api.DeleteOptions))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -653,29 +653,29 @@ func convert_api_DeleteOptions_To_v1_DeleteOptions(in *newer.DeleteOptions, out return nil } -func convert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *EmptyDirVolumeSource, out *newer.EmptyDirVolumeSource, s conversion.Scope) error { +func convert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *EmptyDirVolumeSource, out *api.EmptyDirVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EmptyDirVolumeSource))(in) } - out.Medium = newer.StorageMedium(in.Medium) + out.Medium = api.StorageMedium(in.Medium) return nil } -func convert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in *newer.EmptyDirVolumeSource, out *EmptyDirVolumeSource, s conversion.Scope) error { +func convert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in *api.EmptyDirVolumeSource, out *EmptyDirVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EmptyDirVolumeSource))(in) + defaulting.(func(*api.EmptyDirVolumeSource))(in) } out.Medium = StorageMedium(in.Medium) return nil } -func convert_v1_EndpointAddress_To_api_EndpointAddress(in *EndpointAddress, out *newer.EndpointAddress, s conversion.Scope) error { +func convert_v1_EndpointAddress_To_api_EndpointAddress(in *EndpointAddress, out *api.EndpointAddress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EndpointAddress))(in) } out.IP = in.IP if in.TargetRef != nil { - out.TargetRef = new(newer.ObjectReference) + out.TargetRef = new(api.ObjectReference) if err := convert_v1_ObjectReference_To_api_ObjectReference(in.TargetRef, out.TargetRef, s); err != nil { return err } @@ -685,9 +685,9 @@ func convert_v1_EndpointAddress_To_api_EndpointAddress(in *EndpointAddress, out return nil } -func convert_api_EndpointAddress_To_v1_EndpointAddress(in *newer.EndpointAddress, out *EndpointAddress, s conversion.Scope) error { +func convert_api_EndpointAddress_To_v1_EndpointAddress(in *api.EndpointAddress, out *EndpointAddress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EndpointAddress))(in) + defaulting.(func(*api.EndpointAddress))(in) } out.IP = in.IP if in.TargetRef != nil { @@ -701,19 +701,19 @@ func convert_api_EndpointAddress_To_v1_EndpointAddress(in *newer.EndpointAddress return nil } -func convert_v1_EndpointPort_To_api_EndpointPort(in *EndpointPort, out *newer.EndpointPort, s conversion.Scope) error { +func convert_v1_EndpointPort_To_api_EndpointPort(in *EndpointPort, out *api.EndpointPort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EndpointPort))(in) } out.Name = in.Name out.Port = in.Port - out.Protocol = newer.Protocol(in.Protocol) + out.Protocol = api.Protocol(in.Protocol) return nil } -func convert_api_EndpointPort_To_v1_EndpointPort(in *newer.EndpointPort, out *EndpointPort, s conversion.Scope) error { +func convert_api_EndpointPort_To_v1_EndpointPort(in *api.EndpointPort, out *EndpointPort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EndpointPort))(in) + defaulting.(func(*api.EndpointPort))(in) } out.Name = in.Name out.Port = in.Port @@ -721,12 +721,12 @@ func convert_api_EndpointPort_To_v1_EndpointPort(in *newer.EndpointPort, out *En return nil } -func convert_v1_EndpointSubset_To_api_EndpointSubset(in *EndpointSubset, out *newer.EndpointSubset, s conversion.Scope) error { +func convert_v1_EndpointSubset_To_api_EndpointSubset(in *EndpointSubset, out *api.EndpointSubset, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EndpointSubset))(in) } if in.Addresses != nil { - out.Addresses = make([]newer.EndpointAddress, len(in.Addresses)) + out.Addresses = make([]api.EndpointAddress, len(in.Addresses)) for i := range in.Addresses { if err := convert_v1_EndpointAddress_To_api_EndpointAddress(&in.Addresses[i], &out.Addresses[i], s); err != nil { return err @@ -736,7 +736,7 @@ func convert_v1_EndpointSubset_To_api_EndpointSubset(in *EndpointSubset, out *ne out.Addresses = nil } if in.Ports != nil { - out.Ports = make([]newer.EndpointPort, len(in.Ports)) + out.Ports = make([]api.EndpointPort, len(in.Ports)) for i := range in.Ports { if err := convert_v1_EndpointPort_To_api_EndpointPort(&in.Ports[i], &out.Ports[i], s); err != nil { return err @@ -748,9 +748,9 @@ func convert_v1_EndpointSubset_To_api_EndpointSubset(in *EndpointSubset, out *ne return nil } -func convert_api_EndpointSubset_To_v1_EndpointSubset(in *newer.EndpointSubset, out *EndpointSubset, s conversion.Scope) error { +func convert_api_EndpointSubset_To_v1_EndpointSubset(in *api.EndpointSubset, out *EndpointSubset, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EndpointSubset))(in) + defaulting.(func(*api.EndpointSubset))(in) } if in.Addresses != nil { out.Addresses = make([]EndpointAddress, len(in.Addresses)) @@ -775,7 +775,7 @@ func convert_api_EndpointSubset_To_v1_EndpointSubset(in *newer.EndpointSubset, o return nil } -func convert_v1_Endpoints_To_api_Endpoints(in *Endpoints, out *newer.Endpoints, s conversion.Scope) error { +func convert_v1_Endpoints_To_api_Endpoints(in *Endpoints, out *api.Endpoints, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Endpoints))(in) } @@ -786,7 +786,7 @@ func convert_v1_Endpoints_To_api_Endpoints(in *Endpoints, out *newer.Endpoints, return err } if in.Subsets != nil { - out.Subsets = make([]newer.EndpointSubset, len(in.Subsets)) + out.Subsets = make([]api.EndpointSubset, len(in.Subsets)) for i := range in.Subsets { if err := convert_v1_EndpointSubset_To_api_EndpointSubset(&in.Subsets[i], &out.Subsets[i], s); err != nil { return err @@ -798,9 +798,9 @@ func convert_v1_Endpoints_To_api_Endpoints(in *Endpoints, out *newer.Endpoints, return nil } -func convert_api_Endpoints_To_v1_Endpoints(in *newer.Endpoints, out *Endpoints, s conversion.Scope) error { +func convert_api_Endpoints_To_v1_Endpoints(in *api.Endpoints, out *Endpoints, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Endpoints))(in) + defaulting.(func(*api.Endpoints))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -821,7 +821,7 @@ func convert_api_Endpoints_To_v1_Endpoints(in *newer.Endpoints, out *Endpoints, return nil } -func convert_v1_EndpointsList_To_api_EndpointsList(in *EndpointsList, out *newer.EndpointsList, s conversion.Scope) error { +func convert_v1_EndpointsList_To_api_EndpointsList(in *EndpointsList, out *api.EndpointsList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EndpointsList))(in) } @@ -832,7 +832,7 @@ func convert_v1_EndpointsList_To_api_EndpointsList(in *EndpointsList, out *newer return err } if in.Items != nil { - out.Items = make([]newer.Endpoints, len(in.Items)) + out.Items = make([]api.Endpoints, len(in.Items)) for i := range in.Items { if err := convert_v1_Endpoints_To_api_Endpoints(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -844,9 +844,9 @@ func convert_v1_EndpointsList_To_api_EndpointsList(in *EndpointsList, out *newer return nil } -func convert_api_EndpointsList_To_v1_EndpointsList(in *newer.EndpointsList, out *EndpointsList, s conversion.Scope) error { +func convert_api_EndpointsList_To_v1_EndpointsList(in *api.EndpointsList, out *EndpointsList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EndpointsList))(in) + defaulting.(func(*api.EndpointsList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -867,14 +867,14 @@ func convert_api_EndpointsList_To_v1_EndpointsList(in *newer.EndpointsList, out return nil } -func convert_v1_EnvVar_To_api_EnvVar(in *EnvVar, out *newer.EnvVar, s conversion.Scope) error { +func convert_v1_EnvVar_To_api_EnvVar(in *EnvVar, out *api.EnvVar, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EnvVar))(in) } out.Name = in.Name out.Value = in.Value if in.ValueFrom != nil { - out.ValueFrom = new(newer.EnvVarSource) + out.ValueFrom = new(api.EnvVarSource) if err := convert_v1_EnvVarSource_To_api_EnvVarSource(in.ValueFrom, out.ValueFrom, s); err != nil { return err } @@ -884,9 +884,9 @@ func convert_v1_EnvVar_To_api_EnvVar(in *EnvVar, out *newer.EnvVar, s conversion return nil } -func convert_api_EnvVar_To_v1_EnvVar(in *newer.EnvVar, out *EnvVar, s conversion.Scope) error { +func convert_api_EnvVar_To_v1_EnvVar(in *api.EnvVar, out *EnvVar, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EnvVar))(in) + defaulting.(func(*api.EnvVar))(in) } out.Name = in.Name out.Value = in.Value @@ -901,12 +901,12 @@ func convert_api_EnvVar_To_v1_EnvVar(in *newer.EnvVar, out *EnvVar, s conversion return nil } -func convert_v1_EnvVarSource_To_api_EnvVarSource(in *EnvVarSource, out *newer.EnvVarSource, s conversion.Scope) error { +func convert_v1_EnvVarSource_To_api_EnvVarSource(in *EnvVarSource, out *api.EnvVarSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EnvVarSource))(in) } if in.FieldRef != nil { - out.FieldRef = new(newer.ObjectFieldSelector) + out.FieldRef = new(api.ObjectFieldSelector) if err := convert_v1_ObjectFieldSelector_To_api_ObjectFieldSelector(in.FieldRef, out.FieldRef, s); err != nil { return err } @@ -916,9 +916,9 @@ func convert_v1_EnvVarSource_To_api_EnvVarSource(in *EnvVarSource, out *newer.En return nil } -func convert_api_EnvVarSource_To_v1_EnvVarSource(in *newer.EnvVarSource, out *EnvVarSource, s conversion.Scope) error { +func convert_api_EnvVarSource_To_v1_EnvVarSource(in *api.EnvVarSource, out *EnvVarSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EnvVarSource))(in) + defaulting.(func(*api.EnvVarSource))(in) } if in.FieldRef != nil { out.FieldRef = new(ObjectFieldSelector) @@ -931,7 +931,7 @@ func convert_api_EnvVarSource_To_v1_EnvVarSource(in *newer.EnvVarSource, out *En return nil } -func convert_v1_Event_To_api_Event(in *Event, out *newer.Event, s conversion.Scope) error { +func convert_v1_Event_To_api_Event(in *Event, out *api.Event, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Event))(in) } @@ -959,9 +959,9 @@ func convert_v1_Event_To_api_Event(in *Event, out *newer.Event, s conversion.Sco return nil } -func convert_api_Event_To_v1_Event(in *newer.Event, out *Event, s conversion.Scope) error { +func convert_api_Event_To_v1_Event(in *api.Event, out *Event, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Event))(in) + defaulting.(func(*api.Event))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -987,7 +987,7 @@ func convert_api_Event_To_v1_Event(in *newer.Event, out *Event, s conversion.Sco return nil } -func convert_v1_EventList_To_api_EventList(in *EventList, out *newer.EventList, s conversion.Scope) error { +func convert_v1_EventList_To_api_EventList(in *EventList, out *api.EventList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EventList))(in) } @@ -998,7 +998,7 @@ func convert_v1_EventList_To_api_EventList(in *EventList, out *newer.EventList, return err } if in.Items != nil { - out.Items = make([]newer.Event, len(in.Items)) + out.Items = make([]api.Event, len(in.Items)) for i := range in.Items { if err := convert_v1_Event_To_api_Event(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -1010,9 +1010,9 @@ func convert_v1_EventList_To_api_EventList(in *EventList, out *newer.EventList, return nil } -func convert_api_EventList_To_v1_EventList(in *newer.EventList, out *EventList, s conversion.Scope) error { +func convert_api_EventList_To_v1_EventList(in *api.EventList, out *EventList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EventList))(in) + defaulting.(func(*api.EventList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1033,7 +1033,7 @@ func convert_api_EventList_To_v1_EventList(in *newer.EventList, out *EventList, return nil } -func convert_v1_EventSource_To_api_EventSource(in *EventSource, out *newer.EventSource, s conversion.Scope) error { +func convert_v1_EventSource_To_api_EventSource(in *EventSource, out *api.EventSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EventSource))(in) } @@ -1042,16 +1042,16 @@ func convert_v1_EventSource_To_api_EventSource(in *EventSource, out *newer.Event return nil } -func convert_api_EventSource_To_v1_EventSource(in *newer.EventSource, out *EventSource, s conversion.Scope) error { +func convert_api_EventSource_To_v1_EventSource(in *api.EventSource, out *EventSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EventSource))(in) + defaulting.(func(*api.EventSource))(in) } out.Component = in.Component out.Host = in.Host return nil } -func convert_v1_ExecAction_To_api_ExecAction(in *ExecAction, out *newer.ExecAction, s conversion.Scope) error { +func convert_v1_ExecAction_To_api_ExecAction(in *ExecAction, out *api.ExecAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ExecAction))(in) } @@ -1066,9 +1066,9 @@ func convert_v1_ExecAction_To_api_ExecAction(in *ExecAction, out *newer.ExecActi return nil } -func convert_api_ExecAction_To_v1_ExecAction(in *newer.ExecAction, out *ExecAction, s conversion.Scope) error { +func convert_api_ExecAction_To_v1_ExecAction(in *api.ExecAction, out *ExecAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ExecAction))(in) + defaulting.(func(*api.ExecAction))(in) } if in.Command != nil { out.Command = make([]string, len(in.Command)) @@ -1081,7 +1081,7 @@ func convert_api_ExecAction_To_v1_ExecAction(in *newer.ExecAction, out *ExecActi return nil } -func convert_v1_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in *GCEPersistentDiskVolumeSource, out *newer.GCEPersistentDiskVolumeSource, s conversion.Scope) error { +func convert_v1_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in *GCEPersistentDiskVolumeSource, out *api.GCEPersistentDiskVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*GCEPersistentDiskVolumeSource))(in) } @@ -1092,9 +1092,9 @@ func convert_v1_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSour return nil } -func convert_api_GCEPersistentDiskVolumeSource_To_v1_GCEPersistentDiskVolumeSource(in *newer.GCEPersistentDiskVolumeSource, out *GCEPersistentDiskVolumeSource, s conversion.Scope) error { +func convert_api_GCEPersistentDiskVolumeSource_To_v1_GCEPersistentDiskVolumeSource(in *api.GCEPersistentDiskVolumeSource, out *GCEPersistentDiskVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.GCEPersistentDiskVolumeSource))(in) + defaulting.(func(*api.GCEPersistentDiskVolumeSource))(in) } out.PDName = in.PDName out.FSType = in.FSType @@ -1103,7 +1103,7 @@ func convert_api_GCEPersistentDiskVolumeSource_To_v1_GCEPersistentDiskVolumeSour return nil } -func convert_v1_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in *GitRepoVolumeSource, out *newer.GitRepoVolumeSource, s conversion.Scope) error { +func convert_v1_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in *GitRepoVolumeSource, out *api.GitRepoVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*GitRepoVolumeSource))(in) } @@ -1112,16 +1112,16 @@ func convert_v1_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in *GitRepoVolume return nil } -func convert_api_GitRepoVolumeSource_To_v1_GitRepoVolumeSource(in *newer.GitRepoVolumeSource, out *GitRepoVolumeSource, s conversion.Scope) error { +func convert_api_GitRepoVolumeSource_To_v1_GitRepoVolumeSource(in *api.GitRepoVolumeSource, out *GitRepoVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.GitRepoVolumeSource))(in) + defaulting.(func(*api.GitRepoVolumeSource))(in) } out.Repository = in.Repository out.Revision = in.Revision return nil } -func convert_v1_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in *GlusterfsVolumeSource, out *newer.GlusterfsVolumeSource, s conversion.Scope) error { +func convert_v1_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in *GlusterfsVolumeSource, out *api.GlusterfsVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*GlusterfsVolumeSource))(in) } @@ -1131,9 +1131,9 @@ func convert_v1_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in *Glusterfs return nil } -func convert_api_GlusterfsVolumeSource_To_v1_GlusterfsVolumeSource(in *newer.GlusterfsVolumeSource, out *GlusterfsVolumeSource, s conversion.Scope) error { +func convert_api_GlusterfsVolumeSource_To_v1_GlusterfsVolumeSource(in *api.GlusterfsVolumeSource, out *GlusterfsVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.GlusterfsVolumeSource))(in) + defaulting.(func(*api.GlusterfsVolumeSource))(in) } out.EndpointsName = in.EndpointsName out.Path = in.Path @@ -1141,7 +1141,7 @@ func convert_api_GlusterfsVolumeSource_To_v1_GlusterfsVolumeSource(in *newer.Glu return nil } -func convert_v1_HTTPGetAction_To_api_HTTPGetAction(in *HTTPGetAction, out *newer.HTTPGetAction, s conversion.Scope) error { +func convert_v1_HTTPGetAction_To_api_HTTPGetAction(in *HTTPGetAction, out *api.HTTPGetAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*HTTPGetAction))(in) } @@ -1153,9 +1153,9 @@ func convert_v1_HTTPGetAction_To_api_HTTPGetAction(in *HTTPGetAction, out *newer return nil } -func convert_api_HTTPGetAction_To_v1_HTTPGetAction(in *newer.HTTPGetAction, out *HTTPGetAction, s conversion.Scope) error { +func convert_api_HTTPGetAction_To_v1_HTTPGetAction(in *api.HTTPGetAction, out *HTTPGetAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.HTTPGetAction))(in) + defaulting.(func(*api.HTTPGetAction))(in) } out.Path = in.Path if err := s.Convert(&in.Port, &out.Port, 0); err != nil { @@ -1165,12 +1165,12 @@ func convert_api_HTTPGetAction_To_v1_HTTPGetAction(in *newer.HTTPGetAction, out return nil } -func convert_v1_Handler_To_api_Handler(in *Handler, out *newer.Handler, s conversion.Scope) error { +func convert_v1_Handler_To_api_Handler(in *Handler, out *api.Handler, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Handler))(in) } if in.Exec != nil { - out.Exec = new(newer.ExecAction) + out.Exec = new(api.ExecAction) if err := convert_v1_ExecAction_To_api_ExecAction(in.Exec, out.Exec, s); err != nil { return err } @@ -1178,7 +1178,7 @@ func convert_v1_Handler_To_api_Handler(in *Handler, out *newer.Handler, s conver out.Exec = nil } if in.HTTPGet != nil { - out.HTTPGet = new(newer.HTTPGetAction) + out.HTTPGet = new(api.HTTPGetAction) if err := convert_v1_HTTPGetAction_To_api_HTTPGetAction(in.HTTPGet, out.HTTPGet, s); err != nil { return err } @@ -1186,7 +1186,7 @@ func convert_v1_Handler_To_api_Handler(in *Handler, out *newer.Handler, s conver out.HTTPGet = nil } if in.TCPSocket != nil { - out.TCPSocket = new(newer.TCPSocketAction) + out.TCPSocket = new(api.TCPSocketAction) if err := convert_v1_TCPSocketAction_To_api_TCPSocketAction(in.TCPSocket, out.TCPSocket, s); err != nil { return err } @@ -1196,9 +1196,9 @@ func convert_v1_Handler_To_api_Handler(in *Handler, out *newer.Handler, s conver return nil } -func convert_api_Handler_To_v1_Handler(in *newer.Handler, out *Handler, s conversion.Scope) error { +func convert_api_Handler_To_v1_Handler(in *api.Handler, out *Handler, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Handler))(in) + defaulting.(func(*api.Handler))(in) } if in.Exec != nil { out.Exec = new(ExecAction) @@ -1227,7 +1227,7 @@ func convert_api_Handler_To_v1_Handler(in *newer.Handler, out *Handler, s conver return nil } -func convert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource(in *HostPathVolumeSource, out *newer.HostPathVolumeSource, s conversion.Scope) error { +func convert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource(in *HostPathVolumeSource, out *api.HostPathVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*HostPathVolumeSource))(in) } @@ -1235,15 +1235,15 @@ func convert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource(in *HostPathVol return nil } -func convert_api_HostPathVolumeSource_To_v1_HostPathVolumeSource(in *newer.HostPathVolumeSource, out *HostPathVolumeSource, s conversion.Scope) error { +func convert_api_HostPathVolumeSource_To_v1_HostPathVolumeSource(in *api.HostPathVolumeSource, out *HostPathVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.HostPathVolumeSource))(in) + defaulting.(func(*api.HostPathVolumeSource))(in) } out.Path = in.Path return nil } -func convert_v1_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in *ISCSIVolumeSource, out *newer.ISCSIVolumeSource, s conversion.Scope) error { +func convert_v1_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in *ISCSIVolumeSource, out *api.ISCSIVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ISCSIVolumeSource))(in) } @@ -1255,9 +1255,9 @@ func convert_v1_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in *ISCSIVolumeSource return nil } -func convert_api_ISCSIVolumeSource_To_v1_ISCSIVolumeSource(in *newer.ISCSIVolumeSource, out *ISCSIVolumeSource, s conversion.Scope) error { +func convert_api_ISCSIVolumeSource_To_v1_ISCSIVolumeSource(in *api.ISCSIVolumeSource, out *ISCSIVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ISCSIVolumeSource))(in) + defaulting.(func(*api.ISCSIVolumeSource))(in) } out.TargetPortal = in.TargetPortal out.IQN = in.IQN @@ -1267,12 +1267,12 @@ func convert_api_ISCSIVolumeSource_To_v1_ISCSIVolumeSource(in *newer.ISCSIVolume return nil } -func convert_v1_Lifecycle_To_api_Lifecycle(in *Lifecycle, out *newer.Lifecycle, s conversion.Scope) error { +func convert_v1_Lifecycle_To_api_Lifecycle(in *Lifecycle, out *api.Lifecycle, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Lifecycle))(in) } if in.PostStart != nil { - out.PostStart = new(newer.Handler) + out.PostStart = new(api.Handler) if err := convert_v1_Handler_To_api_Handler(in.PostStart, out.PostStart, s); err != nil { return err } @@ -1280,7 +1280,7 @@ func convert_v1_Lifecycle_To_api_Lifecycle(in *Lifecycle, out *newer.Lifecycle, out.PostStart = nil } if in.PreStop != nil { - out.PreStop = new(newer.Handler) + out.PreStop = new(api.Handler) if err := convert_v1_Handler_To_api_Handler(in.PreStop, out.PreStop, s); err != nil { return err } @@ -1290,9 +1290,9 @@ func convert_v1_Lifecycle_To_api_Lifecycle(in *Lifecycle, out *newer.Lifecycle, return nil } -func convert_api_Lifecycle_To_v1_Lifecycle(in *newer.Lifecycle, out *Lifecycle, s conversion.Scope) error { +func convert_api_Lifecycle_To_v1_Lifecycle(in *api.Lifecycle, out *Lifecycle, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Lifecycle))(in) + defaulting.(func(*api.Lifecycle))(in) } if in.PostStart != nil { out.PostStart = new(Handler) @@ -1313,7 +1313,7 @@ func convert_api_Lifecycle_To_v1_Lifecycle(in *newer.Lifecycle, out *Lifecycle, return nil } -func convert_v1_LimitRange_To_api_LimitRange(in *LimitRange, out *newer.LimitRange, s conversion.Scope) error { +func convert_v1_LimitRange_To_api_LimitRange(in *LimitRange, out *api.LimitRange, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*LimitRange))(in) } @@ -1329,9 +1329,9 @@ func convert_v1_LimitRange_To_api_LimitRange(in *LimitRange, out *newer.LimitRan return nil } -func convert_api_LimitRange_To_v1_LimitRange(in *newer.LimitRange, out *LimitRange, s conversion.Scope) error { +func convert_api_LimitRange_To_v1_LimitRange(in *api.LimitRange, out *LimitRange, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.LimitRange))(in) + defaulting.(func(*api.LimitRange))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1345,43 +1345,43 @@ func convert_api_LimitRange_To_v1_LimitRange(in *newer.LimitRange, out *LimitRan return nil } -func convert_v1_LimitRangeItem_To_api_LimitRangeItem(in *LimitRangeItem, out *newer.LimitRangeItem, s conversion.Scope) error { +func convert_v1_LimitRangeItem_To_api_LimitRangeItem(in *LimitRangeItem, out *api.LimitRangeItem, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*LimitRangeItem))(in) } - out.Type = newer.LimitType(in.Type) + out.Type = api.LimitType(in.Type) if in.Max != nil { - out.Max = make(map[newer.ResourceName]resource.Quantity) + out.Max = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Max { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Max[newer.ResourceName(key)] = newVal + out.Max[api.ResourceName(key)] = newVal } } else { out.Max = nil } if in.Min != nil { - out.Min = make(map[newer.ResourceName]resource.Quantity) + out.Min = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Min { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Min[newer.ResourceName(key)] = newVal + out.Min[api.ResourceName(key)] = newVal } } else { out.Min = nil } if in.Default != nil { - out.Default = make(map[newer.ResourceName]resource.Quantity) + out.Default = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Default { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Default[newer.ResourceName(key)] = newVal + out.Default[api.ResourceName(key)] = newVal } } else { out.Default = nil @@ -1389,9 +1389,9 @@ func convert_v1_LimitRangeItem_To_api_LimitRangeItem(in *LimitRangeItem, out *ne return nil } -func convert_api_LimitRangeItem_To_v1_LimitRangeItem(in *newer.LimitRangeItem, out *LimitRangeItem, s conversion.Scope) error { +func convert_api_LimitRangeItem_To_v1_LimitRangeItem(in *api.LimitRangeItem, out *LimitRangeItem, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.LimitRangeItem))(in) + defaulting.(func(*api.LimitRangeItem))(in) } out.Type = LimitType(in.Type) if in.Max != nil { @@ -1433,7 +1433,7 @@ func convert_api_LimitRangeItem_To_v1_LimitRangeItem(in *newer.LimitRangeItem, o return nil } -func convert_v1_LimitRangeList_To_api_LimitRangeList(in *LimitRangeList, out *newer.LimitRangeList, s conversion.Scope) error { +func convert_v1_LimitRangeList_To_api_LimitRangeList(in *LimitRangeList, out *api.LimitRangeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*LimitRangeList))(in) } @@ -1444,7 +1444,7 @@ func convert_v1_LimitRangeList_To_api_LimitRangeList(in *LimitRangeList, out *ne return err } if in.Items != nil { - out.Items = make([]newer.LimitRange, len(in.Items)) + out.Items = make([]api.LimitRange, len(in.Items)) for i := range in.Items { if err := convert_v1_LimitRange_To_api_LimitRange(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -1456,9 +1456,9 @@ func convert_v1_LimitRangeList_To_api_LimitRangeList(in *LimitRangeList, out *ne return nil } -func convert_api_LimitRangeList_To_v1_LimitRangeList(in *newer.LimitRangeList, out *LimitRangeList, s conversion.Scope) error { +func convert_api_LimitRangeList_To_v1_LimitRangeList(in *api.LimitRangeList, out *LimitRangeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.LimitRangeList))(in) + defaulting.(func(*api.LimitRangeList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1479,12 +1479,12 @@ func convert_api_LimitRangeList_To_v1_LimitRangeList(in *newer.LimitRangeList, o return nil } -func convert_v1_LimitRangeSpec_To_api_LimitRangeSpec(in *LimitRangeSpec, out *newer.LimitRangeSpec, s conversion.Scope) error { +func convert_v1_LimitRangeSpec_To_api_LimitRangeSpec(in *LimitRangeSpec, out *api.LimitRangeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*LimitRangeSpec))(in) } if in.Limits != nil { - out.Limits = make([]newer.LimitRangeItem, len(in.Limits)) + out.Limits = make([]api.LimitRangeItem, len(in.Limits)) for i := range in.Limits { if err := convert_v1_LimitRangeItem_To_api_LimitRangeItem(&in.Limits[i], &out.Limits[i], s); err != nil { return err @@ -1496,9 +1496,9 @@ func convert_v1_LimitRangeSpec_To_api_LimitRangeSpec(in *LimitRangeSpec, out *ne return nil } -func convert_api_LimitRangeSpec_To_v1_LimitRangeSpec(in *newer.LimitRangeSpec, out *LimitRangeSpec, s conversion.Scope) error { +func convert_api_LimitRangeSpec_To_v1_LimitRangeSpec(in *api.LimitRangeSpec, out *LimitRangeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.LimitRangeSpec))(in) + defaulting.(func(*api.LimitRangeSpec))(in) } if in.Limits != nil { out.Limits = make([]LimitRangeItem, len(in.Limits)) @@ -1513,7 +1513,7 @@ func convert_api_LimitRangeSpec_To_v1_LimitRangeSpec(in *newer.LimitRangeSpec, o return nil } -func convert_v1_List_To_api_List(in *List, out *newer.List, s conversion.Scope) error { +func convert_v1_List_To_api_List(in *List, out *api.List, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*List))(in) } @@ -1529,9 +1529,9 @@ func convert_v1_List_To_api_List(in *List, out *newer.List, s conversion.Scope) return nil } -func convert_api_List_To_v1_List(in *newer.List, out *List, s conversion.Scope) error { +func convert_api_List_To_v1_List(in *api.List, out *List, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.List))(in) + defaulting.(func(*api.List))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1545,7 +1545,7 @@ func convert_api_List_To_v1_List(in *newer.List, out *List, s conversion.Scope) return nil } -func convert_v1_ListMeta_To_api_ListMeta(in *ListMeta, out *newer.ListMeta, s conversion.Scope) error { +func convert_v1_ListMeta_To_api_ListMeta(in *ListMeta, out *api.ListMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ListMeta))(in) } @@ -1554,16 +1554,16 @@ func convert_v1_ListMeta_To_api_ListMeta(in *ListMeta, out *newer.ListMeta, s co return nil } -func convert_api_ListMeta_To_v1_ListMeta(in *newer.ListMeta, out *ListMeta, s conversion.Scope) error { +func convert_api_ListMeta_To_v1_ListMeta(in *api.ListMeta, out *ListMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ListMeta))(in) + defaulting.(func(*api.ListMeta))(in) } out.SelfLink = in.SelfLink out.ResourceVersion = in.ResourceVersion return nil } -func convert_v1_ListOptions_To_api_ListOptions(in *ListOptions, out *newer.ListOptions, s conversion.Scope) error { +func convert_v1_ListOptions_To_api_ListOptions(in *ListOptions, out *api.ListOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ListOptions))(in) } @@ -1581,9 +1581,9 @@ func convert_v1_ListOptions_To_api_ListOptions(in *ListOptions, out *newer.ListO return nil } -func convert_api_ListOptions_To_v1_ListOptions(in *newer.ListOptions, out *ListOptions, s conversion.Scope) error { +func convert_api_ListOptions_To_v1_ListOptions(in *api.ListOptions, out *ListOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ListOptions))(in) + defaulting.(func(*api.ListOptions))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1599,7 +1599,7 @@ func convert_api_ListOptions_To_v1_ListOptions(in *newer.ListOptions, out *ListO return nil } -func convert_v1_LocalObjectReference_To_api_LocalObjectReference(in *LocalObjectReference, out *newer.LocalObjectReference, s conversion.Scope) error { +func convert_v1_LocalObjectReference_To_api_LocalObjectReference(in *LocalObjectReference, out *api.LocalObjectReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*LocalObjectReference))(in) } @@ -1607,15 +1607,15 @@ func convert_v1_LocalObjectReference_To_api_LocalObjectReference(in *LocalObject return nil } -func convert_api_LocalObjectReference_To_v1_LocalObjectReference(in *newer.LocalObjectReference, out *LocalObjectReference, s conversion.Scope) error { +func convert_api_LocalObjectReference_To_v1_LocalObjectReference(in *api.LocalObjectReference, out *LocalObjectReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.LocalObjectReference))(in) + defaulting.(func(*api.LocalObjectReference))(in) } out.Name = in.Name return nil } -func convert_v1_NFSVolumeSource_To_api_NFSVolumeSource(in *NFSVolumeSource, out *newer.NFSVolumeSource, s conversion.Scope) error { +func convert_v1_NFSVolumeSource_To_api_NFSVolumeSource(in *NFSVolumeSource, out *api.NFSVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NFSVolumeSource))(in) } @@ -1625,9 +1625,9 @@ func convert_v1_NFSVolumeSource_To_api_NFSVolumeSource(in *NFSVolumeSource, out return nil } -func convert_api_NFSVolumeSource_To_v1_NFSVolumeSource(in *newer.NFSVolumeSource, out *NFSVolumeSource, s conversion.Scope) error { +func convert_api_NFSVolumeSource_To_v1_NFSVolumeSource(in *api.NFSVolumeSource, out *NFSVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NFSVolumeSource))(in) + defaulting.(func(*api.NFSVolumeSource))(in) } out.Server = in.Server out.Path = in.Path @@ -1635,7 +1635,7 @@ func convert_api_NFSVolumeSource_To_v1_NFSVolumeSource(in *newer.NFSVolumeSource return nil } -func convert_v1_Namespace_To_api_Namespace(in *Namespace, out *newer.Namespace, s conversion.Scope) error { +func convert_v1_Namespace_To_api_Namespace(in *Namespace, out *api.Namespace, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Namespace))(in) } @@ -1654,9 +1654,9 @@ func convert_v1_Namespace_To_api_Namespace(in *Namespace, out *newer.Namespace, return nil } -func convert_api_Namespace_To_v1_Namespace(in *newer.Namespace, out *Namespace, s conversion.Scope) error { +func convert_api_Namespace_To_v1_Namespace(in *api.Namespace, out *Namespace, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Namespace))(in) + defaulting.(func(*api.Namespace))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1673,7 +1673,7 @@ func convert_api_Namespace_To_v1_Namespace(in *newer.Namespace, out *Namespace, return nil } -func convert_v1_NamespaceList_To_api_NamespaceList(in *NamespaceList, out *newer.NamespaceList, s conversion.Scope) error { +func convert_v1_NamespaceList_To_api_NamespaceList(in *NamespaceList, out *api.NamespaceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NamespaceList))(in) } @@ -1684,7 +1684,7 @@ func convert_v1_NamespaceList_To_api_NamespaceList(in *NamespaceList, out *newer return err } if in.Items != nil { - out.Items = make([]newer.Namespace, len(in.Items)) + out.Items = make([]api.Namespace, len(in.Items)) for i := range in.Items { if err := convert_v1_Namespace_To_api_Namespace(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -1696,9 +1696,9 @@ func convert_v1_NamespaceList_To_api_NamespaceList(in *NamespaceList, out *newer return nil } -func convert_api_NamespaceList_To_v1_NamespaceList(in *newer.NamespaceList, out *NamespaceList, s conversion.Scope) error { +func convert_api_NamespaceList_To_v1_NamespaceList(in *api.NamespaceList, out *NamespaceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NamespaceList))(in) + defaulting.(func(*api.NamespaceList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1719,14 +1719,14 @@ func convert_api_NamespaceList_To_v1_NamespaceList(in *newer.NamespaceList, out return nil } -func convert_v1_NamespaceSpec_To_api_NamespaceSpec(in *NamespaceSpec, out *newer.NamespaceSpec, s conversion.Scope) error { +func convert_v1_NamespaceSpec_To_api_NamespaceSpec(in *NamespaceSpec, out *api.NamespaceSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NamespaceSpec))(in) } if in.Finalizers != nil { - out.Finalizers = make([]newer.FinalizerName, len(in.Finalizers)) + out.Finalizers = make([]api.FinalizerName, len(in.Finalizers)) for i := range in.Finalizers { - out.Finalizers[i] = newer.FinalizerName(in.Finalizers[i]) + out.Finalizers[i] = api.FinalizerName(in.Finalizers[i]) } } else { out.Finalizers = nil @@ -1734,9 +1734,9 @@ func convert_v1_NamespaceSpec_To_api_NamespaceSpec(in *NamespaceSpec, out *newer return nil } -func convert_api_NamespaceSpec_To_v1_NamespaceSpec(in *newer.NamespaceSpec, out *NamespaceSpec, s conversion.Scope) error { +func convert_api_NamespaceSpec_To_v1_NamespaceSpec(in *api.NamespaceSpec, out *NamespaceSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NamespaceSpec))(in) + defaulting.(func(*api.NamespaceSpec))(in) } if in.Finalizers != nil { out.Finalizers = make([]FinalizerName, len(in.Finalizers)) @@ -1749,23 +1749,23 @@ func convert_api_NamespaceSpec_To_v1_NamespaceSpec(in *newer.NamespaceSpec, out return nil } -func convert_v1_NamespaceStatus_To_api_NamespaceStatus(in *NamespaceStatus, out *newer.NamespaceStatus, s conversion.Scope) error { +func convert_v1_NamespaceStatus_To_api_NamespaceStatus(in *NamespaceStatus, out *api.NamespaceStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NamespaceStatus))(in) } - out.Phase = newer.NamespacePhase(in.Phase) + out.Phase = api.NamespacePhase(in.Phase) return nil } -func convert_api_NamespaceStatus_To_v1_NamespaceStatus(in *newer.NamespaceStatus, out *NamespaceStatus, s conversion.Scope) error { +func convert_api_NamespaceStatus_To_v1_NamespaceStatus(in *api.NamespaceStatus, out *NamespaceStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NamespaceStatus))(in) + defaulting.(func(*api.NamespaceStatus))(in) } out.Phase = NamespacePhase(in.Phase) return nil } -func convert_v1_Node_To_api_Node(in *Node, out *newer.Node, s conversion.Scope) error { +func convert_v1_Node_To_api_Node(in *Node, out *api.Node, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Node))(in) } @@ -1784,9 +1784,9 @@ func convert_v1_Node_To_api_Node(in *Node, out *newer.Node, s conversion.Scope) return nil } -func convert_api_Node_To_v1_Node(in *newer.Node, out *Node, s conversion.Scope) error { +func convert_api_Node_To_v1_Node(in *api.Node, out *Node, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Node))(in) + defaulting.(func(*api.Node))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1803,30 +1803,30 @@ func convert_api_Node_To_v1_Node(in *newer.Node, out *Node, s conversion.Scope) return nil } -func convert_v1_NodeAddress_To_api_NodeAddress(in *NodeAddress, out *newer.NodeAddress, s conversion.Scope) error { +func convert_v1_NodeAddress_To_api_NodeAddress(in *NodeAddress, out *api.NodeAddress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeAddress))(in) } - out.Type = newer.NodeAddressType(in.Type) + out.Type = api.NodeAddressType(in.Type) out.Address = in.Address return nil } -func convert_api_NodeAddress_To_v1_NodeAddress(in *newer.NodeAddress, out *NodeAddress, s conversion.Scope) error { +func convert_api_NodeAddress_To_v1_NodeAddress(in *api.NodeAddress, out *NodeAddress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeAddress))(in) + defaulting.(func(*api.NodeAddress))(in) } out.Type = NodeAddressType(in.Type) out.Address = in.Address return nil } -func convert_v1_NodeCondition_To_api_NodeCondition(in *NodeCondition, out *newer.NodeCondition, s conversion.Scope) error { +func convert_v1_NodeCondition_To_api_NodeCondition(in *NodeCondition, out *api.NodeCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeCondition))(in) } - out.Type = newer.NodeConditionType(in.Type) - out.Status = newer.ConditionStatus(in.Status) + out.Type = api.NodeConditionType(in.Type) + out.Status = api.ConditionStatus(in.Status) if err := s.Convert(&in.LastHeartbeatTime, &out.LastHeartbeatTime, 0); err != nil { return err } @@ -1838,9 +1838,9 @@ func convert_v1_NodeCondition_To_api_NodeCondition(in *NodeCondition, out *newer return nil } -func convert_api_NodeCondition_To_v1_NodeCondition(in *newer.NodeCondition, out *NodeCondition, s conversion.Scope) error { +func convert_api_NodeCondition_To_v1_NodeCondition(in *api.NodeCondition, out *NodeCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeCondition))(in) + defaulting.(func(*api.NodeCondition))(in) } out.Type = NodeConditionType(in.Type) out.Status = ConditionStatus(in.Status) @@ -1855,7 +1855,7 @@ func convert_api_NodeCondition_To_v1_NodeCondition(in *newer.NodeCondition, out return nil } -func convert_v1_NodeList_To_api_NodeList(in *NodeList, out *newer.NodeList, s conversion.Scope) error { +func convert_v1_NodeList_To_api_NodeList(in *NodeList, out *api.NodeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeList))(in) } @@ -1866,7 +1866,7 @@ func convert_v1_NodeList_To_api_NodeList(in *NodeList, out *newer.NodeList, s co return err } if in.Items != nil { - out.Items = make([]newer.Node, len(in.Items)) + out.Items = make([]api.Node, len(in.Items)) for i := range in.Items { if err := convert_v1_Node_To_api_Node(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -1878,9 +1878,9 @@ func convert_v1_NodeList_To_api_NodeList(in *NodeList, out *newer.NodeList, s co return nil } -func convert_api_NodeList_To_v1_NodeList(in *newer.NodeList, out *NodeList, s conversion.Scope) error { +func convert_api_NodeList_To_v1_NodeList(in *api.NodeList, out *NodeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeList))(in) + defaulting.(func(*api.NodeList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1901,7 +1901,7 @@ func convert_api_NodeList_To_v1_NodeList(in *newer.NodeList, out *NodeList, s co return nil } -func convert_v1_NodeSpec_To_api_NodeSpec(in *NodeSpec, out *newer.NodeSpec, s conversion.Scope) error { +func convert_v1_NodeSpec_To_api_NodeSpec(in *NodeSpec, out *api.NodeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeSpec))(in) } @@ -1911,9 +1911,9 @@ func convert_v1_NodeSpec_To_api_NodeSpec(in *NodeSpec, out *newer.NodeSpec, s co return nil } -func convert_api_NodeSpec_To_v1_NodeSpec(in *newer.NodeSpec, out *NodeSpec, s conversion.Scope) error { +func convert_api_NodeSpec_To_v1_NodeSpec(in *api.NodeSpec, out *NodeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeSpec))(in) + defaulting.(func(*api.NodeSpec))(in) } out.PodCIDR = in.PodCIDR out.ExternalID = in.ExternalID @@ -1921,25 +1921,25 @@ func convert_api_NodeSpec_To_v1_NodeSpec(in *newer.NodeSpec, out *NodeSpec, s co return nil } -func convert_v1_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *newer.NodeStatus, s conversion.Scope) error { +func convert_v1_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *api.NodeStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeStatus))(in) } if in.Capacity != nil { - out.Capacity = make(map[newer.ResourceName]resource.Quantity) + out.Capacity = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Capacity[newer.ResourceName(key)] = newVal + out.Capacity[api.ResourceName(key)] = newVal } } else { out.Capacity = nil } - out.Phase = newer.NodePhase(in.Phase) + out.Phase = api.NodePhase(in.Phase) if in.Conditions != nil { - out.Conditions = make([]newer.NodeCondition, len(in.Conditions)) + out.Conditions = make([]api.NodeCondition, len(in.Conditions)) for i := range in.Conditions { if err := convert_v1_NodeCondition_To_api_NodeCondition(&in.Conditions[i], &out.Conditions[i], s); err != nil { return err @@ -1949,7 +1949,7 @@ func convert_v1_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *newer.NodeStat out.Conditions = nil } if in.Addresses != nil { - out.Addresses = make([]newer.NodeAddress, len(in.Addresses)) + out.Addresses = make([]api.NodeAddress, len(in.Addresses)) for i := range in.Addresses { if err := convert_v1_NodeAddress_To_api_NodeAddress(&in.Addresses[i], &out.Addresses[i], s); err != nil { return err @@ -1964,9 +1964,9 @@ func convert_v1_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *newer.NodeStat return nil } -func convert_api_NodeStatus_To_v1_NodeStatus(in *newer.NodeStatus, out *NodeStatus, s conversion.Scope) error { +func convert_api_NodeStatus_To_v1_NodeStatus(in *api.NodeStatus, out *NodeStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeStatus))(in) + defaulting.(func(*api.NodeStatus))(in) } if in.Capacity != nil { out.Capacity = make(map[ResourceName]resource.Quantity) @@ -2007,7 +2007,7 @@ func convert_api_NodeStatus_To_v1_NodeStatus(in *newer.NodeStatus, out *NodeStat return nil } -func convert_v1_NodeSystemInfo_To_api_NodeSystemInfo(in *NodeSystemInfo, out *newer.NodeSystemInfo, s conversion.Scope) error { +func convert_v1_NodeSystemInfo_To_api_NodeSystemInfo(in *NodeSystemInfo, out *api.NodeSystemInfo, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeSystemInfo))(in) } @@ -2022,9 +2022,9 @@ func convert_v1_NodeSystemInfo_To_api_NodeSystemInfo(in *NodeSystemInfo, out *ne return nil } -func convert_api_NodeSystemInfo_To_v1_NodeSystemInfo(in *newer.NodeSystemInfo, out *NodeSystemInfo, s conversion.Scope) error { +func convert_api_NodeSystemInfo_To_v1_NodeSystemInfo(in *api.NodeSystemInfo, out *NodeSystemInfo, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeSystemInfo))(in) + defaulting.(func(*api.NodeSystemInfo))(in) } out.MachineID = in.MachineID out.SystemUUID = in.SystemUUID @@ -2037,7 +2037,7 @@ func convert_api_NodeSystemInfo_To_v1_NodeSystemInfo(in *newer.NodeSystemInfo, o return nil } -func convert_v1_ObjectFieldSelector_To_api_ObjectFieldSelector(in *ObjectFieldSelector, out *newer.ObjectFieldSelector, s conversion.Scope) error { +func convert_v1_ObjectFieldSelector_To_api_ObjectFieldSelector(in *ObjectFieldSelector, out *api.ObjectFieldSelector, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ObjectFieldSelector))(in) } @@ -2046,16 +2046,16 @@ func convert_v1_ObjectFieldSelector_To_api_ObjectFieldSelector(in *ObjectFieldSe return nil } -func convert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(in *newer.ObjectFieldSelector, out *ObjectFieldSelector, s conversion.Scope) error { +func convert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(in *api.ObjectFieldSelector, out *ObjectFieldSelector, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ObjectFieldSelector))(in) + defaulting.(func(*api.ObjectFieldSelector))(in) } out.APIVersion = in.APIVersion out.FieldPath = in.FieldPath return nil } -func convert_v1_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *newer.ObjectMeta, s conversion.Scope) error { +func convert_v1_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *api.ObjectMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ObjectMeta))(in) } @@ -2094,9 +2094,9 @@ func convert_v1_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *newer.ObjectMe return nil } -func convert_api_ObjectMeta_To_v1_ObjectMeta(in *newer.ObjectMeta, out *ObjectMeta, s conversion.Scope) error { +func convert_api_ObjectMeta_To_v1_ObjectMeta(in *api.ObjectMeta, out *ObjectMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ObjectMeta))(in) + defaulting.(func(*api.ObjectMeta))(in) } out.Name = in.Name out.GenerateName = in.GenerateName @@ -2133,7 +2133,7 @@ func convert_api_ObjectMeta_To_v1_ObjectMeta(in *newer.ObjectMeta, out *ObjectMe return nil } -func convert_v1_ObjectReference_To_api_ObjectReference(in *ObjectReference, out *newer.ObjectReference, s conversion.Scope) error { +func convert_v1_ObjectReference_To_api_ObjectReference(in *ObjectReference, out *api.ObjectReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ObjectReference))(in) } @@ -2147,9 +2147,9 @@ func convert_v1_ObjectReference_To_api_ObjectReference(in *ObjectReference, out return nil } -func convert_api_ObjectReference_To_v1_ObjectReference(in *newer.ObjectReference, out *ObjectReference, s conversion.Scope) error { +func convert_api_ObjectReference_To_v1_ObjectReference(in *api.ObjectReference, out *ObjectReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ObjectReference))(in) + defaulting.(func(*api.ObjectReference))(in) } out.Kind = in.Kind out.Namespace = in.Namespace @@ -2161,7 +2161,7 @@ func convert_api_ObjectReference_To_v1_ObjectReference(in *newer.ObjectReference return nil } -func convert_v1_PersistentVolume_To_api_PersistentVolume(in *PersistentVolume, out *newer.PersistentVolume, s conversion.Scope) error { +func convert_v1_PersistentVolume_To_api_PersistentVolume(in *PersistentVolume, out *api.PersistentVolume, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolume))(in) } @@ -2180,9 +2180,9 @@ func convert_v1_PersistentVolume_To_api_PersistentVolume(in *PersistentVolume, o return nil } -func convert_api_PersistentVolume_To_v1_PersistentVolume(in *newer.PersistentVolume, out *PersistentVolume, s conversion.Scope) error { +func convert_api_PersistentVolume_To_v1_PersistentVolume(in *api.PersistentVolume, out *PersistentVolume, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolume))(in) + defaulting.(func(*api.PersistentVolume))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2199,7 +2199,7 @@ func convert_api_PersistentVolume_To_v1_PersistentVolume(in *newer.PersistentVol return nil } -func convert_v1_PersistentVolumeClaim_To_api_PersistentVolumeClaim(in *PersistentVolumeClaim, out *newer.PersistentVolumeClaim, s conversion.Scope) error { +func convert_v1_PersistentVolumeClaim_To_api_PersistentVolumeClaim(in *PersistentVolumeClaim, out *api.PersistentVolumeClaim, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeClaim))(in) } @@ -2218,9 +2218,9 @@ func convert_v1_PersistentVolumeClaim_To_api_PersistentVolumeClaim(in *Persisten return nil } -func convert_api_PersistentVolumeClaim_To_v1_PersistentVolumeClaim(in *newer.PersistentVolumeClaim, out *PersistentVolumeClaim, s conversion.Scope) error { +func convert_api_PersistentVolumeClaim_To_v1_PersistentVolumeClaim(in *api.PersistentVolumeClaim, out *PersistentVolumeClaim, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeClaim))(in) + defaulting.(func(*api.PersistentVolumeClaim))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2237,7 +2237,7 @@ func convert_api_PersistentVolumeClaim_To_v1_PersistentVolumeClaim(in *newer.Per return nil } -func convert_v1_PersistentVolumeClaimList_To_api_PersistentVolumeClaimList(in *PersistentVolumeClaimList, out *newer.PersistentVolumeClaimList, s conversion.Scope) error { +func convert_v1_PersistentVolumeClaimList_To_api_PersistentVolumeClaimList(in *PersistentVolumeClaimList, out *api.PersistentVolumeClaimList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeClaimList))(in) } @@ -2248,7 +2248,7 @@ func convert_v1_PersistentVolumeClaimList_To_api_PersistentVolumeClaimList(in *P return err } if in.Items != nil { - out.Items = make([]newer.PersistentVolumeClaim, len(in.Items)) + out.Items = make([]api.PersistentVolumeClaim, len(in.Items)) for i := range in.Items { if err := convert_v1_PersistentVolumeClaim_To_api_PersistentVolumeClaim(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -2260,9 +2260,9 @@ func convert_v1_PersistentVolumeClaimList_To_api_PersistentVolumeClaimList(in *P return nil } -func convert_api_PersistentVolumeClaimList_To_v1_PersistentVolumeClaimList(in *newer.PersistentVolumeClaimList, out *PersistentVolumeClaimList, s conversion.Scope) error { +func convert_api_PersistentVolumeClaimList_To_v1_PersistentVolumeClaimList(in *api.PersistentVolumeClaimList, out *PersistentVolumeClaimList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeClaimList))(in) + defaulting.(func(*api.PersistentVolumeClaimList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2283,14 +2283,14 @@ func convert_api_PersistentVolumeClaimList_To_v1_PersistentVolumeClaimList(in *n return nil } -func convert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *PersistentVolumeClaimSpec, out *newer.PersistentVolumeClaimSpec, s conversion.Scope) error { +func convert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *PersistentVolumeClaimSpec, out *api.PersistentVolumeClaimSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeClaimSpec))(in) } if in.AccessModes != nil { - out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) + out.AccessModes = make([]api.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) + out.AccessModes[i] = api.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2302,9 +2302,9 @@ func convert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *P return nil } -func convert_api_PersistentVolumeClaimSpec_To_v1_PersistentVolumeClaimSpec(in *newer.PersistentVolumeClaimSpec, out *PersistentVolumeClaimSpec, s conversion.Scope) error { +func convert_api_PersistentVolumeClaimSpec_To_v1_PersistentVolumeClaimSpec(in *api.PersistentVolumeClaimSpec, out *PersistentVolumeClaimSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeClaimSpec))(in) + defaulting.(func(*api.PersistentVolumeClaimSpec))(in) } if in.AccessModes != nil { out.AccessModes = make([]PersistentVolumeAccessMode, len(in.AccessModes)) @@ -2321,27 +2321,27 @@ func convert_api_PersistentVolumeClaimSpec_To_v1_PersistentVolumeClaimSpec(in *n return nil } -func convert_v1_PersistentVolumeClaimStatus_To_api_PersistentVolumeClaimStatus(in *PersistentVolumeClaimStatus, out *newer.PersistentVolumeClaimStatus, s conversion.Scope) error { +func convert_v1_PersistentVolumeClaimStatus_To_api_PersistentVolumeClaimStatus(in *PersistentVolumeClaimStatus, out *api.PersistentVolumeClaimStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeClaimStatus))(in) } - out.Phase = newer.PersistentVolumeClaimPhase(in.Phase) + out.Phase = api.PersistentVolumeClaimPhase(in.Phase) if in.AccessModes != nil { - out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) + out.AccessModes = make([]api.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) + out.AccessModes[i] = api.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil } if in.Capacity != nil { - out.Capacity = make(map[newer.ResourceName]resource.Quantity) + out.Capacity = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Capacity[newer.ResourceName(key)] = newVal + out.Capacity[api.ResourceName(key)] = newVal } } else { out.Capacity = nil @@ -2349,9 +2349,9 @@ func convert_v1_PersistentVolumeClaimStatus_To_api_PersistentVolumeClaimStatus(i return nil } -func convert_api_PersistentVolumeClaimStatus_To_v1_PersistentVolumeClaimStatus(in *newer.PersistentVolumeClaimStatus, out *PersistentVolumeClaimStatus, s conversion.Scope) error { +func convert_api_PersistentVolumeClaimStatus_To_v1_PersistentVolumeClaimStatus(in *api.PersistentVolumeClaimStatus, out *PersistentVolumeClaimStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeClaimStatus))(in) + defaulting.(func(*api.PersistentVolumeClaimStatus))(in) } out.Phase = PersistentVolumeClaimPhase(in.Phase) if in.AccessModes != nil { @@ -2377,7 +2377,7 @@ func convert_api_PersistentVolumeClaimStatus_To_v1_PersistentVolumeClaimStatus(i return nil } -func convert_v1_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in *PersistentVolumeClaimVolumeSource, out *newer.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { +func convert_v1_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in *PersistentVolumeClaimVolumeSource, out *api.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeClaimVolumeSource))(in) } @@ -2386,16 +2386,16 @@ func convert_v1_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVo return nil } -func convert_api_PersistentVolumeClaimVolumeSource_To_v1_PersistentVolumeClaimVolumeSource(in *newer.PersistentVolumeClaimVolumeSource, out *PersistentVolumeClaimVolumeSource, s conversion.Scope) error { +func convert_api_PersistentVolumeClaimVolumeSource_To_v1_PersistentVolumeClaimVolumeSource(in *api.PersistentVolumeClaimVolumeSource, out *PersistentVolumeClaimVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeClaimVolumeSource))(in) + defaulting.(func(*api.PersistentVolumeClaimVolumeSource))(in) } out.ClaimName = in.ClaimName out.ReadOnly = in.ReadOnly return nil } -func convert_v1_PersistentVolumeList_To_api_PersistentVolumeList(in *PersistentVolumeList, out *newer.PersistentVolumeList, s conversion.Scope) error { +func convert_v1_PersistentVolumeList_To_api_PersistentVolumeList(in *PersistentVolumeList, out *api.PersistentVolumeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeList))(in) } @@ -2406,7 +2406,7 @@ func convert_v1_PersistentVolumeList_To_api_PersistentVolumeList(in *PersistentV return err } if in.Items != nil { - out.Items = make([]newer.PersistentVolume, len(in.Items)) + out.Items = make([]api.PersistentVolume, len(in.Items)) for i := range in.Items { if err := convert_v1_PersistentVolume_To_api_PersistentVolume(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -2418,9 +2418,9 @@ func convert_v1_PersistentVolumeList_To_api_PersistentVolumeList(in *PersistentV return nil } -func convert_api_PersistentVolumeList_To_v1_PersistentVolumeList(in *newer.PersistentVolumeList, out *PersistentVolumeList, s conversion.Scope) error { +func convert_api_PersistentVolumeList_To_v1_PersistentVolumeList(in *api.PersistentVolumeList, out *PersistentVolumeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeList))(in) + defaulting.(func(*api.PersistentVolumeList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2441,12 +2441,12 @@ func convert_api_PersistentVolumeList_To_v1_PersistentVolumeList(in *newer.Persi return nil } -func convert_v1_PersistentVolumeSource_To_api_PersistentVolumeSource(in *PersistentVolumeSource, out *newer.PersistentVolumeSource, s conversion.Scope) error { +func convert_v1_PersistentVolumeSource_To_api_PersistentVolumeSource(in *PersistentVolumeSource, out *api.PersistentVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeSource))(in) } if in.GCEPersistentDisk != nil { - out.GCEPersistentDisk = new(newer.GCEPersistentDiskVolumeSource) + out.GCEPersistentDisk = new(api.GCEPersistentDiskVolumeSource) if err := convert_v1_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in.GCEPersistentDisk, out.GCEPersistentDisk, s); err != nil { return err } @@ -2454,7 +2454,7 @@ func convert_v1_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Persist out.GCEPersistentDisk = nil } if in.AWSElasticBlockStore != nil { - out.AWSElasticBlockStore = new(newer.AWSElasticBlockStoreVolumeSource) + out.AWSElasticBlockStore = new(api.AWSElasticBlockStoreVolumeSource) if err := convert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in.AWSElasticBlockStore, out.AWSElasticBlockStore, s); err != nil { return err } @@ -2462,7 +2462,7 @@ func convert_v1_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Persist out.AWSElasticBlockStore = nil } if in.HostPath != nil { - out.HostPath = new(newer.HostPathVolumeSource) + out.HostPath = new(api.HostPathVolumeSource) if err := convert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource(in.HostPath, out.HostPath, s); err != nil { return err } @@ -2470,7 +2470,7 @@ func convert_v1_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Persist out.HostPath = nil } if in.Glusterfs != nil { - out.Glusterfs = new(newer.GlusterfsVolumeSource) + out.Glusterfs = new(api.GlusterfsVolumeSource) if err := convert_v1_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in.Glusterfs, out.Glusterfs, s); err != nil { return err } @@ -2478,7 +2478,7 @@ func convert_v1_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Persist out.Glusterfs = nil } if in.NFS != nil { - out.NFS = new(newer.NFSVolumeSource) + out.NFS = new(api.NFSVolumeSource) if err := convert_v1_NFSVolumeSource_To_api_NFSVolumeSource(in.NFS, out.NFS, s); err != nil { return err } @@ -2488,9 +2488,9 @@ func convert_v1_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Persist return nil } -func convert_api_PersistentVolumeSource_To_v1_PersistentVolumeSource(in *newer.PersistentVolumeSource, out *PersistentVolumeSource, s conversion.Scope) error { +func convert_api_PersistentVolumeSource_To_v1_PersistentVolumeSource(in *api.PersistentVolumeSource, out *PersistentVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeSource))(in) + defaulting.(func(*api.PersistentVolumeSource))(in) } if in.GCEPersistentDisk != nil { out.GCEPersistentDisk = new(GCEPersistentDiskVolumeSource) @@ -2535,18 +2535,18 @@ func convert_api_PersistentVolumeSource_To_v1_PersistentVolumeSource(in *newer.P return nil } -func convert_v1_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *PersistentVolumeSpec, out *newer.PersistentVolumeSpec, s conversion.Scope) error { +func convert_v1_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *PersistentVolumeSpec, out *api.PersistentVolumeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeSpec))(in) } if in.Capacity != nil { - out.Capacity = make(map[newer.ResourceName]resource.Quantity) + out.Capacity = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Capacity[newer.ResourceName(key)] = newVal + out.Capacity[api.ResourceName(key)] = newVal } } else { out.Capacity = nil @@ -2555,15 +2555,15 @@ func convert_v1_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *PersistentV return err } if in.AccessModes != nil { - out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) + out.AccessModes = make([]api.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) + out.AccessModes[i] = api.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil } if in.ClaimRef != nil { - out.ClaimRef = new(newer.ObjectReference) + out.ClaimRef = new(api.ObjectReference) if err := convert_v1_ObjectReference_To_api_ObjectReference(in.ClaimRef, out.ClaimRef, s); err != nil { return err } @@ -2573,9 +2573,9 @@ func convert_v1_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *PersistentV return nil } -func convert_api_PersistentVolumeSpec_To_v1_PersistentVolumeSpec(in *newer.PersistentVolumeSpec, out *PersistentVolumeSpec, s conversion.Scope) error { +func convert_api_PersistentVolumeSpec_To_v1_PersistentVolumeSpec(in *api.PersistentVolumeSpec, out *PersistentVolumeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeSpec))(in) + defaulting.(func(*api.PersistentVolumeSpec))(in) } if in.Capacity != nil { out.Capacity = make(map[ResourceName]resource.Quantity) @@ -2611,23 +2611,23 @@ func convert_api_PersistentVolumeSpec_To_v1_PersistentVolumeSpec(in *newer.Persi return nil } -func convert_v1_PersistentVolumeStatus_To_api_PersistentVolumeStatus(in *PersistentVolumeStatus, out *newer.PersistentVolumeStatus, s conversion.Scope) error { +func convert_v1_PersistentVolumeStatus_To_api_PersistentVolumeStatus(in *PersistentVolumeStatus, out *api.PersistentVolumeStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeStatus))(in) } - out.Phase = newer.PersistentVolumePhase(in.Phase) + out.Phase = api.PersistentVolumePhase(in.Phase) return nil } -func convert_api_PersistentVolumeStatus_To_v1_PersistentVolumeStatus(in *newer.PersistentVolumeStatus, out *PersistentVolumeStatus, s conversion.Scope) error { +func convert_api_PersistentVolumeStatus_To_v1_PersistentVolumeStatus(in *api.PersistentVolumeStatus, out *PersistentVolumeStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeStatus))(in) + defaulting.(func(*api.PersistentVolumeStatus))(in) } out.Phase = PersistentVolumePhase(in.Phase) return nil } -func convert_v1_Pod_To_api_Pod(in *Pod, out *newer.Pod, s conversion.Scope) error { +func convert_v1_Pod_To_api_Pod(in *Pod, out *api.Pod, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Pod))(in) } @@ -2646,9 +2646,9 @@ func convert_v1_Pod_To_api_Pod(in *Pod, out *newer.Pod, s conversion.Scope) erro return nil } -func convert_api_Pod_To_v1_Pod(in *newer.Pod, out *Pod, s conversion.Scope) error { +func convert_api_Pod_To_v1_Pod(in *api.Pod, out *Pod, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Pod))(in) + defaulting.(func(*api.Pod))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2665,25 +2665,25 @@ func convert_api_Pod_To_v1_Pod(in *newer.Pod, out *Pod, s conversion.Scope) erro return nil } -func convert_v1_PodCondition_To_api_PodCondition(in *PodCondition, out *newer.PodCondition, s conversion.Scope) error { +func convert_v1_PodCondition_To_api_PodCondition(in *PodCondition, out *api.PodCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodCondition))(in) } - out.Type = newer.PodConditionType(in.Type) - out.Status = newer.ConditionStatus(in.Status) + out.Type = api.PodConditionType(in.Type) + out.Status = api.ConditionStatus(in.Status) return nil } -func convert_api_PodCondition_To_v1_PodCondition(in *newer.PodCondition, out *PodCondition, s conversion.Scope) error { +func convert_api_PodCondition_To_v1_PodCondition(in *api.PodCondition, out *PodCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodCondition))(in) + defaulting.(func(*api.PodCondition))(in) } out.Type = PodConditionType(in.Type) out.Status = ConditionStatus(in.Status) return nil } -func convert_v1_PodExecOptions_To_api_PodExecOptions(in *PodExecOptions, out *newer.PodExecOptions, s conversion.Scope) error { +func convert_v1_PodExecOptions_To_api_PodExecOptions(in *PodExecOptions, out *api.PodExecOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodExecOptions))(in) } @@ -2706,9 +2706,9 @@ func convert_v1_PodExecOptions_To_api_PodExecOptions(in *PodExecOptions, out *ne return nil } -func convert_api_PodExecOptions_To_v1_PodExecOptions(in *newer.PodExecOptions, out *PodExecOptions, s conversion.Scope) error { +func convert_api_PodExecOptions_To_v1_PodExecOptions(in *api.PodExecOptions, out *PodExecOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodExecOptions))(in) + defaulting.(func(*api.PodExecOptions))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2729,7 +2729,7 @@ func convert_api_PodExecOptions_To_v1_PodExecOptions(in *newer.PodExecOptions, o return nil } -func convert_v1_PodList_To_api_PodList(in *PodList, out *newer.PodList, s conversion.Scope) error { +func convert_v1_PodList_To_api_PodList(in *PodList, out *api.PodList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodList))(in) } @@ -2740,7 +2740,7 @@ func convert_v1_PodList_To_api_PodList(in *PodList, out *newer.PodList, s conver return err } if in.Items != nil { - out.Items = make([]newer.Pod, len(in.Items)) + out.Items = make([]api.Pod, len(in.Items)) for i := range in.Items { if err := convert_v1_Pod_To_api_Pod(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -2752,9 +2752,9 @@ func convert_v1_PodList_To_api_PodList(in *PodList, out *newer.PodList, s conver return nil } -func convert_api_PodList_To_v1_PodList(in *newer.PodList, out *PodList, s conversion.Scope) error { +func convert_api_PodList_To_v1_PodList(in *api.PodList, out *PodList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodList))(in) + defaulting.(func(*api.PodList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2775,7 +2775,7 @@ func convert_api_PodList_To_v1_PodList(in *newer.PodList, out *PodList, s conver return nil } -func convert_v1_PodLogOptions_To_api_PodLogOptions(in *PodLogOptions, out *newer.PodLogOptions, s conversion.Scope) error { +func convert_v1_PodLogOptions_To_api_PodLogOptions(in *PodLogOptions, out *api.PodLogOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodLogOptions))(in) } @@ -2788,9 +2788,9 @@ func convert_v1_PodLogOptions_To_api_PodLogOptions(in *PodLogOptions, out *newer return nil } -func convert_api_PodLogOptions_To_v1_PodLogOptions(in *newer.PodLogOptions, out *PodLogOptions, s conversion.Scope) error { +func convert_api_PodLogOptions_To_v1_PodLogOptions(in *api.PodLogOptions, out *PodLogOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodLogOptions))(in) + defaulting.(func(*api.PodLogOptions))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2801,7 +2801,7 @@ func convert_api_PodLogOptions_To_v1_PodLogOptions(in *newer.PodLogOptions, out return nil } -func convert_v1_PodProxyOptions_To_api_PodProxyOptions(in *PodProxyOptions, out *newer.PodProxyOptions, s conversion.Scope) error { +func convert_v1_PodProxyOptions_To_api_PodProxyOptions(in *PodProxyOptions, out *api.PodProxyOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodProxyOptions))(in) } @@ -2812,9 +2812,9 @@ func convert_v1_PodProxyOptions_To_api_PodProxyOptions(in *PodProxyOptions, out return nil } -func convert_api_PodProxyOptions_To_v1_PodProxyOptions(in *newer.PodProxyOptions, out *PodProxyOptions, s conversion.Scope) error { +func convert_api_PodProxyOptions_To_v1_PodProxyOptions(in *api.PodProxyOptions, out *PodProxyOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodProxyOptions))(in) + defaulting.(func(*api.PodProxyOptions))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2823,12 +2823,12 @@ func convert_api_PodProxyOptions_To_v1_PodProxyOptions(in *newer.PodProxyOptions return nil } -func convert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s conversion.Scope) error { +func convert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodSpec))(in) } if in.Volumes != nil { - out.Volumes = make([]newer.Volume, len(in.Volumes)) + out.Volumes = make([]api.Volume, len(in.Volumes)) for i := range in.Volumes { if err := convert_v1_Volume_To_api_Volume(&in.Volumes[i], &out.Volumes[i], s); err != nil { return err @@ -2838,7 +2838,7 @@ func convert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s conver out.Volumes = nil } if in.Containers != nil { - out.Containers = make([]newer.Container, len(in.Containers)) + out.Containers = make([]api.Container, len(in.Containers)) for i := range in.Containers { if err := convert_v1_Container_To_api_Container(&in.Containers[i], &out.Containers[i], s); err != nil { return err @@ -2847,7 +2847,7 @@ func convert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s conver } else { out.Containers = nil } - out.RestartPolicy = newer.RestartPolicy(in.RestartPolicy) + out.RestartPolicy = api.RestartPolicy(in.RestartPolicy) if in.TerminationGracePeriodSeconds != nil { out.TerminationGracePeriodSeconds = new(int64) *out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds @@ -2860,7 +2860,7 @@ func convert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s conver } else { out.ActiveDeadlineSeconds = nil } - out.DNSPolicy = newer.DNSPolicy(in.DNSPolicy) + out.DNSPolicy = api.DNSPolicy(in.DNSPolicy) if in.NodeSelector != nil { out.NodeSelector = make(map[string]string) for key, val := range in.NodeSelector { @@ -2873,7 +2873,7 @@ func convert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s conver out.Host = in.Host out.HostNetwork = in.HostNetwork if in.ImagePullSecrets != nil { - out.ImagePullSecrets = make([]newer.LocalObjectReference, len(in.ImagePullSecrets)) + out.ImagePullSecrets = make([]api.LocalObjectReference, len(in.ImagePullSecrets)) for i := range in.ImagePullSecrets { if err := convert_v1_LocalObjectReference_To_api_LocalObjectReference(&in.ImagePullSecrets[i], &out.ImagePullSecrets[i], s); err != nil { return err @@ -2885,9 +2885,9 @@ func convert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s conver return nil } -func convert_api_PodSpec_To_v1_PodSpec(in *newer.PodSpec, out *PodSpec, s conversion.Scope) error { +func convert_api_PodSpec_To_v1_PodSpec(in *api.PodSpec, out *PodSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodSpec))(in) + defaulting.(func(*api.PodSpec))(in) } if in.Volumes != nil { out.Volumes = make([]Volume, len(in.Volumes)) @@ -2947,13 +2947,13 @@ func convert_api_PodSpec_To_v1_PodSpec(in *newer.PodSpec, out *PodSpec, s conver return nil } -func convert_v1_PodStatus_To_api_PodStatus(in *PodStatus, out *newer.PodStatus, s conversion.Scope) error { +func convert_v1_PodStatus_To_api_PodStatus(in *PodStatus, out *api.PodStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodStatus))(in) } - out.Phase = newer.PodPhase(in.Phase) + out.Phase = api.PodPhase(in.Phase) if in.Conditions != nil { - out.Conditions = make([]newer.PodCondition, len(in.Conditions)) + out.Conditions = make([]api.PodCondition, len(in.Conditions)) for i := range in.Conditions { if err := convert_v1_PodCondition_To_api_PodCondition(&in.Conditions[i], &out.Conditions[i], s); err != nil { return err @@ -2973,7 +2973,7 @@ func convert_v1_PodStatus_To_api_PodStatus(in *PodStatus, out *newer.PodStatus, out.StartTime = nil } if in.ContainerStatuses != nil { - out.ContainerStatuses = make([]newer.ContainerStatus, len(in.ContainerStatuses)) + out.ContainerStatuses = make([]api.ContainerStatus, len(in.ContainerStatuses)) for i := range in.ContainerStatuses { if err := convert_v1_ContainerStatus_To_api_ContainerStatus(&in.ContainerStatuses[i], &out.ContainerStatuses[i], s); err != nil { return err @@ -2985,9 +2985,9 @@ func convert_v1_PodStatus_To_api_PodStatus(in *PodStatus, out *newer.PodStatus, return nil } -func convert_api_PodStatus_To_v1_PodStatus(in *newer.PodStatus, out *PodStatus, s conversion.Scope) error { +func convert_api_PodStatus_To_v1_PodStatus(in *api.PodStatus, out *PodStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodStatus))(in) + defaulting.(func(*api.PodStatus))(in) } out.Phase = PodPhase(in.Phase) if in.Conditions != nil { @@ -3023,7 +3023,7 @@ func convert_api_PodStatus_To_v1_PodStatus(in *newer.PodStatus, out *PodStatus, return nil } -func convert_v1_PodStatusResult_To_api_PodStatusResult(in *PodStatusResult, out *newer.PodStatusResult, s conversion.Scope) error { +func convert_v1_PodStatusResult_To_api_PodStatusResult(in *PodStatusResult, out *api.PodStatusResult, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodStatusResult))(in) } @@ -3039,9 +3039,9 @@ func convert_v1_PodStatusResult_To_api_PodStatusResult(in *PodStatusResult, out return nil } -func convert_api_PodStatusResult_To_v1_PodStatusResult(in *newer.PodStatusResult, out *PodStatusResult, s conversion.Scope) error { +func convert_api_PodStatusResult_To_v1_PodStatusResult(in *api.PodStatusResult, out *PodStatusResult, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodStatusResult))(in) + defaulting.(func(*api.PodStatusResult))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3055,7 +3055,7 @@ func convert_api_PodStatusResult_To_v1_PodStatusResult(in *newer.PodStatusResult return nil } -func convert_v1_PodTemplate_To_api_PodTemplate(in *PodTemplate, out *newer.PodTemplate, s conversion.Scope) error { +func convert_v1_PodTemplate_To_api_PodTemplate(in *PodTemplate, out *api.PodTemplate, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodTemplate))(in) } @@ -3071,9 +3071,9 @@ func convert_v1_PodTemplate_To_api_PodTemplate(in *PodTemplate, out *newer.PodTe return nil } -func convert_api_PodTemplate_To_v1_PodTemplate(in *newer.PodTemplate, out *PodTemplate, s conversion.Scope) error { +func convert_api_PodTemplate_To_v1_PodTemplate(in *api.PodTemplate, out *PodTemplate, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodTemplate))(in) + defaulting.(func(*api.PodTemplate))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3087,7 +3087,7 @@ func convert_api_PodTemplate_To_v1_PodTemplate(in *newer.PodTemplate, out *PodTe return nil } -func convert_v1_PodTemplateList_To_api_PodTemplateList(in *PodTemplateList, out *newer.PodTemplateList, s conversion.Scope) error { +func convert_v1_PodTemplateList_To_api_PodTemplateList(in *PodTemplateList, out *api.PodTemplateList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodTemplateList))(in) } @@ -3098,7 +3098,7 @@ func convert_v1_PodTemplateList_To_api_PodTemplateList(in *PodTemplateList, out return err } if in.Items != nil { - out.Items = make([]newer.PodTemplate, len(in.Items)) + out.Items = make([]api.PodTemplate, len(in.Items)) for i := range in.Items { if err := convert_v1_PodTemplate_To_api_PodTemplate(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -3110,9 +3110,9 @@ func convert_v1_PodTemplateList_To_api_PodTemplateList(in *PodTemplateList, out return nil } -func convert_api_PodTemplateList_To_v1_PodTemplateList(in *newer.PodTemplateList, out *PodTemplateList, s conversion.Scope) error { +func convert_api_PodTemplateList_To_v1_PodTemplateList(in *api.PodTemplateList, out *PodTemplateList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodTemplateList))(in) + defaulting.(func(*api.PodTemplateList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3133,7 +3133,7 @@ func convert_api_PodTemplateList_To_v1_PodTemplateList(in *newer.PodTemplateList return nil } -func convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out *newer.PodTemplateSpec, s conversion.Scope) error { +func convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out *api.PodTemplateSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodTemplateSpec))(in) } @@ -3146,9 +3146,9 @@ func convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out return nil } -func convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in *newer.PodTemplateSpec, out *PodTemplateSpec, s conversion.Scope) error { +func convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in *api.PodTemplateSpec, out *PodTemplateSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodTemplateSpec))(in) + defaulting.(func(*api.PodTemplateSpec))(in) } if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err @@ -3159,7 +3159,7 @@ func convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in *newer.PodTemplateSpec return nil } -func convert_v1_Probe_To_api_Probe(in *Probe, out *newer.Probe, s conversion.Scope) error { +func convert_v1_Probe_To_api_Probe(in *Probe, out *api.Probe, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Probe))(in) } @@ -3171,9 +3171,9 @@ func convert_v1_Probe_To_api_Probe(in *Probe, out *newer.Probe, s conversion.Sco return nil } -func convert_api_Probe_To_v1_Probe(in *newer.Probe, out *Probe, s conversion.Scope) error { +func convert_api_Probe_To_v1_Probe(in *api.Probe, out *Probe, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Probe))(in) + defaulting.(func(*api.Probe))(in) } if err := convert_api_Handler_To_v1_Handler(&in.Handler, &out.Handler, s); err != nil { return err @@ -3183,7 +3183,7 @@ func convert_api_Probe_To_v1_Probe(in *newer.Probe, out *Probe, s conversion.Sco return nil } -func convert_v1_RangeAllocation_To_api_RangeAllocation(in *RangeAllocation, out *newer.RangeAllocation, s conversion.Scope) error { +func convert_v1_RangeAllocation_To_api_RangeAllocation(in *RangeAllocation, out *api.RangeAllocation, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*RangeAllocation))(in) } @@ -3200,9 +3200,9 @@ func convert_v1_RangeAllocation_To_api_RangeAllocation(in *RangeAllocation, out return nil } -func convert_api_RangeAllocation_To_v1_RangeAllocation(in *newer.RangeAllocation, out *RangeAllocation, s conversion.Scope) error { +func convert_api_RangeAllocation_To_v1_RangeAllocation(in *api.RangeAllocation, out *RangeAllocation, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.RangeAllocation))(in) + defaulting.(func(*api.RangeAllocation))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3217,7 +3217,7 @@ func convert_api_RangeAllocation_To_v1_RangeAllocation(in *newer.RangeAllocation return nil } -func convert_v1_ReplicationController_To_api_ReplicationController(in *ReplicationController, out *newer.ReplicationController, s conversion.Scope) error { +func convert_v1_ReplicationController_To_api_ReplicationController(in *ReplicationController, out *api.ReplicationController, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ReplicationController))(in) } @@ -3236,9 +3236,9 @@ func convert_v1_ReplicationController_To_api_ReplicationController(in *Replicati return nil } -func convert_api_ReplicationController_To_v1_ReplicationController(in *newer.ReplicationController, out *ReplicationController, s conversion.Scope) error { +func convert_api_ReplicationController_To_v1_ReplicationController(in *api.ReplicationController, out *ReplicationController, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ReplicationController))(in) + defaulting.(func(*api.ReplicationController))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3255,7 +3255,7 @@ func convert_api_ReplicationController_To_v1_ReplicationController(in *newer.Rep return nil } -func convert_v1_ReplicationControllerList_To_api_ReplicationControllerList(in *ReplicationControllerList, out *newer.ReplicationControllerList, s conversion.Scope) error { +func convert_v1_ReplicationControllerList_To_api_ReplicationControllerList(in *ReplicationControllerList, out *api.ReplicationControllerList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ReplicationControllerList))(in) } @@ -3266,7 +3266,7 @@ func convert_v1_ReplicationControllerList_To_api_ReplicationControllerList(in *R return err } if in.Items != nil { - out.Items = make([]newer.ReplicationController, len(in.Items)) + out.Items = make([]api.ReplicationController, len(in.Items)) for i := range in.Items { if err := convert_v1_ReplicationController_To_api_ReplicationController(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -3278,9 +3278,9 @@ func convert_v1_ReplicationControllerList_To_api_ReplicationControllerList(in *R return nil } -func convert_api_ReplicationControllerList_To_v1_ReplicationControllerList(in *newer.ReplicationControllerList, out *ReplicationControllerList, s conversion.Scope) error { +func convert_api_ReplicationControllerList_To_v1_ReplicationControllerList(in *api.ReplicationControllerList, out *ReplicationControllerList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ReplicationControllerList))(in) + defaulting.(func(*api.ReplicationControllerList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3301,7 +3301,7 @@ func convert_api_ReplicationControllerList_To_v1_ReplicationControllerList(in *n return nil } -func convert_v1_ReplicationControllerSpec_To_api_ReplicationControllerSpec(in *ReplicationControllerSpec, out *newer.ReplicationControllerSpec, s conversion.Scope) error { +func convert_v1_ReplicationControllerSpec_To_api_ReplicationControllerSpec(in *ReplicationControllerSpec, out *api.ReplicationControllerSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ReplicationControllerSpec))(in) } @@ -3315,7 +3315,7 @@ func convert_v1_ReplicationControllerSpec_To_api_ReplicationControllerSpec(in *R out.Selector = nil } if in.TemplateRef != nil { - out.TemplateRef = new(newer.ObjectReference) + out.TemplateRef = new(api.ObjectReference) if err := convert_v1_ObjectReference_To_api_ObjectReference(in.TemplateRef, out.TemplateRef, s); err != nil { return err } @@ -3323,7 +3323,7 @@ func convert_v1_ReplicationControllerSpec_To_api_ReplicationControllerSpec(in *R out.TemplateRef = nil } if in.Template != nil { - out.Template = new(newer.PodTemplateSpec) + out.Template = new(api.PodTemplateSpec) if err := convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in.Template, out.Template, s); err != nil { return err } @@ -3333,9 +3333,9 @@ func convert_v1_ReplicationControllerSpec_To_api_ReplicationControllerSpec(in *R return nil } -func convert_api_ReplicationControllerSpec_To_v1_ReplicationControllerSpec(in *newer.ReplicationControllerSpec, out *ReplicationControllerSpec, s conversion.Scope) error { +func convert_api_ReplicationControllerSpec_To_v1_ReplicationControllerSpec(in *api.ReplicationControllerSpec, out *ReplicationControllerSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ReplicationControllerSpec))(in) + defaulting.(func(*api.ReplicationControllerSpec))(in) } out.Replicas = in.Replicas if in.Selector != nil { @@ -3365,7 +3365,7 @@ func convert_api_ReplicationControllerSpec_To_v1_ReplicationControllerSpec(in *n return nil } -func convert_v1_ReplicationControllerStatus_To_api_ReplicationControllerStatus(in *ReplicationControllerStatus, out *newer.ReplicationControllerStatus, s conversion.Scope) error { +func convert_v1_ReplicationControllerStatus_To_api_ReplicationControllerStatus(in *ReplicationControllerStatus, out *api.ReplicationControllerStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ReplicationControllerStatus))(in) } @@ -3373,15 +3373,15 @@ func convert_v1_ReplicationControllerStatus_To_api_ReplicationControllerStatus(i return nil } -func convert_api_ReplicationControllerStatus_To_v1_ReplicationControllerStatus(in *newer.ReplicationControllerStatus, out *ReplicationControllerStatus, s conversion.Scope) error { +func convert_api_ReplicationControllerStatus_To_v1_ReplicationControllerStatus(in *api.ReplicationControllerStatus, out *ReplicationControllerStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ReplicationControllerStatus))(in) + defaulting.(func(*api.ReplicationControllerStatus))(in) } out.Replicas = in.Replicas return nil } -func convert_v1_ResourceQuota_To_api_ResourceQuota(in *ResourceQuota, out *newer.ResourceQuota, s conversion.Scope) error { +func convert_v1_ResourceQuota_To_api_ResourceQuota(in *ResourceQuota, out *api.ResourceQuota, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceQuota))(in) } @@ -3400,9 +3400,9 @@ func convert_v1_ResourceQuota_To_api_ResourceQuota(in *ResourceQuota, out *newer return nil } -func convert_api_ResourceQuota_To_v1_ResourceQuota(in *newer.ResourceQuota, out *ResourceQuota, s conversion.Scope) error { +func convert_api_ResourceQuota_To_v1_ResourceQuota(in *api.ResourceQuota, out *ResourceQuota, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ResourceQuota))(in) + defaulting.(func(*api.ResourceQuota))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3419,7 +3419,7 @@ func convert_api_ResourceQuota_To_v1_ResourceQuota(in *newer.ResourceQuota, out return nil } -func convert_v1_ResourceQuotaList_To_api_ResourceQuotaList(in *ResourceQuotaList, out *newer.ResourceQuotaList, s conversion.Scope) error { +func convert_v1_ResourceQuotaList_To_api_ResourceQuotaList(in *ResourceQuotaList, out *api.ResourceQuotaList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceQuotaList))(in) } @@ -3430,7 +3430,7 @@ func convert_v1_ResourceQuotaList_To_api_ResourceQuotaList(in *ResourceQuotaList return err } if in.Items != nil { - out.Items = make([]newer.ResourceQuota, len(in.Items)) + out.Items = make([]api.ResourceQuota, len(in.Items)) for i := range in.Items { if err := convert_v1_ResourceQuota_To_api_ResourceQuota(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -3442,9 +3442,9 @@ func convert_v1_ResourceQuotaList_To_api_ResourceQuotaList(in *ResourceQuotaList return nil } -func convert_api_ResourceQuotaList_To_v1_ResourceQuotaList(in *newer.ResourceQuotaList, out *ResourceQuotaList, s conversion.Scope) error { +func convert_api_ResourceQuotaList_To_v1_ResourceQuotaList(in *api.ResourceQuotaList, out *ResourceQuotaList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ResourceQuotaList))(in) + defaulting.(func(*api.ResourceQuotaList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3465,18 +3465,18 @@ func convert_api_ResourceQuotaList_To_v1_ResourceQuotaList(in *newer.ResourceQuo return nil } -func convert_v1_ResourceQuotaSpec_To_api_ResourceQuotaSpec(in *ResourceQuotaSpec, out *newer.ResourceQuotaSpec, s conversion.Scope) error { +func convert_v1_ResourceQuotaSpec_To_api_ResourceQuotaSpec(in *ResourceQuotaSpec, out *api.ResourceQuotaSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceQuotaSpec))(in) } if in.Hard != nil { - out.Hard = make(map[newer.ResourceName]resource.Quantity) + out.Hard = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Hard { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Hard[newer.ResourceName(key)] = newVal + out.Hard[api.ResourceName(key)] = newVal } } else { out.Hard = nil @@ -3484,9 +3484,9 @@ func convert_v1_ResourceQuotaSpec_To_api_ResourceQuotaSpec(in *ResourceQuotaSpec return nil } -func convert_api_ResourceQuotaSpec_To_v1_ResourceQuotaSpec(in *newer.ResourceQuotaSpec, out *ResourceQuotaSpec, s conversion.Scope) error { +func convert_api_ResourceQuotaSpec_To_v1_ResourceQuotaSpec(in *api.ResourceQuotaSpec, out *ResourceQuotaSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ResourceQuotaSpec))(in) + defaulting.(func(*api.ResourceQuotaSpec))(in) } if in.Hard != nil { out.Hard = make(map[ResourceName]resource.Quantity) @@ -3503,30 +3503,30 @@ func convert_api_ResourceQuotaSpec_To_v1_ResourceQuotaSpec(in *newer.ResourceQuo return nil } -func convert_v1_ResourceQuotaStatus_To_api_ResourceQuotaStatus(in *ResourceQuotaStatus, out *newer.ResourceQuotaStatus, s conversion.Scope) error { +func convert_v1_ResourceQuotaStatus_To_api_ResourceQuotaStatus(in *ResourceQuotaStatus, out *api.ResourceQuotaStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceQuotaStatus))(in) } if in.Hard != nil { - out.Hard = make(map[newer.ResourceName]resource.Quantity) + out.Hard = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Hard { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Hard[newer.ResourceName(key)] = newVal + out.Hard[api.ResourceName(key)] = newVal } } else { out.Hard = nil } if in.Used != nil { - out.Used = make(map[newer.ResourceName]resource.Quantity) + out.Used = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Used { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Used[newer.ResourceName(key)] = newVal + out.Used[api.ResourceName(key)] = newVal } } else { out.Used = nil @@ -3534,9 +3534,9 @@ func convert_v1_ResourceQuotaStatus_To_api_ResourceQuotaStatus(in *ResourceQuota return nil } -func convert_api_ResourceQuotaStatus_To_v1_ResourceQuotaStatus(in *newer.ResourceQuotaStatus, out *ResourceQuotaStatus, s conversion.Scope) error { +func convert_api_ResourceQuotaStatus_To_v1_ResourceQuotaStatus(in *api.ResourceQuotaStatus, out *ResourceQuotaStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ResourceQuotaStatus))(in) + defaulting.(func(*api.ResourceQuotaStatus))(in) } if in.Hard != nil { out.Hard = make(map[ResourceName]resource.Quantity) @@ -3565,30 +3565,30 @@ func convert_api_ResourceQuotaStatus_To_v1_ResourceQuotaStatus(in *newer.Resourc return nil } -func convert_v1_ResourceRequirements_To_api_ResourceRequirements(in *ResourceRequirements, out *newer.ResourceRequirements, s conversion.Scope) error { +func convert_v1_ResourceRequirements_To_api_ResourceRequirements(in *ResourceRequirements, out *api.ResourceRequirements, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceRequirements))(in) } if in.Limits != nil { - out.Limits = make(map[newer.ResourceName]resource.Quantity) + out.Limits = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Limits { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Limits[newer.ResourceName(key)] = newVal + out.Limits[api.ResourceName(key)] = newVal } } else { out.Limits = nil } if in.Requests != nil { - out.Requests = make(map[newer.ResourceName]resource.Quantity) + out.Requests = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Requests { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Requests[newer.ResourceName(key)] = newVal + out.Requests[api.ResourceName(key)] = newVal } } else { out.Requests = nil @@ -3596,9 +3596,9 @@ func convert_v1_ResourceRequirements_To_api_ResourceRequirements(in *ResourceReq return nil } -func convert_api_ResourceRequirements_To_v1_ResourceRequirements(in *newer.ResourceRequirements, out *ResourceRequirements, s conversion.Scope) error { +func convert_api_ResourceRequirements_To_v1_ResourceRequirements(in *api.ResourceRequirements, out *ResourceRequirements, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ResourceRequirements))(in) + defaulting.(func(*api.ResourceRequirements))(in) } if in.Limits != nil { out.Limits = make(map[ResourceName]resource.Quantity) @@ -3627,7 +3627,7 @@ func convert_api_ResourceRequirements_To_v1_ResourceRequirements(in *newer.Resou return nil } -func convert_v1_SELinuxOptions_To_api_SELinuxOptions(in *SELinuxOptions, out *newer.SELinuxOptions, s conversion.Scope) error { +func convert_v1_SELinuxOptions_To_api_SELinuxOptions(in *SELinuxOptions, out *api.SELinuxOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SELinuxOptions))(in) } @@ -3638,9 +3638,9 @@ func convert_v1_SELinuxOptions_To_api_SELinuxOptions(in *SELinuxOptions, out *ne return nil } -func convert_api_SELinuxOptions_To_v1_SELinuxOptions(in *newer.SELinuxOptions, out *SELinuxOptions, s conversion.Scope) error { +func convert_api_SELinuxOptions_To_v1_SELinuxOptions(in *api.SELinuxOptions, out *SELinuxOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.SELinuxOptions))(in) + defaulting.(func(*api.SELinuxOptions))(in) } out.User = in.User out.Role = in.Role @@ -3649,7 +3649,7 @@ func convert_api_SELinuxOptions_To_v1_SELinuxOptions(in *newer.SELinuxOptions, o return nil } -func convert_v1_Secret_To_api_Secret(in *Secret, out *newer.Secret, s conversion.Scope) error { +func convert_v1_Secret_To_api_Secret(in *Secret, out *api.Secret, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Secret))(in) } @@ -3671,13 +3671,13 @@ func convert_v1_Secret_To_api_Secret(in *Secret, out *newer.Secret, s conversion } else { out.Data = nil } - out.Type = newer.SecretType(in.Type) + out.Type = api.SecretType(in.Type) return nil } -func convert_api_Secret_To_v1_Secret(in *newer.Secret, out *Secret, s conversion.Scope) error { +func convert_api_Secret_To_v1_Secret(in *api.Secret, out *Secret, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Secret))(in) + defaulting.(func(*api.Secret))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3701,7 +3701,7 @@ func convert_api_Secret_To_v1_Secret(in *newer.Secret, out *Secret, s conversion return nil } -func convert_v1_SecretList_To_api_SecretList(in *SecretList, out *newer.SecretList, s conversion.Scope) error { +func convert_v1_SecretList_To_api_SecretList(in *SecretList, out *api.SecretList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SecretList))(in) } @@ -3712,7 +3712,7 @@ func convert_v1_SecretList_To_api_SecretList(in *SecretList, out *newer.SecretLi return err } if in.Items != nil { - out.Items = make([]newer.Secret, len(in.Items)) + out.Items = make([]api.Secret, len(in.Items)) for i := range in.Items { if err := convert_v1_Secret_To_api_Secret(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -3724,9 +3724,9 @@ func convert_v1_SecretList_To_api_SecretList(in *SecretList, out *newer.SecretLi return nil } -func convert_api_SecretList_To_v1_SecretList(in *newer.SecretList, out *SecretList, s conversion.Scope) error { +func convert_api_SecretList_To_v1_SecretList(in *api.SecretList, out *SecretList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.SecretList))(in) + defaulting.(func(*api.SecretList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3747,7 +3747,7 @@ func convert_api_SecretList_To_v1_SecretList(in *newer.SecretList, out *SecretLi return nil } -func convert_v1_SecretVolumeSource_To_api_SecretVolumeSource(in *SecretVolumeSource, out *newer.SecretVolumeSource, s conversion.Scope) error { +func convert_v1_SecretVolumeSource_To_api_SecretVolumeSource(in *SecretVolumeSource, out *api.SecretVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SecretVolumeSource))(in) } @@ -3755,20 +3755,20 @@ func convert_v1_SecretVolumeSource_To_api_SecretVolumeSource(in *SecretVolumeSou return nil } -func convert_api_SecretVolumeSource_To_v1_SecretVolumeSource(in *newer.SecretVolumeSource, out *SecretVolumeSource, s conversion.Scope) error { +func convert_api_SecretVolumeSource_To_v1_SecretVolumeSource(in *api.SecretVolumeSource, out *SecretVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.SecretVolumeSource))(in) + defaulting.(func(*api.SecretVolumeSource))(in) } out.SecretName = in.SecretName return nil } -func convert_v1_SecurityContext_To_api_SecurityContext(in *SecurityContext, out *newer.SecurityContext, s conversion.Scope) error { +func convert_v1_SecurityContext_To_api_SecurityContext(in *SecurityContext, out *api.SecurityContext, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SecurityContext))(in) } if in.Capabilities != nil { - out.Capabilities = new(newer.Capabilities) + out.Capabilities = new(api.Capabilities) if err := convert_v1_Capabilities_To_api_Capabilities(in.Capabilities, out.Capabilities, s); err != nil { return err } @@ -3782,7 +3782,7 @@ func convert_v1_SecurityContext_To_api_SecurityContext(in *SecurityContext, out out.Privileged = nil } if in.SELinuxOptions != nil { - out.SELinuxOptions = new(newer.SELinuxOptions) + out.SELinuxOptions = new(api.SELinuxOptions) if err := convert_v1_SELinuxOptions_To_api_SELinuxOptions(in.SELinuxOptions, out.SELinuxOptions, s); err != nil { return err } @@ -3798,9 +3798,9 @@ func convert_v1_SecurityContext_To_api_SecurityContext(in *SecurityContext, out return nil } -func convert_api_SecurityContext_To_v1_SecurityContext(in *newer.SecurityContext, out *SecurityContext, s conversion.Scope) error { +func convert_api_SecurityContext_To_v1_SecurityContext(in *api.SecurityContext, out *SecurityContext, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.SecurityContext))(in) + defaulting.(func(*api.SecurityContext))(in) } if in.Capabilities != nil { out.Capabilities = new(Capabilities) @@ -3833,7 +3833,7 @@ func convert_api_SecurityContext_To_v1_SecurityContext(in *newer.SecurityContext return nil } -func convert_v1_SerializedReference_To_api_SerializedReference(in *SerializedReference, out *newer.SerializedReference, s conversion.Scope) error { +func convert_v1_SerializedReference_To_api_SerializedReference(in *SerializedReference, out *api.SerializedReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SerializedReference))(in) } @@ -3846,9 +3846,9 @@ func convert_v1_SerializedReference_To_api_SerializedReference(in *SerializedRef return nil } -func convert_api_SerializedReference_To_v1_SerializedReference(in *newer.SerializedReference, out *SerializedReference, s conversion.Scope) error { +func convert_api_SerializedReference_To_v1_SerializedReference(in *api.SerializedReference, out *SerializedReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.SerializedReference))(in) + defaulting.(func(*api.SerializedReference))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3859,7 +3859,7 @@ func convert_api_SerializedReference_To_v1_SerializedReference(in *newer.Seriali return nil } -func convert_v1_Service_To_api_Service(in *Service, out *newer.Service, s conversion.Scope) error { +func convert_v1_Service_To_api_Service(in *Service, out *api.Service, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Service))(in) } @@ -3878,9 +3878,9 @@ func convert_v1_Service_To_api_Service(in *Service, out *newer.Service, s conver return nil } -func convert_api_Service_To_v1_Service(in *newer.Service, out *Service, s conversion.Scope) error { +func convert_api_Service_To_v1_Service(in *api.Service, out *Service, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Service))(in) + defaulting.(func(*api.Service))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3897,7 +3897,7 @@ func convert_api_Service_To_v1_Service(in *newer.Service, out *Service, s conver return nil } -func convert_v1_ServiceAccount_To_api_ServiceAccount(in *ServiceAccount, out *newer.ServiceAccount, s conversion.Scope) error { +func convert_v1_ServiceAccount_To_api_ServiceAccount(in *ServiceAccount, out *api.ServiceAccount, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServiceAccount))(in) } @@ -3908,7 +3908,7 @@ func convert_v1_ServiceAccount_To_api_ServiceAccount(in *ServiceAccount, out *ne return err } if in.Secrets != nil { - out.Secrets = make([]newer.ObjectReference, len(in.Secrets)) + out.Secrets = make([]api.ObjectReference, len(in.Secrets)) for i := range in.Secrets { if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.Secrets[i], &out.Secrets[i], s); err != nil { return err @@ -3920,9 +3920,9 @@ func convert_v1_ServiceAccount_To_api_ServiceAccount(in *ServiceAccount, out *ne return nil } -func convert_api_ServiceAccount_To_v1_ServiceAccount(in *newer.ServiceAccount, out *ServiceAccount, s conversion.Scope) error { +func convert_api_ServiceAccount_To_v1_ServiceAccount(in *api.ServiceAccount, out *ServiceAccount, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServiceAccount))(in) + defaulting.(func(*api.ServiceAccount))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3943,7 +3943,7 @@ func convert_api_ServiceAccount_To_v1_ServiceAccount(in *newer.ServiceAccount, o return nil } -func convert_v1_ServiceAccountList_To_api_ServiceAccountList(in *ServiceAccountList, out *newer.ServiceAccountList, s conversion.Scope) error { +func convert_v1_ServiceAccountList_To_api_ServiceAccountList(in *ServiceAccountList, out *api.ServiceAccountList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServiceAccountList))(in) } @@ -3954,7 +3954,7 @@ func convert_v1_ServiceAccountList_To_api_ServiceAccountList(in *ServiceAccountL return err } if in.Items != nil { - out.Items = make([]newer.ServiceAccount, len(in.Items)) + out.Items = make([]api.ServiceAccount, len(in.Items)) for i := range in.Items { if err := convert_v1_ServiceAccount_To_api_ServiceAccount(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -3966,9 +3966,9 @@ func convert_v1_ServiceAccountList_To_api_ServiceAccountList(in *ServiceAccountL return nil } -func convert_api_ServiceAccountList_To_v1_ServiceAccountList(in *newer.ServiceAccountList, out *ServiceAccountList, s conversion.Scope) error { +func convert_api_ServiceAccountList_To_v1_ServiceAccountList(in *api.ServiceAccountList, out *ServiceAccountList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServiceAccountList))(in) + defaulting.(func(*api.ServiceAccountList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3989,7 +3989,7 @@ func convert_api_ServiceAccountList_To_v1_ServiceAccountList(in *newer.ServiceAc return nil } -func convert_v1_ServiceList_To_api_ServiceList(in *ServiceList, out *newer.ServiceList, s conversion.Scope) error { +func convert_v1_ServiceList_To_api_ServiceList(in *ServiceList, out *api.ServiceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServiceList))(in) } @@ -4000,7 +4000,7 @@ func convert_v1_ServiceList_To_api_ServiceList(in *ServiceList, out *newer.Servi return err } if in.Items != nil { - out.Items = make([]newer.Service, len(in.Items)) + out.Items = make([]api.Service, len(in.Items)) for i := range in.Items { if err := convert_v1_Service_To_api_Service(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -4012,9 +4012,9 @@ func convert_v1_ServiceList_To_api_ServiceList(in *ServiceList, out *newer.Servi return nil } -func convert_api_ServiceList_To_v1_ServiceList(in *newer.ServiceList, out *ServiceList, s conversion.Scope) error { +func convert_api_ServiceList_To_v1_ServiceList(in *api.ServiceList, out *ServiceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServiceList))(in) + defaulting.(func(*api.ServiceList))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -4035,12 +4035,12 @@ func convert_api_ServiceList_To_v1_ServiceList(in *newer.ServiceList, out *Servi return nil } -func convert_v1_ServicePort_To_api_ServicePort(in *ServicePort, out *newer.ServicePort, s conversion.Scope) error { +func convert_v1_ServicePort_To_api_ServicePort(in *ServicePort, out *api.ServicePort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServicePort))(in) } out.Name = in.Name - out.Protocol = newer.Protocol(in.Protocol) + out.Protocol = api.Protocol(in.Protocol) out.Port = in.Port if err := s.Convert(&in.TargetPort, &out.TargetPort, 0); err != nil { return err @@ -4048,9 +4048,9 @@ func convert_v1_ServicePort_To_api_ServicePort(in *ServicePort, out *newer.Servi return nil } -func convert_api_ServicePort_To_v1_ServicePort(in *newer.ServicePort, out *ServicePort, s conversion.Scope) error { +func convert_api_ServicePort_To_v1_ServicePort(in *api.ServicePort, out *ServicePort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServicePort))(in) + defaulting.(func(*api.ServicePort))(in) } out.Name = in.Name out.Protocol = Protocol(in.Protocol) @@ -4061,12 +4061,12 @@ func convert_api_ServicePort_To_v1_ServicePort(in *newer.ServicePort, out *Servi return nil } -func convert_v1_ServiceSpec_To_api_ServiceSpec(in *ServiceSpec, out *newer.ServiceSpec, s conversion.Scope) error { +func convert_v1_ServiceSpec_To_api_ServiceSpec(in *ServiceSpec, out *api.ServiceSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServiceSpec))(in) } if in.Ports != nil { - out.Ports = make([]newer.ServicePort, len(in.Ports)) + out.Ports = make([]api.ServicePort, len(in.Ports)) for i := range in.Ports { if err := convert_v1_ServicePort_To_api_ServicePort(&in.Ports[i], &out.Ports[i], s); err != nil { return err @@ -4093,13 +4093,13 @@ func convert_v1_ServiceSpec_To_api_ServiceSpec(in *ServiceSpec, out *newer.Servi } else { out.PublicIPs = nil } - out.SessionAffinity = newer.ServiceAffinity(in.SessionAffinity) + out.SessionAffinity = api.ServiceAffinity(in.SessionAffinity) return nil } -func convert_api_ServiceSpec_To_v1_ServiceSpec(in *newer.ServiceSpec, out *ServiceSpec, s conversion.Scope) error { +func convert_api_ServiceSpec_To_v1_ServiceSpec(in *api.ServiceSpec, out *ServiceSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServiceSpec))(in) + defaulting.(func(*api.ServiceSpec))(in) } if in.Ports != nil { out.Ports = make([]ServicePort, len(in.Ports)) @@ -4133,21 +4133,21 @@ func convert_api_ServiceSpec_To_v1_ServiceSpec(in *newer.ServiceSpec, out *Servi return nil } -func convert_v1_ServiceStatus_To_api_ServiceStatus(in *ServiceStatus, out *newer.ServiceStatus, s conversion.Scope) error { +func convert_v1_ServiceStatus_To_api_ServiceStatus(in *ServiceStatus, out *api.ServiceStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServiceStatus))(in) } return nil } -func convert_api_ServiceStatus_To_v1_ServiceStatus(in *newer.ServiceStatus, out *ServiceStatus, s conversion.Scope) error { +func convert_api_ServiceStatus_To_v1_ServiceStatus(in *api.ServiceStatus, out *ServiceStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServiceStatus))(in) + defaulting.(func(*api.ServiceStatus))(in) } return nil } -func convert_v1_Status_To_api_Status(in *Status, out *newer.Status, s conversion.Scope) error { +func convert_v1_Status_To_api_Status(in *Status, out *api.Status, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Status))(in) } @@ -4159,9 +4159,9 @@ func convert_v1_Status_To_api_Status(in *Status, out *newer.Status, s conversion } out.Status = in.Status out.Message = in.Message - out.Reason = newer.StatusReason(in.Reason) + out.Reason = api.StatusReason(in.Reason) if in.Details != nil { - out.Details = new(newer.StatusDetails) + out.Details = new(api.StatusDetails) if err := convert_v1_StatusDetails_To_api_StatusDetails(in.Details, out.Details, s); err != nil { return err } @@ -4172,9 +4172,9 @@ func convert_v1_Status_To_api_Status(in *Status, out *newer.Status, s conversion return nil } -func convert_api_Status_To_v1_Status(in *newer.Status, out *Status, s conversion.Scope) error { +func convert_api_Status_To_v1_Status(in *api.Status, out *Status, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Status))(in) + defaulting.(func(*api.Status))(in) } if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -4197,19 +4197,19 @@ func convert_api_Status_To_v1_Status(in *newer.Status, out *Status, s conversion return nil } -func convert_v1_StatusCause_To_api_StatusCause(in *StatusCause, out *newer.StatusCause, s conversion.Scope) error { +func convert_v1_StatusCause_To_api_StatusCause(in *StatusCause, out *api.StatusCause, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*StatusCause))(in) } - out.Type = newer.CauseType(in.Type) + out.Type = api.CauseType(in.Type) out.Message = in.Message out.Field = in.Field return nil } -func convert_api_StatusCause_To_v1_StatusCause(in *newer.StatusCause, out *StatusCause, s conversion.Scope) error { +func convert_api_StatusCause_To_v1_StatusCause(in *api.StatusCause, out *StatusCause, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.StatusCause))(in) + defaulting.(func(*api.StatusCause))(in) } out.Type = CauseType(in.Type) out.Message = in.Message @@ -4217,14 +4217,14 @@ func convert_api_StatusCause_To_v1_StatusCause(in *newer.StatusCause, out *Statu return nil } -func convert_v1_StatusDetails_To_api_StatusDetails(in *StatusDetails, out *newer.StatusDetails, s conversion.Scope) error { +func convert_v1_StatusDetails_To_api_StatusDetails(in *StatusDetails, out *api.StatusDetails, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*StatusDetails))(in) } out.ID = in.ID out.Kind = in.Kind if in.Causes != nil { - out.Causes = make([]newer.StatusCause, len(in.Causes)) + out.Causes = make([]api.StatusCause, len(in.Causes)) for i := range in.Causes { if err := convert_v1_StatusCause_To_api_StatusCause(&in.Causes[i], &out.Causes[i], s); err != nil { return err @@ -4237,9 +4237,9 @@ func convert_v1_StatusDetails_To_api_StatusDetails(in *StatusDetails, out *newer return nil } -func convert_api_StatusDetails_To_v1_StatusDetails(in *newer.StatusDetails, out *StatusDetails, s conversion.Scope) error { +func convert_api_StatusDetails_To_v1_StatusDetails(in *api.StatusDetails, out *StatusDetails, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.StatusDetails))(in) + defaulting.(func(*api.StatusDetails))(in) } out.ID = in.ID out.Kind = in.Kind @@ -4257,7 +4257,7 @@ func convert_api_StatusDetails_To_v1_StatusDetails(in *newer.StatusDetails, out return nil } -func convert_v1_TCPSocketAction_To_api_TCPSocketAction(in *TCPSocketAction, out *newer.TCPSocketAction, s conversion.Scope) error { +func convert_v1_TCPSocketAction_To_api_TCPSocketAction(in *TCPSocketAction, out *api.TCPSocketAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*TCPSocketAction))(in) } @@ -4267,9 +4267,9 @@ func convert_v1_TCPSocketAction_To_api_TCPSocketAction(in *TCPSocketAction, out return nil } -func convert_api_TCPSocketAction_To_v1_TCPSocketAction(in *newer.TCPSocketAction, out *TCPSocketAction, s conversion.Scope) error { +func convert_api_TCPSocketAction_To_v1_TCPSocketAction(in *api.TCPSocketAction, out *TCPSocketAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.TCPSocketAction))(in) + defaulting.(func(*api.TCPSocketAction))(in) } if err := s.Convert(&in.Port, &out.Port, 0); err != nil { return err @@ -4277,7 +4277,7 @@ func convert_api_TCPSocketAction_To_v1_TCPSocketAction(in *newer.TCPSocketAction return nil } -func convert_v1_TypeMeta_To_api_TypeMeta(in *TypeMeta, out *newer.TypeMeta, s conversion.Scope) error { +func convert_v1_TypeMeta_To_api_TypeMeta(in *TypeMeta, out *api.TypeMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*TypeMeta))(in) } @@ -4286,16 +4286,16 @@ func convert_v1_TypeMeta_To_api_TypeMeta(in *TypeMeta, out *newer.TypeMeta, s co return nil } -func convert_api_TypeMeta_To_v1_TypeMeta(in *newer.TypeMeta, out *TypeMeta, s conversion.Scope) error { +func convert_api_TypeMeta_To_v1_TypeMeta(in *api.TypeMeta, out *TypeMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.TypeMeta))(in) + defaulting.(func(*api.TypeMeta))(in) } out.Kind = in.Kind out.APIVersion = in.APIVersion return nil } -func convert_v1_Volume_To_api_Volume(in *Volume, out *newer.Volume, s conversion.Scope) error { +func convert_v1_Volume_To_api_Volume(in *Volume, out *api.Volume, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Volume))(in) } @@ -4306,9 +4306,9 @@ func convert_v1_Volume_To_api_Volume(in *Volume, out *newer.Volume, s conversion return nil } -func convert_api_Volume_To_v1_Volume(in *newer.Volume, out *Volume, s conversion.Scope) error { +func convert_api_Volume_To_v1_Volume(in *api.Volume, out *Volume, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Volume))(in) + defaulting.(func(*api.Volume))(in) } out.Name = in.Name if err := convert_api_VolumeSource_To_v1_VolumeSource(&in.VolumeSource, &out.VolumeSource, s); err != nil { @@ -4317,7 +4317,7 @@ func convert_api_Volume_To_v1_Volume(in *newer.Volume, out *Volume, s conversion return nil } -func convert_v1_VolumeMount_To_api_VolumeMount(in *VolumeMount, out *newer.VolumeMount, s conversion.Scope) error { +func convert_v1_VolumeMount_To_api_VolumeMount(in *VolumeMount, out *api.VolumeMount, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*VolumeMount))(in) } @@ -4327,9 +4327,9 @@ func convert_v1_VolumeMount_To_api_VolumeMount(in *VolumeMount, out *newer.Volum return nil } -func convert_api_VolumeMount_To_v1_VolumeMount(in *newer.VolumeMount, out *VolumeMount, s conversion.Scope) error { +func convert_api_VolumeMount_To_v1_VolumeMount(in *api.VolumeMount, out *VolumeMount, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.VolumeMount))(in) + defaulting.(func(*api.VolumeMount))(in) } out.Name = in.Name out.ReadOnly = in.ReadOnly @@ -4337,12 +4337,12 @@ func convert_api_VolumeMount_To_v1_VolumeMount(in *newer.VolumeMount, out *Volum return nil } -func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.VolumeSource, s conversion.Scope) error { +func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *api.VolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*VolumeSource))(in) } if in.HostPath != nil { - out.HostPath = new(newer.HostPathVolumeSource) + out.HostPath = new(api.HostPathVolumeSource) if err := convert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource(in.HostPath, out.HostPath, s); err != nil { return err } @@ -4350,7 +4350,7 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.Vo out.HostPath = nil } if in.EmptyDir != nil { - out.EmptyDir = new(newer.EmptyDirVolumeSource) + out.EmptyDir = new(api.EmptyDirVolumeSource) if err := convert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in.EmptyDir, out.EmptyDir, s); err != nil { return err } @@ -4358,7 +4358,7 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.Vo out.EmptyDir = nil } if in.GCEPersistentDisk != nil { - out.GCEPersistentDisk = new(newer.GCEPersistentDiskVolumeSource) + out.GCEPersistentDisk = new(api.GCEPersistentDiskVolumeSource) if err := convert_v1_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in.GCEPersistentDisk, out.GCEPersistentDisk, s); err != nil { return err } @@ -4366,7 +4366,7 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.Vo out.GCEPersistentDisk = nil } if in.AWSElasticBlockStore != nil { - out.AWSElasticBlockStore = new(newer.AWSElasticBlockStoreVolumeSource) + out.AWSElasticBlockStore = new(api.AWSElasticBlockStoreVolumeSource) if err := convert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in.AWSElasticBlockStore, out.AWSElasticBlockStore, s); err != nil { return err } @@ -4374,7 +4374,7 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.Vo out.AWSElasticBlockStore = nil } if in.GitRepo != nil { - out.GitRepo = new(newer.GitRepoVolumeSource) + out.GitRepo = new(api.GitRepoVolumeSource) if err := convert_v1_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in.GitRepo, out.GitRepo, s); err != nil { return err } @@ -4382,7 +4382,7 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.Vo out.GitRepo = nil } if in.Secret != nil { - out.Secret = new(newer.SecretVolumeSource) + out.Secret = new(api.SecretVolumeSource) if err := convert_v1_SecretVolumeSource_To_api_SecretVolumeSource(in.Secret, out.Secret, s); err != nil { return err } @@ -4390,7 +4390,7 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.Vo out.Secret = nil } if in.NFS != nil { - out.NFS = new(newer.NFSVolumeSource) + out.NFS = new(api.NFSVolumeSource) if err := convert_v1_NFSVolumeSource_To_api_NFSVolumeSource(in.NFS, out.NFS, s); err != nil { return err } @@ -4398,7 +4398,7 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.Vo out.NFS = nil } if in.ISCSI != nil { - out.ISCSI = new(newer.ISCSIVolumeSource) + out.ISCSI = new(api.ISCSIVolumeSource) if err := convert_v1_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in.ISCSI, out.ISCSI, s); err != nil { return err } @@ -4406,7 +4406,7 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.Vo out.ISCSI = nil } if in.Glusterfs != nil { - out.Glusterfs = new(newer.GlusterfsVolumeSource) + out.Glusterfs = new(api.GlusterfsVolumeSource) if err := convert_v1_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in.Glusterfs, out.Glusterfs, s); err != nil { return err } @@ -4414,7 +4414,7 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.Vo out.Glusterfs = nil } if in.PersistentVolumeClaimVolumeSource != nil { - out.PersistentVolumeClaimVolumeSource = new(newer.PersistentVolumeClaimVolumeSource) + out.PersistentVolumeClaimVolumeSource = new(api.PersistentVolumeClaimVolumeSource) if err := convert_v1_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in.PersistentVolumeClaimVolumeSource, out.PersistentVolumeClaimVolumeSource, s); err != nil { return err } @@ -4424,9 +4424,9 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.Vo return nil } -func convert_api_VolumeSource_To_v1_VolumeSource(in *newer.VolumeSource, out *VolumeSource, s conversion.Scope) error { +func convert_api_VolumeSource_To_v1_VolumeSource(in *api.VolumeSource, out *VolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.VolumeSource))(in) + defaulting.(func(*api.VolumeSource))(in) } if in.HostPath != nil { out.HostPath = new(HostPathVolumeSource) @@ -4512,7 +4512,7 @@ func convert_api_VolumeSource_To_v1_VolumeSource(in *newer.VolumeSource, out *Vo } func init() { - err := newer.Scheme.AddGeneratedConversionFuncs( + err := api.Scheme.AddGeneratedConversionFuncs( convert_api_AWSElasticBlockStoreVolumeSource_To_v1_AWSElasticBlockStoreVolumeSource, convert_api_Binding_To_v1_Binding, convert_api_Capabilities_To_v1_Capabilities, diff --git a/pkg/api/v1/conversion_test.go b/pkg/api/v1/conversion_test.go index 3722d84d7d7..8611567e116 100644 --- a/pkg/api/v1/conversion_test.go +++ b/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) } } diff --git a/pkg/api/v1beta1/conversion.go b/pkg/api/v1beta1/conversion.go index 56cf5c2395e..9024d7b69c0 100644 --- a/pkg/api/v1beta1/conversion.go +++ b/pkg/api/v1beta1/conversion.go @@ -22,7 +22,7 @@ import ( "reflect" "strconv" - 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" "github.com/GoogleCloudPlatform/kubernetes/pkg/util" @@ -30,34 +30,34 @@ import ( func addConversionFuncs() { // Our TypeMeta was split into two different structs. - newer.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", newer.TypeMeta{}, "TypeMeta") - newer.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", newer.ObjectMeta{}, "ObjectMeta") - newer.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", newer.ListMeta{}, "ListMeta") + api.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", api.TypeMeta{}, "TypeMeta") + api.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", api.ObjectMeta{}, "ObjectMeta") + api.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", api.ListMeta{}, "ListMeta") - newer.Scheme.AddStructFieldConversion(newer.TypeMeta{}, "TypeMeta", TypeMeta{}, "TypeMeta") - newer.Scheme.AddStructFieldConversion(newer.ObjectMeta{}, "ObjectMeta", TypeMeta{}, "TypeMeta") - newer.Scheme.AddStructFieldConversion(newer.ListMeta{}, "ListMeta", TypeMeta{}, "TypeMeta") - newer.Scheme.AddStructFieldConversion(newer.Endpoints{}, "Endpoints", Endpoints{}, "Endpoints") + api.Scheme.AddStructFieldConversion(api.TypeMeta{}, "TypeMeta", TypeMeta{}, "TypeMeta") + api.Scheme.AddStructFieldConversion(api.ObjectMeta{}, "ObjectMeta", TypeMeta{}, "TypeMeta") + api.Scheme.AddStructFieldConversion(api.ListMeta{}, "ListMeta", TypeMeta{}, "TypeMeta") + api.Scheme.AddStructFieldConversion(api.Endpoints{}, "Endpoints", Endpoints{}, "Endpoints") // TODO: scope this to a specific type once that becomes available and remove the Event conversion functions below - // newer.Scheme.AddStructFieldConversion(string(""), "Status", string(""), "Condition") - // newer.Scheme.AddStructFieldConversion(string(""), "Condition", string(""), "Status") + // api.Scheme.AddStructFieldConversion(string(""), "Status", string(""), "Condition") + // api.Scheme.AddStructFieldConversion(string(""), "Condition", string(""), "Status") - err := newer.Scheme.AddConversionFuncs( + err := api.Scheme.AddConversionFuncs( // TypeMeta must be split into two objects - func(in *newer.TypeMeta, out *TypeMeta, s conversion.Scope) error { + func(in *api.TypeMeta, out *TypeMeta, s conversion.Scope) error { out.Kind = in.Kind out.APIVersion = in.APIVersion return nil }, - func(in *TypeMeta, out *newer.TypeMeta, s conversion.Scope) error { + func(in *TypeMeta, out *api.TypeMeta, s conversion.Scope) error { out.Kind = in.Kind out.APIVersion = in.APIVersion return nil }, // ListMeta must be converted to TypeMeta - func(in *newer.ListMeta, out *TypeMeta, s conversion.Scope) error { + func(in *api.ListMeta, out *TypeMeta, s conversion.Scope) error { out.SelfLink = in.SelfLink if len(in.ResourceVersion) > 0 { v, err := strconv.ParseUint(in.ResourceVersion, 10, 64) @@ -68,7 +68,7 @@ func addConversionFuncs() { } return nil }, - func(in *TypeMeta, out *newer.ListMeta, s conversion.Scope) error { + func(in *TypeMeta, out *api.ListMeta, s conversion.Scope) error { out.SelfLink = in.SelfLink if in.ResourceVersion != 0 { out.ResourceVersion = strconv.FormatUint(in.ResourceVersion, 10) @@ -79,7 +79,7 @@ func addConversionFuncs() { }, // ObjectMeta must be converted to TypeMeta - func(in *newer.ObjectMeta, out *TypeMeta, s conversion.Scope) error { + func(in *api.ObjectMeta, out *TypeMeta, s conversion.Scope) error { out.Namespace = in.Namespace out.ID = in.Name out.GenerateName = in.GenerateName @@ -96,7 +96,7 @@ func addConversionFuncs() { } return s.Convert(&in.Annotations, &out.Annotations, 0) }, - func(in *TypeMeta, out *newer.ObjectMeta, s conversion.Scope) error { + func(in *TypeMeta, out *api.ObjectMeta, s conversion.Scope) error { out.Namespace = in.Namespace out.Name = in.ID out.GenerateName = in.GenerateName @@ -113,7 +113,7 @@ func addConversionFuncs() { }, // EnvVar's Key is deprecated in favor of Name. - func(in *newer.EnvVar, out *EnvVar, s conversion.Scope) error { + func(in *api.EnvVar, out *EnvVar, s conversion.Scope) error { out.Value = in.Value out.Key = in.Name out.Name = in.Name @@ -124,7 +124,7 @@ func addConversionFuncs() { return nil }, - func(in *EnvVar, out *newer.EnvVar, s conversion.Scope) error { + func(in *EnvVar, out *api.EnvVar, s conversion.Scope) error { out.Value = in.Value if in.Name != "" { out.Name = in.Name @@ -139,7 +139,7 @@ func addConversionFuncs() { return nil }, // Path & MountType are deprecated. - func(in *newer.VolumeMount, out *VolumeMount, s conversion.Scope) error { + func(in *api.VolumeMount, out *VolumeMount, s conversion.Scope) error { out.Name = in.Name out.ReadOnly = in.ReadOnly out.MountPath = in.MountPath @@ -147,7 +147,7 @@ func addConversionFuncs() { out.MountType = "" // MountType is ignored. return nil }, - func(in *VolumeMount, out *newer.VolumeMount, s conversion.Scope) error { + func(in *VolumeMount, out *api.VolumeMount, s conversion.Scope) error { out.Name = in.Name out.ReadOnly = in.ReadOnly if in.MountPath == "" { @@ -159,7 +159,7 @@ func addConversionFuncs() { }, // MinionList.Items had a wrong name in v1beta1 - func(in *newer.NodeList, out *MinionList, s conversion.Scope) error { + func(in *api.NodeList, out *MinionList, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -172,7 +172,7 @@ func addConversionFuncs() { out.Minions = out.Items return nil }, - func(in *MinionList, out *newer.NodeList, s conversion.Scope) error { + func(in *MinionList, out *api.NodeList, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -191,7 +191,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.PodStatus, out *PodState, s conversion.Scope) error { + func(in *api.PodStatus, out *PodState, s conversion.Scope) error { if err := s.Convert(&in.Phase, &out.Status, 0); err != nil { return err } @@ -206,7 +206,7 @@ func addConversionFuncs() { out.PodIP = in.PodIP return nil }, - func(in *PodState, out *newer.PodStatus, s conversion.Scope) error { + func(in *PodState, out *api.PodStatus, s conversion.Scope) error { if err := s.Convert(&in.Status, &out.Phase, 0); err != nil { return err } @@ -222,14 +222,14 @@ func addConversionFuncs() { out.PodIP = in.PodIP return nil }, - func(in *newer.PodSpec, out *PodState, s conversion.Scope) error { + func(in *api.PodSpec, out *PodState, s conversion.Scope) error { if err := s.Convert(&in, &out.Manifest, 0); err != nil { return err } out.Host = in.Host return nil }, - func(in *PodState, out *newer.PodSpec, s conversion.Scope) error { + func(in *PodState, out *api.PodSpec, s conversion.Scope) error { if err := s.Convert(&in.Manifest, &out, 0); err != nil { return err } @@ -237,7 +237,7 @@ func addConversionFuncs() { return nil }, - func(in *[]newer.ContainerStatus, out *PodInfo, s conversion.Scope) error { + func(in *[]api.ContainerStatus, out *PodInfo, s conversion.Scope) error { *out = make(map[string]ContainerStatus) for _, st := range *in { v := ContainerStatus{} @@ -248,9 +248,9 @@ func addConversionFuncs() { } return nil }, - func(in *PodInfo, out *[]newer.ContainerStatus, s conversion.Scope) error { + func(in *PodInfo, out *[]api.ContainerStatus, s conversion.Scope) error { for k, v := range *in { - st := newer.ContainerStatus{} + st := api.ContainerStatus{} if err := s.Convert(&v, &st, 0); err != nil { return err } @@ -260,7 +260,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.ContainerStatus, out *ContainerStatus, s conversion.Scope) error { + func(in *api.ContainerStatus, out *ContainerStatus, s conversion.Scope) error { if err := s.Convert(&in.State, &out.State, 0); err != nil { return err } @@ -284,7 +284,7 @@ func addConversionFuncs() { } return nil }, - func(in *ContainerStatus, out *newer.ContainerStatus, s conversion.Scope) error { + func(in *ContainerStatus, out *api.ContainerStatus, s conversion.Scope) error { if err := s.Convert(&in.State, &out.State, 0); err != nil { return err } @@ -310,22 +310,22 @@ func addConversionFuncs() { }, // Convert all to the new PodPhase constants - func(in *newer.PodPhase, out *PodStatus, s conversion.Scope) error { + func(in *api.PodPhase, out *PodStatus, s conversion.Scope) error { switch *in { case "": *out = "" - case newer.PodPending: + case api.PodPending: *out = PodWaiting - case newer.PodRunning: + case api.PodRunning: *out = PodRunning - case newer.PodSucceeded: + case api.PodSucceeded: *out = PodSucceeded - case newer.PodFailed: + case api.PodFailed: *out = PodTerminated - case newer.PodUnknown: + case api.PodUnknown: *out = PodUnknown default: - return &newer.ConversionError{ + return &api.ConversionError{ In: in, Out: out, Message: "The string provided is not a valid PodPhase constant value", @@ -335,23 +335,23 @@ func addConversionFuncs() { return nil }, - func(in *PodStatus, out *newer.PodPhase, s conversion.Scope) error { + func(in *PodStatus, out *api.PodPhase, s conversion.Scope) error { switch *in { case "": *out = "" case PodWaiting: - *out = newer.PodPending + *out = api.PodPending case PodRunning: - *out = newer.PodRunning + *out = api.PodRunning case PodTerminated: // Older API versions did not contain enough info to map to PodSucceeded - *out = newer.PodFailed + *out = api.PodFailed case PodSucceeded: - *out = newer.PodSucceeded + *out = api.PodSucceeded case PodUnknown: - *out = newer.PodUnknown + *out = api.PodUnknown default: - return &newer.ConversionError{ + return &api.ConversionError{ In: in, Out: out, Message: "The string provided is not a valid PodPhase constant value", @@ -361,7 +361,7 @@ func addConversionFuncs() { }, // Convert all the standard objects - func(in *newer.Pod, out *Pod, s conversion.Scope) error { + func(in *api.Pod, out *Pod, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -386,7 +386,7 @@ func addConversionFuncs() { } return nil }, - func(in *Pod, out *newer.Pod, s conversion.Scope) error { + func(in *Pod, out *api.Pod, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -409,7 +409,7 @@ func addConversionFuncs() { } return nil }, - func(in *newer.PodStatusResult, out *PodStatusResult, s conversion.Scope) error { + func(in *api.PodStatusResult, out *PodStatusResult, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -421,7 +421,7 @@ func addConversionFuncs() { } return nil }, - func(in *PodStatusResult, out *newer.PodStatusResult, s conversion.Scope) error { + func(in *PodStatusResult, out *api.PodStatusResult, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -434,7 +434,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.ReplicationController, out *ReplicationController, s conversion.Scope) error { + func(in *api.ReplicationController, out *ReplicationController, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -451,7 +451,7 @@ func addConversionFuncs() { out.CurrentState.Replicas = in.Status.Replicas return nil }, - func(in *ReplicationController, out *newer.ReplicationController, s conversion.Scope) error { + func(in *ReplicationController, out *api.ReplicationController, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -469,13 +469,13 @@ func addConversionFuncs() { return nil }, - func(in *newer.ReplicationControllerSpec, out *ReplicationControllerState, s conversion.Scope) error { + func(in *api.ReplicationControllerSpec, out *ReplicationControllerState, s conversion.Scope) error { out.Replicas = in.Replicas if err := s.Convert(&in.Selector, &out.ReplicaSelector, 0); err != nil { return err } if in.TemplateRef != nil && in.Template == nil { - return &newer.ConversionError{ + return &api.ConversionError{ In: in, Out: out, Message: "objects with a template ref cannot be converted to older objects, must populate template", @@ -488,19 +488,19 @@ func addConversionFuncs() { } return nil }, - func(in *ReplicationControllerState, out *newer.ReplicationControllerSpec, s conversion.Scope) error { + func(in *ReplicationControllerState, out *api.ReplicationControllerSpec, s conversion.Scope) error { out.Replicas = in.Replicas if err := s.Convert(&in.ReplicaSelector, &out.Selector, 0); err != nil { return err } - out.Template = &newer.PodTemplateSpec{} + out.Template = &api.PodTemplateSpec{} if err := s.Convert(&in.PodTemplate, out.Template, 0); err != nil { return err } return nil }, - func(in *newer.PodTemplateSpec, out *PodTemplate, s conversion.Scope) error { + func(in *api.PodTemplateSpec, out *PodTemplate, s conversion.Scope) error { if err := s.Convert(&in.Spec, &out.DesiredState.Manifest, 0); err != nil { return err } @@ -517,7 +517,7 @@ func addConversionFuncs() { } return nil }, - func(in *PodTemplate, out *newer.PodTemplateSpec, s conversion.Scope) error { + func(in *PodTemplate, out *api.PodTemplateSpec, s conversion.Scope) error { if err := s.Convert(&in.DesiredState.Manifest, &out.Spec, 0); err != nil { return err } @@ -538,7 +538,7 @@ func addConversionFuncs() { // Converts internal Container to v1beta1.Container. // Fields 'CPU' and 'Memory' are not present in the internal Container object. // Hence the need for a custom conversion function. - func(in *newer.Container, out *Container, s conversion.Scope) error { + func(in *api.Container, out *Container, s conversion.Scope) error { if err := s.Convert(&in.Name, &out.Name, 0); err != nil { return err } @@ -602,7 +602,7 @@ func addConversionFuncs() { }, // Internal API does not support CPU to be specified via an explicit field. // Hence it must be stored in Container.Resources. - func(in *int, out *newer.ResourceList, s conversion.Scope) error { + func(in *int, out *api.ResourceList, s conversion.Scope) error { if *in <= 0 { return nil } @@ -610,12 +610,12 @@ func addConversionFuncs() { if err := s.Convert(in, &quantity, 0); err != nil { return err } - (*out)[newer.ResourceCPU] = quantity + (*out)[api.ResourceCPU] = quantity return nil }, // Internal API does not support Memory to be specified via an explicit field. // Hence it must be stored in Container.Resources. - func(in *int64, out *newer.ResourceList, s conversion.Scope) error { + func(in *int64, out *api.ResourceList, s conversion.Scope) error { if *in <= 0 { return nil } @@ -623,13 +623,13 @@ func addConversionFuncs() { if err := s.Convert(in, &quantity, 0); err != nil { return err } - (*out)[newer.ResourceMemory] = quantity + (*out)[api.ResourceMemory] = quantity return nil }, // Converts v1beta1.Container to internal Container. // Fields 'CPU' and 'Memory' are not present in the internal Container object. // Hence the need for a custom conversion function. - func(in *Container, out *newer.Container, s conversion.Scope) error { + func(in *Container, out *api.Container, s conversion.Scope) error { if err := s.Convert(&in.Name, &out.Name, 0); err != nil { return err } @@ -696,7 +696,7 @@ func addConversionFuncs() { } return nil }, - func(in *newer.PodSpec, out *ContainerManifest, s conversion.Scope) error { + func(in *api.PodSpec, out *ContainerManifest, s conversion.Scope) error { if err := s.Convert(&in.Volumes, &out.Volumes, 0); err != nil { return err } @@ -722,7 +722,7 @@ func addConversionFuncs() { out.HostNetwork = in.HostNetwork return nil }, - func(in *ContainerManifest, out *newer.PodSpec, s conversion.Scope) error { + func(in *ContainerManifest, out *api.PodSpec, s conversion.Scope) error { if err := s.Convert(&in.Volumes, &out.Volumes, 0); err != nil { return err } @@ -743,12 +743,12 @@ func addConversionFuncs() { out.ActiveDeadlineSeconds = new(int64) *out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds } - out.DNSPolicy = newer.DNSPolicy(in.DNSPolicy) + out.DNSPolicy = api.DNSPolicy(in.DNSPolicy) out.HostNetwork = in.HostNetwork return nil }, - func(in *newer.Service, out *Service, s conversion.Scope) error { + func(in *api.Service, out *Service, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -789,7 +789,7 @@ func addConversionFuncs() { return nil }, - func(in *Service, out *newer.Service, s conversion.Scope) error { + func(in *Service, out *api.Service, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -802,19 +802,19 @@ func addConversionFuncs() { if len(in.Ports) == 0 && in.Port != 0 { // Use legacy fields to produce modern fields. - out.Spec.Ports = append(out.Spec.Ports, newer.ServicePort{ + out.Spec.Ports = append(out.Spec.Ports, api.ServicePort{ Name: in.PortName, Port: in.Port, - Protocol: newer.Protocol(in.Protocol), + Protocol: api.Protocol(in.Protocol), TargetPort: in.ContainerPort, }) } else { // Use modern fields, ignore legacy. for i := range in.Ports { - out.Spec.Ports = append(out.Spec.Ports, newer.ServicePort{ + out.Spec.Ports = append(out.Spec.Ports, api.ServicePort{ Name: in.Ports[i].Name, Port: in.Ports[i].Port, - Protocol: newer.Protocol(in.Ports[i].Protocol), + Protocol: api.Protocol(in.Ports[i].Protocol), TargetPort: in.Ports[i].ContainerPort, }) } @@ -833,7 +833,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.Node, out *Minion, s conversion.Scope) error { + func(in *api.Node, out *Minion, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -857,7 +857,7 @@ func addConversionFuncs() { } for _, address := range in.Status.Addresses { - if address.Type == newer.NodeLegacyHostIP { + if address.Type == api.NodeLegacyHostIP { out.HostIP = address.Address } } @@ -866,7 +866,7 @@ func addConversionFuncs() { out.Unschedulable = in.Spec.Unschedulable return s.Convert(&in.Status.Capacity, &out.NodeResources.Capacity, 0) }, - func(in *Minion, out *newer.Node, s conversion.Scope) error { + func(in *Minion, out *api.Node, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -890,8 +890,8 @@ func addConversionFuncs() { } if in.HostIP != "" { - newer.AddToNodeAddresses(&out.Status.Addresses, - newer.NodeAddress{Type: newer.NodeLegacyHostIP, Address: in.HostIP}) + api.AddToNodeAddresses(&out.Status.Addresses, + api.NodeAddress{Type: api.NodeLegacyHostIP, Address: in.HostIP}) } out.Spec.PodCIDR = in.PodCIDR out.Spec.ExternalID = in.ExternalID @@ -899,7 +899,7 @@ func addConversionFuncs() { return s.Convert(&in.NodeResources.Capacity, &out.Status.Capacity, 0) }, - func(in *newer.LimitRange, out *LimitRange, s conversion.Scope) error { + func(in *api.LimitRange, out *LimitRange, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -911,7 +911,7 @@ func addConversionFuncs() { } return nil }, - func(in *LimitRange, out *newer.LimitRange, s conversion.Scope) error { + func(in *LimitRange, out *api.LimitRange, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -924,7 +924,7 @@ func addConversionFuncs() { return nil }, - func(in *Namespace, out *newer.Namespace, s conversion.Scope) error { + func(in *Namespace, out *api.Namespace, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -943,7 +943,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.LimitRangeSpec, out *LimitRangeSpec, s conversion.Scope) error { + func(in *api.LimitRangeSpec, out *LimitRangeSpec, s conversion.Scope) error { *out = LimitRangeSpec{} out.Limits = make([]LimitRangeItem, len(in.Limits), len(in.Limits)) for i := range in.Limits { @@ -953,9 +953,9 @@ func addConversionFuncs() { } return nil }, - func(in *LimitRangeSpec, out *newer.LimitRangeSpec, s conversion.Scope) error { - *out = newer.LimitRangeSpec{} - out.Limits = make([]newer.LimitRangeItem, len(in.Limits), len(in.Limits)) + func(in *LimitRangeSpec, out *api.LimitRangeSpec, s conversion.Scope) error { + *out = api.LimitRangeSpec{} + out.Limits = make([]api.LimitRangeItem, len(in.Limits), len(in.Limits)) for i := range in.Limits { if err := s.Convert(&in.Limits[i], &out.Limits[i], 0); err != nil { return err @@ -964,7 +964,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.LimitRangeItem, out *LimitRangeItem, s conversion.Scope) error { + func(in *api.LimitRangeItem, out *LimitRangeItem, s conversion.Scope) error { *out = LimitRangeItem{} out.Type = LimitType(in.Type) if err := s.Convert(&in.Max, &out.Max, 0); err != nil { @@ -978,9 +978,9 @@ func addConversionFuncs() { } return nil }, - func(in *LimitRangeItem, out *newer.LimitRangeItem, s conversion.Scope) error { - *out = newer.LimitRangeItem{} - out.Type = newer.LimitType(in.Type) + func(in *LimitRangeItem, out *api.LimitRangeItem, s conversion.Scope) error { + *out = api.LimitRangeItem{} + out.Type = api.LimitType(in.Type) if err := s.Convert(&in.Max, &out.Max, 0); err != nil { return err } @@ -993,7 +993,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.ResourceQuota, out *ResourceQuota, s conversion.Scope) error { + func(in *api.ResourceQuota, out *ResourceQuota, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -1011,7 +1011,7 @@ func addConversionFuncs() { } return nil }, - func(in *ResourceQuota, out *newer.ResourceQuota, s conversion.Scope) error { + func(in *ResourceQuota, out *api.ResourceQuota, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -1030,22 +1030,22 @@ func addConversionFuncs() { return nil }, - func(in *newer.ResourceQuotaSpec, out *ResourceQuotaSpec, s conversion.Scope) error { + func(in *api.ResourceQuotaSpec, out *ResourceQuotaSpec, s conversion.Scope) error { *out = ResourceQuotaSpec{} if err := s.Convert(&in.Hard, &out.Hard, 0); err != nil { return err } return nil }, - func(in *ResourceQuotaSpec, out *newer.ResourceQuotaSpec, s conversion.Scope) error { - *out = newer.ResourceQuotaSpec{} + func(in *ResourceQuotaSpec, out *api.ResourceQuotaSpec, s conversion.Scope) error { + *out = api.ResourceQuotaSpec{} if err := s.Convert(&in.Hard, &out.Hard, 0); err != nil { return err } return nil }, - func(in *newer.ResourceQuotaStatus, out *ResourceQuotaStatus, s conversion.Scope) error { + func(in *api.ResourceQuotaStatus, out *ResourceQuotaStatus, s conversion.Scope) error { *out = ResourceQuotaStatus{} if err := s.Convert(&in.Hard, &out.Hard, 0); err != nil { return err @@ -1055,8 +1055,8 @@ func addConversionFuncs() { } return nil }, - func(in *ResourceQuotaStatus, out *newer.ResourceQuotaStatus, s conversion.Scope) error { - *out = newer.ResourceQuotaStatus{} + func(in *ResourceQuotaStatus, out *api.ResourceQuotaStatus, s conversion.Scope) error { + *out = api.ResourceQuotaStatus{} if err := s.Convert(&in.Hard, &out.Hard, 0); err != nil { return err } @@ -1068,7 +1068,7 @@ func addConversionFuncs() { // Object ID <-> Name // TODO: amend the conversion package to allow overriding specific fields. - func(in *ObjectReference, out *newer.ObjectReference, s conversion.Scope) error { + func(in *ObjectReference, out *api.ObjectReference, s conversion.Scope) error { out.Kind = in.Kind out.Namespace = in.Namespace out.Name = in.ID @@ -1078,7 +1078,7 @@ func addConversionFuncs() { out.FieldPath = in.FieldPath return nil }, - func(in *newer.ObjectReference, out *ObjectReference, s conversion.Scope) error { + func(in *api.ObjectReference, out *ObjectReference, s conversion.Scope) error { out.Kind = in.Kind out.Namespace = in.Namespace out.ID = in.Name @@ -1092,7 +1092,7 @@ func addConversionFuncs() { // Event Source <-> Source.Component // Event Host <-> Source.Host // TODO: remove this when it becomes possible to specify a field name conversion on a specific type - func(in *newer.Event, out *Event, s conversion.Scope) error { + func(in *api.Event, out *Event, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -1110,7 +1110,7 @@ func addConversionFuncs() { return s.Convert(&in.InvolvedObject, &out.InvolvedObject, 0) }, - func(in *Event, out *newer.Event, s conversion.Scope) error { + func(in *Event, out *api.Event, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -1159,28 +1159,28 @@ func addConversionFuncs() { }, // Convert resource lists. - func(in *ResourceList, out *newer.ResourceList, s conversion.Scope) error { - *out = newer.ResourceList{} + func(in *ResourceList, out *api.ResourceList, s conversion.Scope) error { + *out = api.ResourceList{} for k, v := range *in { fv, err := strconv.ParseFloat(v.String(), 64) if err != nil { - return &newer.ConversionError{ + return &api.ConversionError{ In: in, Out: out, Message: fmt.Sprintf("value '%v' of '%v': %v", v, k, err), } } if k == ResourceCPU { - (*out)[newer.ResourceCPU] = *resource.NewMilliQuantity(int64(fv*1000), resource.DecimalSI) + (*out)[api.ResourceCPU] = *resource.NewMilliQuantity(int64(fv*1000), resource.DecimalSI) } else { - (*out)[newer.ResourceName(k)] = *resource.NewQuantity(int64(fv), resource.BinarySI) + (*out)[api.ResourceName(k)] = *resource.NewQuantity(int64(fv), resource.BinarySI) } } return nil }, - func(in *newer.ResourceList, out *ResourceList, s conversion.Scope) error { + func(in *api.ResourceList, out *ResourceList, s conversion.Scope) error { *out = ResourceList{} for k, v := range *in { - if k == newer.ResourceCPU { + if k == api.ResourceCPU { (*out)[ResourceCPU] = util.NewIntOrStringFromString(fmt.Sprintf("%v", float64(v.MilliValue())/1000)) } else { (*out)[ResourceName(k)] = util.NewIntOrStringFromInt(int(v.Value())) @@ -1189,14 +1189,14 @@ func addConversionFuncs() { return nil }, - func(in *newer.Volume, out *Volume, s conversion.Scope) error { + func(in *api.Volume, out *Volume, s conversion.Scope) error { if err := s.Convert(&in.VolumeSource, &out.Source, 0); err != nil { return err } out.Name = in.Name return nil }, - func(in *Volume, out *newer.Volume, s conversion.Scope) error { + func(in *Volume, out *api.Volume, s conversion.Scope) error { if err := s.Convert(&in.Source, &out.VolumeSource, 0); err != nil { return err } @@ -1208,7 +1208,7 @@ func addConversionFuncs() { // TODO: It would be great if I could just map field names to // convert or else maybe say "convert all members of this // struct" and then fix up only the stuff that changed. - func(in *newer.VolumeSource, out *VolumeSource, s conversion.Scope) error { + func(in *api.VolumeSource, out *VolumeSource, s conversion.Scope) error { if err := s.Convert(&in.EmptyDir, &out.EmptyDir, 0); err != nil { return err } @@ -1241,7 +1241,7 @@ func addConversionFuncs() { } return nil }, - func(in *VolumeSource, out *newer.VolumeSource, s conversion.Scope) error { + func(in *VolumeSource, out *api.VolumeSource, s conversion.Scope) error { if err := s.Convert(&in.EmptyDir, &out.EmptyDir, 0); err != nil { return err } @@ -1275,13 +1275,13 @@ func addConversionFuncs() { return nil }, - func(in *newer.PullPolicy, out *PullPolicy, s conversion.Scope) error { + func(in *api.PullPolicy, out *PullPolicy, s conversion.Scope) error { switch *in { - case newer.PullAlways: + case api.PullAlways: *out = PullAlways - case newer.PullNever: + case api.PullNever: *out = PullNever - case newer.PullIfNotPresent: + case api.PullIfNotPresent: *out = PullIfNotPresent case "": *out = "" @@ -1291,51 +1291,51 @@ func addConversionFuncs() { } return nil }, - func(in *PullPolicy, out *newer.PullPolicy, s conversion.Scope) error { + func(in *PullPolicy, out *api.PullPolicy, s conversion.Scope) error { switch *in { case PullAlways: - *out = newer.PullAlways + *out = api.PullAlways case PullNever: - *out = newer.PullNever + *out = api.PullNever case PullIfNotPresent: - *out = newer.PullIfNotPresent + *out = api.PullIfNotPresent case "": *out = "" default: // Let unknown values through - they will get caught by validation - *out = newer.PullPolicy(*in) + *out = api.PullPolicy(*in) } return nil }, - func(in *newer.RestartPolicy, out *RestartPolicy, s conversion.Scope) error { + func(in *api.RestartPolicy, out *RestartPolicy, s conversion.Scope) error { switch *in { - case newer.RestartPolicyAlways: + case api.RestartPolicyAlways: *out = RestartPolicy{Always: &RestartPolicyAlways{}} - case newer.RestartPolicyNever: + case api.RestartPolicyNever: *out = RestartPolicy{Never: &RestartPolicyNever{}} - case newer.RestartPolicyOnFailure: + case api.RestartPolicyOnFailure: *out = RestartPolicy{OnFailure: &RestartPolicyOnFailure{}} default: *out = RestartPolicy{} } return nil }, - func(in *RestartPolicy, out *newer.RestartPolicy, s conversion.Scope) error { + func(in *RestartPolicy, out *api.RestartPolicy, s conversion.Scope) error { switch { case in.Always != nil: - *out = newer.RestartPolicyAlways + *out = api.RestartPolicyAlways case in.Never != nil: - *out = newer.RestartPolicyNever + *out = api.RestartPolicyNever case in.OnFailure != nil: - *out = newer.RestartPolicyOnFailure + *out = api.RestartPolicyOnFailure default: *out = "" } return nil }, - func(in *newer.Probe, out *LivenessProbe, s conversion.Scope) error { + func(in *api.Probe, out *LivenessProbe, s conversion.Scope) error { if err := s.Convert(&in.Exec, &out.Exec, 0); err != nil { return err } @@ -1349,7 +1349,7 @@ func addConversionFuncs() { out.TimeoutSeconds = in.TimeoutSeconds return nil }, - func(in *LivenessProbe, out *newer.Probe, s conversion.Scope) error { + func(in *LivenessProbe, out *api.Probe, s conversion.Scope) error { if err := s.Convert(&in.Exec, &out.Exec, 0); err != nil { return err } @@ -1364,7 +1364,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.Endpoints, out *Endpoints, s conversion.Scope) error { + func(in *api.Endpoints, out *Endpoints, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -1411,7 +1411,7 @@ func addConversionFuncs() { } return nil }, - func(in *Endpoints, out *newer.Endpoints, s conversion.Scope) error { + func(in *Endpoints, out *api.Endpoints, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -1425,7 +1425,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.NodeCondition, out *NodeCondition, s conversion.Scope) error { + func(in *api.NodeCondition, out *NodeCondition, s conversion.Scope) error { if err := s.Convert(&in.Type, &out.Kind, 0); err != nil { return err } @@ -1446,7 +1446,7 @@ func addConversionFuncs() { } return nil }, - func(in *NodeCondition, out *newer.NodeCondition, s conversion.Scope) error { + func(in *NodeCondition, out *api.NodeCondition, s conversion.Scope) error { if err := s.Convert(&in.Kind, &out.Type, 0); err != nil { return err } @@ -1468,9 +1468,9 @@ func addConversionFuncs() { return nil }, - func(in *newer.NodeConditionType, out *NodeConditionKind, s conversion.Scope) error { + func(in *api.NodeConditionType, out *NodeConditionKind, s conversion.Scope) error { switch *in { - case newer.NodeReady: + case api.NodeReady: *out = NodeReady break case "": @@ -1481,26 +1481,26 @@ func addConversionFuncs() { } return nil }, - func(in *NodeConditionKind, out *newer.NodeConditionType, s conversion.Scope) error { + func(in *NodeConditionKind, out *api.NodeConditionType, s conversion.Scope) error { switch *in { case NodeReady: - *out = newer.NodeReady + *out = api.NodeReady break case "": *out = "" default: - *out = newer.NodeConditionType(*in) + *out = api.NodeConditionType(*in) break } return nil }, - func(in *newer.ConditionStatus, out *ConditionStatus, s conversion.Scope) error { + func(in *api.ConditionStatus, out *ConditionStatus, s conversion.Scope) error { switch *in { - case newer.ConditionTrue: + case api.ConditionTrue: *out = ConditionFull break - case newer.ConditionFalse: + case api.ConditionFalse: *out = ConditionNone break default: @@ -1509,22 +1509,22 @@ func addConversionFuncs() { } return nil }, - func(in *ConditionStatus, out *newer.ConditionStatus, s conversion.Scope) error { + func(in *ConditionStatus, out *api.ConditionStatus, s conversion.Scope) error { switch *in { case ConditionFull: - *out = newer.ConditionTrue + *out = api.ConditionTrue break case ConditionNone: - *out = newer.ConditionFalse + *out = api.ConditionFalse break default: - *out = newer.ConditionStatus(*in) + *out = api.ConditionStatus(*in) break } return nil }, - func(in *newer.PodCondition, out *PodCondition, s conversion.Scope) error { + func(in *api.PodCondition, out *PodCondition, s conversion.Scope) error { if err := s.Convert(&in.Type, &out.Kind, 0); err != nil { return err } @@ -1533,7 +1533,7 @@ func addConversionFuncs() { } return nil }, - func(in *PodCondition, out *newer.PodCondition, s conversion.Scope) error { + func(in *PodCondition, out *api.PodCondition, s conversion.Scope) error { if err := s.Convert(&in.Kind, &out.Type, 0); err != nil { return err } @@ -1543,9 +1543,9 @@ func addConversionFuncs() { return nil }, - func(in *newer.PodConditionType, out *PodConditionKind, s conversion.Scope) error { + func(in *api.PodConditionType, out *PodConditionKind, s conversion.Scope) error { switch *in { - case newer.PodReady: + case api.PodReady: *out = PodReady break case "": @@ -1557,32 +1557,32 @@ func addConversionFuncs() { return nil }, - func(in *PodConditionKind, out *newer.PodConditionType, s conversion.Scope) error { + func(in *PodConditionKind, out *api.PodConditionType, s conversion.Scope) error { switch *in { case PodReady: - *out = newer.PodReady + *out = api.PodReady break case "": *out = "" default: - *out = newer.PodConditionType(*in) + *out = api.PodConditionType(*in) break } return nil }, - func(in *Binding, out *newer.Binding, s conversion.Scope) error { + func(in *Binding, out *api.Binding, s conversion.Scope) error { if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { return err } - out.Target = newer.ObjectReference{ + out.Target = api.ObjectReference{ Name: in.Host, } out.Name = in.PodID return nil }, - func(in *newer.Binding, out *Binding, s conversion.Scope) error { + func(in *api.Binding, out *Binding, s conversion.Scope) error { if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { return err } @@ -1590,11 +1590,11 @@ func addConversionFuncs() { out.PodID = in.Name return nil }, - func(in *newer.SecretVolumeSource, out *SecretVolumeSource, s conversion.Scope) error { + func(in *api.SecretVolumeSource, out *SecretVolumeSource, s conversion.Scope) error { out.Target.ID = in.SecretName return nil }, - func(in *SecretVolumeSource, out *newer.SecretVolumeSource, s conversion.Scope) error { + func(in *SecretVolumeSource, out *api.SecretVolumeSource, s conversion.Scope) error { out.SecretName = in.Target.ID return nil }, @@ -1605,7 +1605,7 @@ func addConversionFuncs() { } // Add field conversion funcs. - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "Pod", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta1", "Pod", func(label, value string) (string, string, error) { switch label { case "name": @@ -1614,8 +1614,8 @@ func addConversionFuncs() { return "spec.host", value, nil case "DesiredState.Status": podStatus := PodStatus(value) - var internalValue newer.PodPhase - newer.Scheme.Convert(&podStatus, &internalValue) + var internalValue api.PodPhase + api.Scheme.Convert(&podStatus, &internalValue) return "status.phase", string(internalValue), nil default: return "", "", fmt.Errorf("field label not supported: %s", label) @@ -1625,7 +1625,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "Node", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta1", "Node", func(label, value string) (string, string, error) { switch label { case "name": @@ -1640,7 +1640,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "ReplicationController", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta1", "ReplicationController", func(label, value string) (string, string, error) { switch label { case "name": @@ -1655,7 +1655,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "Event", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta1", "Event", func(label, value string) (string, string, error) { switch label { case "involvedObject.kind", @@ -1677,7 +1677,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "Namespace", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta1", "Namespace", func(label, value string) (string, string, error) { switch label { case "status.phase": @@ -1690,7 +1690,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "Secret", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta1", "Secret", func(label, value string) (string, string, error) { switch label { case "type": @@ -1703,7 +1703,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "ServiceAccount", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta1", "ServiceAccount", func(label, value string) (string, string, error) { switch label { case "name": diff --git a/pkg/api/v1beta1/conversion_test.go b/pkg/api/v1beta1/conversion_test.go index ab74d8fc8fc..be69b0f1eb9 100644 --- a/pkg/api/v1beta1/conversion_test.go +++ b/pkg/api/v1beta1/conversion_test.go @@ -21,16 +21,16 @@ import ( "reflect" "testing" - newer "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - current "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1" + versioned "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1" "github.com/GoogleCloudPlatform/kubernetes/pkg/util" ) -var Convert = newer.Scheme.Convert +var Convert = api.Scheme.Convert func TestEmptyObjectConversion(t *testing.T) { - s, err := current.Codec.Encode(¤t.LimitRange{}) + s, err := versioned.Codec.Encode(&versioned.LimitRange{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -41,7 +41,7 @@ func TestEmptyObjectConversion(t *testing.T) { } func TestNodeConversion(t *testing.T) { - version, kind, err := newer.Scheme.ObjectVersionAndKind(¤t.Minion{}) + version, kind, err := api.Scheme.ObjectVersionAndKind(&versioned.Minion{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -49,30 +49,30 @@ func TestNodeConversion(t *testing.T) { t.Errorf("unexpected version and kind: %s %s", version, kind) } - newer.Scheme.Log(t) - obj, err := current.Codec.Decode([]byte(`{"kind":"Node","apiVersion":"v1beta1"}`)) + api.Scheme.Log(t) + obj, err := versioned.Codec.Decode([]byte(`{"kind":"Node","apiVersion":"v1beta1"}`)) 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":"NodeList","apiVersion":"v1beta1"}`)) + obj, err = versioned.Codec.Decode([]byte(`{"kind":"NodeList","apiVersion":"v1beta1"}`)) 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":"Node","apiVersion":"v1beta1"}`), obj); err != nil { + obj = &api.Node{} + if err := versioned.Codec.DecodeInto([]byte(`{"kind":"Node","apiVersion":"v1beta1"}`), obj); err != nil { t.Fatalf("unexpected error: %v", err) } - obj = &newer.Node{} - data, err := current.Codec.Encode(obj) + obj = &api.Node{} + data, err := versioned.Codec.Encode(obj) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -86,16 +86,16 @@ func TestNodeConversion(t *testing.T) { } func TestEnvConversion(t *testing.T) { - nonCanonical := []current.EnvVar{ + nonCanonical := []versioned.EnvVar{ {Key: "EV"}, {Key: "EV", Name: "EX"}, } - canonical := []newer.EnvVar{ + canonical := []api.EnvVar{ {Name: "EV"}, {Name: "EX"}, } for i := range nonCanonical { - var got newer.EnvVar + var got api.EnvVar err := Convert(&nonCanonical[i], &got) if err != nil { t.Fatalf("unexpected error: %v", err) @@ -107,7 +107,7 @@ func TestEnvConversion(t *testing.T) { // Test conversion the other way, too. for i := range canonical { - var got current.EnvVar + var got versioned.EnvVar err := Convert(&canonical[i], &got) if err != nil { t.Fatalf("unexpected error: %v", err) @@ -123,16 +123,16 @@ func TestEnvConversion(t *testing.T) { func TestVolumeMountConversionToOld(t *testing.T) { table := []struct { - in newer.VolumeMount - out current.VolumeMount + in api.VolumeMount + out versioned.VolumeMount }{ { - in: newer.VolumeMount{Name: "foo", MountPath: "/dev/foo", ReadOnly: true}, - out: current.VolumeMount{Name: "foo", MountPath: "/dev/foo", Path: "/dev/foo", ReadOnly: true}, + in: api.VolumeMount{Name: "foo", MountPath: "/dev/foo", ReadOnly: true}, + out: versioned.VolumeMount{Name: "foo", MountPath: "/dev/foo", Path: "/dev/foo", ReadOnly: true}, }, } for _, item := range table { - got := current.VolumeMount{} + got := versioned.VolumeMount{} err := Convert(&item.in, &got) if err != nil { t.Errorf("Unexpected error: %v", err) @@ -146,22 +146,22 @@ func TestVolumeMountConversionToOld(t *testing.T) { func TestVolumeMountConversionToNew(t *testing.T) { table := []struct { - in current.VolumeMount - out newer.VolumeMount + in versioned.VolumeMount + out api.VolumeMount }{ { - in: current.VolumeMount{Name: "foo", MountPath: "/dev/foo", ReadOnly: true}, - out: newer.VolumeMount{Name: "foo", MountPath: "/dev/foo", ReadOnly: true}, + in: versioned.VolumeMount{Name: "foo", MountPath: "/dev/foo", ReadOnly: true}, + out: api.VolumeMount{Name: "foo", MountPath: "/dev/foo", ReadOnly: true}, }, { - in: current.VolumeMount{Name: "foo", MountPath: "/dev/foo", Path: "/dev/bar", ReadOnly: true}, - out: newer.VolumeMount{Name: "foo", MountPath: "/dev/foo", ReadOnly: true}, + in: versioned.VolumeMount{Name: "foo", MountPath: "/dev/foo", Path: "/dev/bar", ReadOnly: true}, + out: api.VolumeMount{Name: "foo", MountPath: "/dev/foo", ReadOnly: true}, }, { - in: current.VolumeMount{Name: "foo", Path: "/dev/bar", ReadOnly: true}, - out: newer.VolumeMount{Name: "foo", MountPath: "/dev/bar", ReadOnly: true}, + in: versioned.VolumeMount{Name: "foo", Path: "/dev/bar", ReadOnly: true}, + out: api.VolumeMount{Name: "foo", MountPath: "/dev/bar", ReadOnly: true}, }, } for _, item := range table { - got := newer.VolumeMount{} + got := api.VolumeMount{} err := Convert(&item.in, &got) if err != nil { t.Errorf("Unexpected error: %v", err) @@ -174,116 +174,116 @@ func TestVolumeMountConversionToNew(t *testing.T) { } func TestMinionListConversionToNew(t *testing.T) { - oldMinion := func(id string) current.Minion { - return current.Minion{ - TypeMeta: current.TypeMeta{ID: id}, + oldMinion := func(id string) versioned.Minion { + return versioned.Minion{ + TypeMeta: versioned.TypeMeta{ID: id}, ExternalID: id} } - newNode := func(id string) newer.Node { - return newer.Node{ - ObjectMeta: newer.ObjectMeta{Name: id}, - Spec: newer.NodeSpec{ExternalID: id}, + newNode := func(id string) api.Node { + return api.Node{ + ObjectMeta: api.ObjectMeta{Name: id}, + Spec: api.NodeSpec{ExternalID: id}, } } - oldMinions := []current.Minion{ + oldMinions := []versioned.Minion{ oldMinion("foo"), oldMinion("bar"), } - newMinions := []newer.Node{ + newMinions := []api.Node{ newNode("foo"), newNode("bar"), } table := []struct { - oldML *current.MinionList - newML *newer.NodeList + oldML *versioned.MinionList + newML *api.NodeList }{ { - oldML: ¤t.MinionList{Items: oldMinions}, - newML: &newer.NodeList{Items: newMinions}, + oldML: &versioned.MinionList{Items: oldMinions}, + newML: &api.NodeList{Items: newMinions}, }, { - oldML: ¤t.MinionList{Minions: oldMinions}, - newML: &newer.NodeList{Items: newMinions}, + oldML: &versioned.MinionList{Minions: oldMinions}, + newML: &api.NodeList{Items: newMinions}, }, { - oldML: ¤t.MinionList{ + oldML: &versioned.MinionList{ Items: oldMinions, - Minions: []current.Minion{oldMinion("baz")}, + Minions: []versioned.Minion{oldMinion("baz")}, }, - newML: &newer.NodeList{Items: newMinions}, + newML: &api.NodeList{Items: newMinions}, }, } for _, item := range table { - got := &newer.NodeList{} + got := &api.NodeList{} err := Convert(item.oldML, got) if err != nil { t.Errorf("Unexpected error: %v", err) } - if e, a := item.newML, got; !newer.Semantic.DeepEqual(e, a) { + if e, a := item.newML, got; !api.Semantic.DeepEqual(e, a) { t.Errorf("Expected: %#v, got %#v", e, a) } } } func TestMinionListConversionToOld(t *testing.T) { - oldMinion := func(id string) current.Minion { - return current.Minion{TypeMeta: current.TypeMeta{ID: id}} + oldMinion := func(id string) versioned.Minion { + return versioned.Minion{TypeMeta: versioned.TypeMeta{ID: id}} } - newNode := func(id string) newer.Node { - return newer.Node{ObjectMeta: newer.ObjectMeta{Name: id}} + newNode := func(id string) api.Node { + return api.Node{ObjectMeta: api.ObjectMeta{Name: id}} } - oldMinions := []current.Minion{ + oldMinions := []versioned.Minion{ oldMinion("foo"), oldMinion("bar"), } - newMinions := []newer.Node{ + newMinions := []api.Node{ newNode("foo"), newNode("bar"), } - newML := &newer.NodeList{Items: newMinions} - oldML := ¤t.MinionList{ + newML := &api.NodeList{Items: newMinions} + oldML := &versioned.MinionList{ Items: oldMinions, Minions: oldMinions, } - got := ¤t.MinionList{} + got := &versioned.MinionList{} err := Convert(newML, got) if err != nil { t.Errorf("Unexpected error: %v", err) } - if e, a := oldML, got; !newer.Semantic.DeepEqual(e, a) { + if e, a := oldML, got; !api.Semantic.DeepEqual(e, a) { t.Errorf("Expected: %#v, got %#v", e, a) } } func TestServiceEmptySelector(t *testing.T) { // Nil map should be preserved - svc := ¤t.Service{Selector: nil} - data, err := newer.Scheme.EncodeToVersion(svc, "v1beta1") + svc := &versioned.Service{Selector: nil} + data, err := api.Scheme.EncodeToVersion(svc, "v1beta1") if err != nil { t.Fatalf("unexpected error: %v", err) } - obj, err := newer.Scheme.Decode(data) + obj, err := api.Scheme.Decode(data) if err != nil { t.Fatalf("unexpected error: %v", err) } - selector := obj.(*newer.Service).Spec.Selector + selector := obj.(*api.Service).Spec.Selector if selector != nil { t.Errorf("unexpected selector: %#v", obj) } // Empty map should be preserved - svc2 := ¤t.Service{Selector: map[string]string{}} - data, err = newer.Scheme.EncodeToVersion(svc2, "v1beta1") + svc2 := &versioned.Service{Selector: map[string]string{}} + data, err = api.Scheme.EncodeToVersion(svc2, "v1beta1") if err != nil { t.Fatalf("unexpected error: %v", err) } - obj, err = newer.Scheme.Decode(data) + obj, err = api.Scheme.Decode(data) if err != nil { t.Fatalf("unexpected error: %v", err) } - selector = obj.(*newer.Service).Spec.Selector + selector = obj.(*api.Service).Spec.Selector if selector == nil || len(selector) != 0 { t.Errorf("unexpected selector: %#v", obj) } @@ -291,160 +291,160 @@ func TestServiceEmptySelector(t *testing.T) { func TestServicePorts(t *testing.T) { testCases := []struct { - given current.Service - expected newer.Service - roundtrip current.Service + given versioned.Service + expected api.Service + roundtrip versioned.Service }{ { - given: current.Service{ - TypeMeta: current.TypeMeta{ + given: versioned.Service{ + TypeMeta: versioned.TypeMeta{ ID: "legacy-with-defaults", }, Port: 111, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, }, - expected: newer.Service{ - Spec: newer.ServiceSpec{Ports: []newer.ServicePort{{ + expected: api.Service{ + Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Port: 111, - Protocol: newer.ProtocolTCP, + Protocol: api.ProtocolTCP, }}}, }, - roundtrip: current.Service{ - Ports: []current.ServicePort{{ + roundtrip: versioned.Service{ + Ports: []versioned.ServicePort{{ Port: 111, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, }}, }, }, { - given: current.Service{ - TypeMeta: current.TypeMeta{ + given: versioned.Service{ + TypeMeta: versioned.TypeMeta{ ID: "legacy-full", }, PortName: "p", Port: 111, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, ContainerPort: util.NewIntOrStringFromString("p"), }, - expected: newer.Service{ - Spec: newer.ServiceSpec{Ports: []newer.ServicePort{{ + expected: api.Service{ + Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Name: "p", Port: 111, - Protocol: newer.ProtocolTCP, + Protocol: api.ProtocolTCP, TargetPort: util.NewIntOrStringFromString("p"), }}}, }, - roundtrip: current.Service{ - Ports: []current.ServicePort{{ + roundtrip: versioned.Service{ + Ports: []versioned.ServicePort{{ Name: "p", Port: 111, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, ContainerPort: util.NewIntOrStringFromString("p"), }}, }, }, { - given: current.Service{ - TypeMeta: current.TypeMeta{ + given: versioned.Service{ + TypeMeta: versioned.TypeMeta{ ID: "both", }, PortName: "p", Port: 111, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, ContainerPort: util.NewIntOrStringFromString("p"), - Ports: []current.ServicePort{{ + Ports: []versioned.ServicePort{{ Name: "q", Port: 222, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }}, }, - expected: newer.Service{ - Spec: newer.ServiceSpec{Ports: []newer.ServicePort{{ + expected: api.Service{ + Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Name: "q", Port: 222, - Protocol: newer.ProtocolUDP, + Protocol: api.ProtocolUDP, TargetPort: util.NewIntOrStringFromInt(93), }}}, }, - roundtrip: current.Service{ - Ports: []current.ServicePort{{ + roundtrip: versioned.Service{ + Ports: []versioned.ServicePort{{ Name: "q", Port: 222, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }}, }, }, { - given: current.Service{ - TypeMeta: current.TypeMeta{ + given: versioned.Service{ + TypeMeta: versioned.TypeMeta{ ID: "one", }, - Ports: []current.ServicePort{{ + Ports: []versioned.ServicePort{{ Name: "p", Port: 111, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }}, }, - expected: newer.Service{ - Spec: newer.ServiceSpec{Ports: []newer.ServicePort{{ + expected: api.Service{ + Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Name: "p", Port: 111, - Protocol: newer.ProtocolUDP, + Protocol: api.ProtocolUDP, TargetPort: util.NewIntOrStringFromInt(93), }}}, }, - roundtrip: current.Service{ - Ports: []current.ServicePort{{ + roundtrip: versioned.Service{ + Ports: []versioned.ServicePort{{ Name: "p", Port: 111, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }}, }, }, { - given: current.Service{ - TypeMeta: current.TypeMeta{ + given: versioned.Service{ + TypeMeta: versioned.TypeMeta{ ID: "two", }, - Ports: []current.ServicePort{{ + Ports: []versioned.ServicePort{{ Name: "p", Port: 111, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }, { Name: "q", Port: 222, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, ContainerPort: util.NewIntOrStringFromInt(76), }}, }, - expected: newer.Service{ - Spec: newer.ServiceSpec{Ports: []newer.ServicePort{{ + expected: api.Service{ + Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Name: "p", Port: 111, - Protocol: newer.ProtocolUDP, + Protocol: api.ProtocolUDP, TargetPort: util.NewIntOrStringFromInt(93), }, { Name: "q", Port: 222, - Protocol: newer.ProtocolTCP, + Protocol: api.ProtocolTCP, TargetPort: util.NewIntOrStringFromInt(76), }}}, }, - roundtrip: current.Service{ - Ports: []current.ServicePort{{ + roundtrip: versioned.Service{ + Ports: []versioned.ServicePort{{ Name: "p", Port: 111, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }, { Name: "q", Port: 222, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, ContainerPort: util.NewIntOrStringFromInt(76), }}, }, @@ -453,7 +453,7 @@ func TestServicePorts(t *testing.T) { for i, tc := range testCases { // Convert versioned -> internal. - got := newer.Service{} + got := api.Service{} if err := Convert(&tc.given, &got); err != nil { t.Errorf("[Case: %d] Unexpected error: %v", i, err) continue @@ -463,7 +463,7 @@ func TestServicePorts(t *testing.T) { } // Convert internal -> versioned. - got2 := current.Service{} + got2 := versioned.Service{} if err := Convert(&got, &got2); err != nil { t.Errorf("[Case: %d] Unexpected error: %v", i, err) continue @@ -476,18 +476,18 @@ func TestServicePorts(t *testing.T) { func TestPullPolicyConversion(t *testing.T) { table := []struct { - versioned current.PullPolicy - internal newer.PullPolicy + versioned versioned.PullPolicy + internal api.PullPolicy }{ { - versioned: current.PullAlways, - internal: newer.PullAlways, + versioned: versioned.PullAlways, + internal: api.PullAlways, }, { - versioned: current.PullNever, - internal: newer.PullNever, + versioned: versioned.PullNever, + internal: api.PullNever, }, { - versioned: current.PullIfNotPresent, - internal: newer.PullIfNotPresent, + versioned: versioned.PullIfNotPresent, + internal: api.PullIfNotPresent, }, { versioned: "", internal: "", @@ -497,7 +497,7 @@ func TestPullPolicyConversion(t *testing.T) { }, } for _, item := range table { - var got newer.PullPolicy + var got api.PullPolicy err := Convert(&item.versioned, &got) if err != nil { t.Errorf("Unexpected error: %v", err) @@ -508,7 +508,7 @@ func TestPullPolicyConversion(t *testing.T) { } } for _, item := range table { - var got current.PullPolicy + var got versioned.PullPolicy err := Convert(&item.internal, &got) if err != nil { t.Errorf("Unexpected error: %v", err) @@ -520,14 +520,14 @@ func TestPullPolicyConversion(t *testing.T) { } } -func getResourceRequirements(cpu, memory resource.Quantity) current.ResourceRequirements { - res := current.ResourceRequirements{} - res.Limits = current.ResourceList{} +func getResourceRequirements(cpu, memory resource.Quantity) versioned.ResourceRequirements { + res := versioned.ResourceRequirements{} + res.Limits = versioned.ResourceList{} if cpu.Value() > 0 { - res.Limits[current.ResourceCPU] = util.NewIntOrStringFromInt(int(cpu.Value())) + res.Limits[versioned.ResourceCPU] = util.NewIntOrStringFromInt(int(cpu.Value())) } if memory.Value() > 0 { - res.Limits[current.ResourceMemory] = util.NewIntOrStringFromInt(int(memory.Value())) + res.Limits[versioned.ResourceMemory] = util.NewIntOrStringFromInt(int(memory.Value())) } return res @@ -537,7 +537,7 @@ func TestContainerConversion(t *testing.T) { cpuLimit := resource.MustParse("10") memoryLimit := resource.MustParse("10M") null := resource.Quantity{} - testCases := []current.Container{ + testCases := []versioned.Container{ { Name: "container", Resources: getResourceRequirements(cpuLimit, memoryLimit), @@ -570,7 +570,7 @@ func TestContainerConversion(t *testing.T) { } for i, tc := range testCases { - got := newer.Container{} + got := api.Container{} if err := Convert(&tc, &got); err != nil { t.Errorf("[Case: %d] Unexpected error: %v", i, err) continue @@ -586,114 +586,114 @@ func TestContainerConversion(t *testing.T) { func TestEndpointsConversion(t *testing.T) { testCases := []struct { - given current.Endpoints - expected newer.Endpoints + given versioned.Endpoints + expected api.Endpoints }{ { - given: current.Endpoints{ - TypeMeta: current.TypeMeta{ + given: versioned.Endpoints{ + TypeMeta: versioned.TypeMeta{ ID: "empty", }, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, Endpoints: []string{}, }, - expected: newer.Endpoints{ - Subsets: []newer.EndpointSubset{}, + expected: api.Endpoints{ + Subsets: []api.EndpointSubset{}, }, }, { - given: current.Endpoints{ - TypeMeta: current.TypeMeta{ + given: versioned.Endpoints{ + TypeMeta: versioned.TypeMeta{ ID: "one legacy", }, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, Endpoints: []string{"1.2.3.4:88"}, }, - expected: newer.Endpoints{ - Subsets: []newer.EndpointSubset{{ - Ports: []newer.EndpointPort{{Name: "", Port: 88, Protocol: newer.ProtocolTCP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}}, + expected: api.Endpoints{ + Subsets: []api.EndpointSubset{{ + Ports: []api.EndpointPort{{Name: "", Port: 88, Protocol: api.ProtocolTCP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, }}, }, }, { - given: current.Endpoints{ - TypeMeta: current.TypeMeta{ + given: versioned.Endpoints{ + TypeMeta: versioned.TypeMeta{ ID: "several legacy", }, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, Endpoints: []string{"1.2.3.4:88", "1.2.3.4:89", "1.2.3.4:90"}, }, - expected: newer.Endpoints{ - Subsets: []newer.EndpointSubset{ + expected: api.Endpoints{ + Subsets: []api.EndpointSubset{ { - Ports: []newer.EndpointPort{{Name: "", Port: 88, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}}, + Ports: []api.EndpointPort{{Name: "", Port: 88, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, }, { - Ports: []newer.EndpointPort{{Name: "", Port: 89, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}}, + Ports: []api.EndpointPort{{Name: "", Port: 89, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, }, { - Ports: []newer.EndpointPort{{Name: "", Port: 90, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}}, + Ports: []api.EndpointPort{{Name: "", Port: 90, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, }, }}, }, { - given: current.Endpoints{ - TypeMeta: current.TypeMeta{ + given: versioned.Endpoints{ + TypeMeta: versioned.TypeMeta{ ID: "one subset", }, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, Endpoints: []string{"1.2.3.4:88"}, - Subsets: []current.EndpointSubset{{ - Ports: []current.EndpointPort{{Name: "", Port: 88, Protocol: current.ProtocolTCP}}, - Addresses: []current.EndpointAddress{{IP: "1.2.3.4"}}, + Subsets: []versioned.EndpointSubset{{ + Ports: []versioned.EndpointPort{{Name: "", Port: 88, Protocol: versioned.ProtocolTCP}}, + Addresses: []versioned.EndpointAddress{{IP: "1.2.3.4"}}, }}, }, - expected: newer.Endpoints{ - Subsets: []newer.EndpointSubset{{ - Ports: []newer.EndpointPort{{Name: "", Port: 88, Protocol: newer.ProtocolTCP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}}, + expected: api.Endpoints{ + Subsets: []api.EndpointSubset{{ + Ports: []api.EndpointPort{{Name: "", Port: 88, Protocol: api.ProtocolTCP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, }}, }, }, { - given: current.Endpoints{ - TypeMeta: current.TypeMeta{ + given: versioned.Endpoints{ + TypeMeta: versioned.TypeMeta{ ID: "several subset", }, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, Endpoints: []string{"1.2.3.4:88", "5.6.7.8:88", "1.2.3.4:89", "5.6.7.8:89"}, - Subsets: []current.EndpointSubset{ + Subsets: []versioned.EndpointSubset{ { - Ports: []current.EndpointPort{{Name: "", Port: 88, Protocol: current.ProtocolUDP}}, - Addresses: []current.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []versioned.EndpointPort{{Name: "", Port: 88, Protocol: versioned.ProtocolUDP}}, + Addresses: []versioned.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, { - Ports: []current.EndpointPort{{Name: "", Port: 89, Protocol: current.ProtocolUDP}}, - Addresses: []current.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []versioned.EndpointPort{{Name: "", Port: 89, Protocol: versioned.ProtocolUDP}}, + Addresses: []versioned.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, { - Ports: []current.EndpointPort{{Name: "named", Port: 90, Protocol: current.ProtocolUDP}}, - Addresses: []current.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []versioned.EndpointPort{{Name: "named", Port: 90, Protocol: versioned.ProtocolUDP}}, + Addresses: []versioned.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, }, }, - expected: newer.Endpoints{ - Subsets: []newer.EndpointSubset{ + expected: api.Endpoints{ + Subsets: []api.EndpointSubset{ { - Ports: []newer.EndpointPort{{Name: "", Port: 88, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []api.EndpointPort{{Name: "", Port: 88, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, { - Ports: []newer.EndpointPort{{Name: "", Port: 89, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []api.EndpointPort{{Name: "", Port: 89, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, { - Ports: []newer.EndpointPort{{Name: "named", Port: 90, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []api.EndpointPort{{Name: "named", Port: 90, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, }}, }, @@ -701,39 +701,39 @@ func TestEndpointsConversion(t *testing.T) { for i, tc := range testCases { // Convert versioned -> internal. - got := newer.Endpoints{} + got := api.Endpoints{} if err := Convert(&tc.given, &got); err != nil { t.Errorf("[Case: %d] Unexpected error: %v", i, err) continue } - if !newer.Semantic.DeepEqual(got.Subsets, tc.expected.Subsets) { + if !api.Semantic.DeepEqual(got.Subsets, tc.expected.Subsets) { t.Errorf("[Case: %d] Expected %#v, got %#v", i, tc.expected.Subsets, got.Subsets) } // Convert internal -> versioned. - got2 := current.Endpoints{} + got2 := versioned.Endpoints{} if err := Convert(&got, &got2); err != nil { t.Errorf("[Case: %d] Unexpected error: %v", i, err) continue } - if got2.Protocol != tc.given.Protocol || !newer.Semantic.DeepEqual(got2.Endpoints, tc.given.Endpoints) { + if got2.Protocol != tc.given.Protocol || !api.Semantic.DeepEqual(got2.Endpoints, tc.given.Endpoints) { t.Errorf("[Case: %d] Expected %s %#v, got %s %#v", i, tc.given.Protocol, tc.given.Endpoints, got2.Protocol, got2.Endpoints) } } } func TestSecretVolumeSourceConversion(t *testing.T) { - given := current.SecretVolumeSource{ - Target: current.ObjectReference{ + given := versioned.SecretVolumeSource{ + Target: versioned.ObjectReference{ ID: "foo", }, } - expected := newer.SecretVolumeSource{ + expected := api.SecretVolumeSource{ SecretName: "foo", } - got := newer.SecretVolumeSource{} + got := api.SecretVolumeSource{} if err := Convert(&given, &got); err != nil { t.Errorf("Unexpected error: %v", err) } @@ -741,7 +741,7 @@ func TestSecretVolumeSourceConversion(t *testing.T) { t.Errorf("Expected %v; got %v", expected, got) } - got2 := current.SecretVolumeSource{} + got2 := versioned.SecretVolumeSource{} if err := Convert(&got, &got2); err != nil { t.Errorf("Unexpected error: %v", err) } @@ -753,42 +753,42 @@ func TestSecretVolumeSourceConversion(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: ¤t.Container{ + c: &versioned.Container{ Privileged: true, - SecurityContext: ¤t.SecurityContext{ + SecurityContext: &versioned.SecurityContext{ Privileged: &priv, }, }, err: "container privileged settings do not match security context settings, cannot convert", }, "mismatched caps add": { - c: ¤t.Container{ - Capabilities: current.Capabilities{ - Add: []current.Capability{"foo"}, + c: &versioned.Container{ + Capabilities: versioned.Capabilities{ + Add: []versioned.Capability{"foo"}, }, - SecurityContext: ¤t.SecurityContext{ - Capabilities: ¤t.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: ¤t.Container{ - Capabilities: current.Capabilities{ - Drop: []current.Capability{"foo"}, + c: &versioned.Container{ + Capabilities: versioned.Capabilities{ + Drop: []versioned.Capability{"foo"}, }, - SecurityContext: ¤t.SecurityContext{ - Capabilities: ¤t.Capabilities{ - Drop: []current.Capability{"bar"}, + SecurityContext: &versioned.SecurityContext{ + Capabilities: &versioned.Capabilities{ + Drop: []versioned.Capability{"bar"}, }, }, }, @@ -797,7 +797,7 @@ func TestBadSecurityContextConversion(t *testing.T) { } for k, v := range testCases { - got := newer.Container{} + got := api.Container{} err := Convert(v.c, &got) if err == nil { t.Errorf("expected error for case %s but got none", k) diff --git a/pkg/api/v1beta2/conversion.go b/pkg/api/v1beta2/conversion.go index 685c4866524..9c7d958b44c 100644 --- a/pkg/api/v1beta2/conversion.go +++ b/pkg/api/v1beta2/conversion.go @@ -22,7 +22,7 @@ import ( "reflect" "strconv" - 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" "github.com/GoogleCloudPlatform/kubernetes/pkg/util" @@ -30,34 +30,34 @@ import ( func addConversionFuncs() { // Our TypeMeta was split into two different structs. - newer.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", newer.TypeMeta{}, "TypeMeta") - newer.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", newer.ObjectMeta{}, "ObjectMeta") - newer.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", newer.ListMeta{}, "ListMeta") + api.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", api.TypeMeta{}, "TypeMeta") + api.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", api.ObjectMeta{}, "ObjectMeta") + api.Scheme.AddStructFieldConversion(TypeMeta{}, "TypeMeta", api.ListMeta{}, "ListMeta") - newer.Scheme.AddStructFieldConversion(newer.TypeMeta{}, "TypeMeta", TypeMeta{}, "TypeMeta") - newer.Scheme.AddStructFieldConversion(newer.ObjectMeta{}, "ObjectMeta", TypeMeta{}, "TypeMeta") - newer.Scheme.AddStructFieldConversion(newer.ListMeta{}, "ListMeta", TypeMeta{}, "TypeMeta") - newer.Scheme.AddStructFieldConversion(newer.Endpoints{}, "Endpoints", Endpoints{}, "Endpoints") + api.Scheme.AddStructFieldConversion(api.TypeMeta{}, "TypeMeta", TypeMeta{}, "TypeMeta") + api.Scheme.AddStructFieldConversion(api.ObjectMeta{}, "ObjectMeta", TypeMeta{}, "TypeMeta") + api.Scheme.AddStructFieldConversion(api.ListMeta{}, "ListMeta", TypeMeta{}, "TypeMeta") + api.Scheme.AddStructFieldConversion(api.Endpoints{}, "Endpoints", Endpoints{}, "Endpoints") // TODO: scope this to a specific type once that becomes available and remove the Event conversion functions below - // newer.Scheme.AddStructFieldConversion(string(""), "Status", string(""), "Condition") - // newer.Scheme.AddStructFieldConversion(string(""), "Condition", string(""), "Status") + // api.Scheme.AddStructFieldConversion(string(""), "Status", string(""), "Condition") + // api.Scheme.AddStructFieldConversion(string(""), "Condition", string(""), "Status") - err := newer.Scheme.AddConversionFuncs( + err := api.Scheme.AddConversionFuncs( // TypeMeta must be split into two objects - func(in *newer.TypeMeta, out *TypeMeta, s conversion.Scope) error { + func(in *api.TypeMeta, out *TypeMeta, s conversion.Scope) error { out.Kind = in.Kind out.APIVersion = in.APIVersion return nil }, - func(in *TypeMeta, out *newer.TypeMeta, s conversion.Scope) error { + func(in *TypeMeta, out *api.TypeMeta, s conversion.Scope) error { out.Kind = in.Kind out.APIVersion = in.APIVersion return nil }, // ListMeta must be converted to TypeMeta - func(in *newer.ListMeta, out *TypeMeta, s conversion.Scope) error { + func(in *api.ListMeta, out *TypeMeta, s conversion.Scope) error { out.SelfLink = in.SelfLink if len(in.ResourceVersion) > 0 { v, err := strconv.ParseUint(in.ResourceVersion, 10, 64) @@ -68,7 +68,7 @@ func addConversionFuncs() { } return nil }, - func(in *TypeMeta, out *newer.ListMeta, s conversion.Scope) error { + func(in *TypeMeta, out *api.ListMeta, s conversion.Scope) error { out.SelfLink = in.SelfLink if in.ResourceVersion != 0 { out.ResourceVersion = strconv.FormatUint(in.ResourceVersion, 10) @@ -79,7 +79,7 @@ func addConversionFuncs() { }, // ObjectMeta must be converted to TypeMeta - func(in *newer.ObjectMeta, out *TypeMeta, s conversion.Scope) error { + func(in *api.ObjectMeta, out *TypeMeta, s conversion.Scope) error { out.Namespace = in.Namespace out.ID = in.Name out.GenerateName = in.GenerateName @@ -96,7 +96,7 @@ func addConversionFuncs() { } return s.Convert(&in.Annotations, &out.Annotations, 0) }, - func(in *TypeMeta, out *newer.ObjectMeta, s conversion.Scope) error { + func(in *TypeMeta, out *api.ObjectMeta, s conversion.Scope) error { out.Namespace = in.Namespace out.Name = in.ID out.GenerateName = in.GenerateName @@ -113,22 +113,22 @@ func addConversionFuncs() { }, // Convert all to the new PodPhase constants - func(in *newer.PodPhase, out *PodStatus, s conversion.Scope) error { + func(in *api.PodPhase, out *PodStatus, s conversion.Scope) error { switch *in { case "": *out = "" - case newer.PodPending: + case api.PodPending: *out = PodWaiting - case newer.PodRunning: + case api.PodRunning: *out = PodRunning - case newer.PodSucceeded: + case api.PodSucceeded: *out = PodSucceeded - case newer.PodFailed: + case api.PodFailed: *out = PodTerminated - case newer.PodUnknown: + case api.PodUnknown: *out = PodUnknown default: - return &newer.ConversionError{ + return &api.ConversionError{ In: in, Out: out, Message: "The string provided is not a valid PodPhase constant value", @@ -138,23 +138,23 @@ func addConversionFuncs() { return nil }, - func(in *PodStatus, out *newer.PodPhase, s conversion.Scope) error { + func(in *PodStatus, out *api.PodPhase, s conversion.Scope) error { switch *in { case "": *out = "" case PodWaiting: - *out = newer.PodPending + *out = api.PodPending case PodRunning: - *out = newer.PodRunning + *out = api.PodRunning case PodTerminated: // Older API versions did not contain enough info to map to PodSucceeded - *out = newer.PodFailed + *out = api.PodFailed case PodSucceeded: - *out = newer.PodSucceeded + *out = api.PodSucceeded case PodUnknown: - *out = newer.PodUnknown + *out = api.PodUnknown default: - return &newer.ConversionError{ + return &api.ConversionError{ In: in, Out: out, Message: "The string provided is not a valid PodPhase constant value", @@ -164,7 +164,7 @@ func addConversionFuncs() { }, // Convert all the standard objects - func(in *newer.Pod, out *Pod, s conversion.Scope) error { + func(in *api.Pod, out *Pod, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -189,7 +189,7 @@ func addConversionFuncs() { } return nil }, - func(in *Pod, out *newer.Pod, s conversion.Scope) error { + func(in *Pod, out *api.Pod, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -213,7 +213,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.ReplicationController, out *ReplicationController, s conversion.Scope) error { + func(in *api.ReplicationController, out *ReplicationController, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -230,7 +230,7 @@ func addConversionFuncs() { out.CurrentState.Replicas = in.Status.Replicas return nil }, - func(in *ReplicationController, out *newer.ReplicationController, s conversion.Scope) error { + func(in *ReplicationController, out *api.ReplicationController, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -248,13 +248,13 @@ func addConversionFuncs() { return nil }, - func(in *newer.ReplicationControllerSpec, out *ReplicationControllerState, s conversion.Scope) error { + func(in *api.ReplicationControllerSpec, out *ReplicationControllerState, s conversion.Scope) error { out.Replicas = in.Replicas if err := s.Convert(&in.Selector, &out.ReplicaSelector, 0); err != nil { return err } if in.TemplateRef != nil && in.Template == nil { - return &newer.ConversionError{ + return &api.ConversionError{ In: in, Out: out, Message: "objects with a template ref cannot be converted to older objects, must populate template", @@ -267,19 +267,19 @@ func addConversionFuncs() { } return nil }, - func(in *ReplicationControllerState, out *newer.ReplicationControllerSpec, s conversion.Scope) error { + func(in *ReplicationControllerState, out *api.ReplicationControllerSpec, s conversion.Scope) error { out.Replicas = in.Replicas if err := s.Convert(&in.ReplicaSelector, &out.Selector, 0); err != nil { return err } - out.Template = &newer.PodTemplateSpec{} + out.Template = &api.PodTemplateSpec{} if err := s.Convert(&in.PodTemplate, out.Template, 0); err != nil { return err } return nil }, - func(in *newer.PodTemplateSpec, out *PodTemplate, s conversion.Scope) error { + func(in *api.PodTemplateSpec, out *PodTemplate, s conversion.Scope) error { if err := s.Convert(&in.Spec, &out.DesiredState.Manifest, 0); err != nil { return err } @@ -296,7 +296,7 @@ func addConversionFuncs() { } return nil }, - func(in *PodTemplate, out *newer.PodTemplateSpec, s conversion.Scope) error { + func(in *PodTemplate, out *api.PodTemplateSpec, s conversion.Scope) error { if err := s.Convert(&in.DesiredState.Manifest, &out.Spec, 0); err != nil { return err } @@ -316,7 +316,7 @@ func addConversionFuncs() { // Converts internal Container to v1beta2.Container. // Fields 'CPU' and 'Memory' are not present in the internal Container object. // Hence the need for a custom conversion function. - func(in *newer.Container, out *Container, s conversion.Scope) error { + func(in *api.Container, out *Container, s conversion.Scope) error { if err := s.Convert(&in.Name, &out.Name, 0); err != nil { return err } @@ -380,7 +380,7 @@ func addConversionFuncs() { }, // Internal API does not support CPU to be specified via an explicit field. // Hence it must be stored in Container.Resources. - func(in *int, out *newer.ResourceList, s conversion.Scope) error { + func(in *int, out *api.ResourceList, s conversion.Scope) error { if *in == 0 { return nil } @@ -388,13 +388,13 @@ func addConversionFuncs() { if err := s.Convert(in, &quantity, 0); err != nil { return err } - (*out)[newer.ResourceCPU] = quantity + (*out)[api.ResourceCPU] = quantity return nil }, // Internal API does not support Memory to be specified via an explicit field. // Hence it must be stored in Container.Resources. - func(in *int64, out *newer.ResourceList, s conversion.Scope) error { + func(in *int64, out *api.ResourceList, s conversion.Scope) error { if *in == 0 { return nil } @@ -402,14 +402,14 @@ func addConversionFuncs() { if err := s.Convert(in, &quantity, 0); err != nil { return err } - (*out)[newer.ResourceMemory] = quantity + (*out)[api.ResourceMemory] = quantity return nil }, - // Converts v1beta2.Container to internal newer.Container. - // Fields 'CPU' and 'Memory' are not present in the internal newer.Container object. + // Converts v1beta2.Container to internal api.Container. + // Fields 'CPU' and 'Memory' are not present in the internal api.Container object. // Hence the need for a custom conversion function. - func(in *Container, out *newer.Container, s conversion.Scope) error { + func(in *Container, out *api.Container, s conversion.Scope) error { if err := s.Convert(&in.Name, &out.Name, 0); err != nil { return err } @@ -476,7 +476,7 @@ func addConversionFuncs() { } return nil }, - func(in *newer.PodSpec, out *ContainerManifest, s conversion.Scope) error { + func(in *api.PodSpec, out *ContainerManifest, s conversion.Scope) error { if err := s.Convert(&in.Volumes, &out.Volumes, 0); err != nil { return err } @@ -502,7 +502,7 @@ func addConversionFuncs() { out.HostNetwork = in.HostNetwork return nil }, - func(in *ContainerManifest, out *newer.PodSpec, s conversion.Scope) error { + func(in *ContainerManifest, out *api.PodSpec, s conversion.Scope) error { if err := s.Convert(&in.Volumes, &out.Volumes, 0); err != nil { return err } @@ -523,12 +523,12 @@ func addConversionFuncs() { out.ActiveDeadlineSeconds = new(int64) *out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds } - out.DNSPolicy = newer.DNSPolicy(in.DNSPolicy) + out.DNSPolicy = api.DNSPolicy(in.DNSPolicy) out.HostNetwork = in.HostNetwork return nil }, - func(in *newer.PodStatus, out *PodState, s conversion.Scope) error { + func(in *api.PodStatus, out *PodState, s conversion.Scope) error { if err := s.Convert(&in.Phase, &out.Status, 0); err != nil { return err } @@ -543,7 +543,7 @@ func addConversionFuncs() { out.PodIP = in.PodIP return nil }, - func(in *PodState, out *newer.PodStatus, s conversion.Scope) error { + func(in *PodState, out *api.PodStatus, s conversion.Scope) error { if err := s.Convert(&in.Status, &out.Phase, 0); err != nil { return err } @@ -559,7 +559,7 @@ func addConversionFuncs() { return nil }, - func(in *[]newer.ContainerStatus, out *PodInfo, s conversion.Scope) error { + func(in *[]api.ContainerStatus, out *PodInfo, s conversion.Scope) error { *out = make(map[string]ContainerStatus) for _, st := range *in { v := ContainerStatus{} @@ -570,9 +570,9 @@ func addConversionFuncs() { } return nil }, - func(in *PodInfo, out *[]newer.ContainerStatus, s conversion.Scope) error { + func(in *PodInfo, out *[]api.ContainerStatus, s conversion.Scope) error { for k, v := range *in { - st := newer.ContainerStatus{} + st := api.ContainerStatus{} if err := s.Convert(&v, &st, 0); err != nil { return err } @@ -582,7 +582,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.ContainerStatus, out *ContainerStatus, s conversion.Scope) error { + func(in *api.ContainerStatus, out *ContainerStatus, s conversion.Scope) error { if err := s.Convert(&in.State, &out.State, 0); err != nil { return err } @@ -606,7 +606,7 @@ func addConversionFuncs() { } return nil }, - func(in *ContainerStatus, out *newer.ContainerStatus, s conversion.Scope) error { + func(in *ContainerStatus, out *api.ContainerStatus, s conversion.Scope) error { if err := s.Convert(&in.State, &out.State, 0); err != nil { return err } @@ -631,7 +631,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.PodStatusResult, out *PodStatusResult, s conversion.Scope) error { + func(in *api.PodStatusResult, out *PodStatusResult, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -643,7 +643,7 @@ func addConversionFuncs() { } return nil }, - func(in *PodStatusResult, out *newer.PodStatusResult, s conversion.Scope) error { + func(in *PodStatusResult, out *api.PodStatusResult, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -656,21 +656,21 @@ func addConversionFuncs() { return nil }, - func(in *newer.PodSpec, out *PodState, s conversion.Scope) error { + func(in *api.PodSpec, out *PodState, s conversion.Scope) error { if err := s.Convert(&in, &out.Manifest, 0); err != nil { return err } out.Host = in.Host return nil }, - func(in *PodState, out *newer.PodSpec, s conversion.Scope) error { + func(in *PodState, out *api.PodSpec, s conversion.Scope) error { if err := s.Convert(&in.Manifest, &out, 0); err != nil { return err } out.Host = in.Host return nil }, - func(in *newer.Service, out *Service, s conversion.Scope) error { + func(in *api.Service, out *Service, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -711,7 +711,7 @@ func addConversionFuncs() { return nil }, - func(in *Service, out *newer.Service, s conversion.Scope) error { + func(in *Service, out *api.Service, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -724,19 +724,19 @@ func addConversionFuncs() { if len(in.Ports) == 0 && in.Port != 0 { // Use legacy fields to produce modern fields. - out.Spec.Ports = append(out.Spec.Ports, newer.ServicePort{ + out.Spec.Ports = append(out.Spec.Ports, api.ServicePort{ Name: in.PortName, Port: in.Port, - Protocol: newer.Protocol(in.Protocol), + Protocol: api.Protocol(in.Protocol), TargetPort: in.ContainerPort, }) } else { // Use modern fields, ignore legacy. for i := range in.Ports { - out.Spec.Ports = append(out.Spec.Ports, newer.ServicePort{ + out.Spec.Ports = append(out.Spec.Ports, api.ServicePort{ Name: in.Ports[i].Name, Port: in.Ports[i].Port, - Protocol: newer.Protocol(in.Ports[i].Protocol), + Protocol: api.Protocol(in.Ports[i].Protocol), TargetPort: in.Ports[i].ContainerPort, }) } @@ -755,7 +755,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.Node, out *Minion, s conversion.Scope) error { + func(in *api.Node, out *Minion, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -779,7 +779,7 @@ func addConversionFuncs() { } for _, address := range in.Status.Addresses { - if address.Type == newer.NodeLegacyHostIP { + if address.Type == api.NodeLegacyHostIP { out.HostIP = address.Address } } @@ -788,7 +788,7 @@ func addConversionFuncs() { out.Unschedulable = in.Spec.Unschedulable return s.Convert(&in.Status.Capacity, &out.NodeResources.Capacity, 0) }, - func(in *Minion, out *newer.Node, s conversion.Scope) error { + func(in *Minion, out *api.Node, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -812,8 +812,8 @@ func addConversionFuncs() { } if in.HostIP != "" { - newer.AddToNodeAddresses(&out.Status.Addresses, - newer.NodeAddress{Type: newer.NodeLegacyHostIP, Address: in.HostIP}) + api.AddToNodeAddresses(&out.Status.Addresses, + api.NodeAddress{Type: api.NodeLegacyHostIP, Address: in.HostIP}) } out.Spec.PodCIDR = in.PodCIDR out.Spec.ExternalID = in.ExternalID @@ -821,7 +821,7 @@ func addConversionFuncs() { return s.Convert(&in.NodeResources.Capacity, &out.Status.Capacity, 0) }, - func(in *newer.LimitRange, out *LimitRange, s conversion.Scope) error { + func(in *api.LimitRange, out *LimitRange, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -833,7 +833,7 @@ func addConversionFuncs() { } return nil }, - func(in *LimitRange, out *newer.LimitRange, s conversion.Scope) error { + func(in *LimitRange, out *api.LimitRange, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -846,7 +846,7 @@ func addConversionFuncs() { return nil }, - func(in *Namespace, out *newer.Namespace, s conversion.Scope) error { + func(in *Namespace, out *api.Namespace, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -865,7 +865,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.LimitRangeSpec, out *LimitRangeSpec, s conversion.Scope) error { + func(in *api.LimitRangeSpec, out *LimitRangeSpec, s conversion.Scope) error { *out = LimitRangeSpec{} out.Limits = make([]LimitRangeItem, len(in.Limits), len(in.Limits)) for i := range in.Limits { @@ -875,9 +875,9 @@ func addConversionFuncs() { } return nil }, - func(in *LimitRangeSpec, out *newer.LimitRangeSpec, s conversion.Scope) error { - *out = newer.LimitRangeSpec{} - out.Limits = make([]newer.LimitRangeItem, len(in.Limits), len(in.Limits)) + func(in *LimitRangeSpec, out *api.LimitRangeSpec, s conversion.Scope) error { + *out = api.LimitRangeSpec{} + out.Limits = make([]api.LimitRangeItem, len(in.Limits), len(in.Limits)) for i := range in.Limits { if err := s.Convert(&in.Limits[i], &out.Limits[i], 0); err != nil { return err @@ -886,7 +886,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.LimitRangeItem, out *LimitRangeItem, s conversion.Scope) error { + func(in *api.LimitRangeItem, out *LimitRangeItem, s conversion.Scope) error { *out = LimitRangeItem{} out.Type = LimitType(in.Type) if err := s.Convert(&in.Max, &out.Max, 0); err != nil { @@ -900,9 +900,9 @@ func addConversionFuncs() { } return nil }, - func(in *LimitRangeItem, out *newer.LimitRangeItem, s conversion.Scope) error { - *out = newer.LimitRangeItem{} - out.Type = newer.LimitType(in.Type) + func(in *LimitRangeItem, out *api.LimitRangeItem, s conversion.Scope) error { + *out = api.LimitRangeItem{} + out.Type = api.LimitType(in.Type) if err := s.Convert(&in.Max, &out.Max, 0); err != nil { return err } @@ -915,7 +915,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.ResourceQuota, out *ResourceQuota, s conversion.Scope) error { + func(in *api.ResourceQuota, out *ResourceQuota, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -933,7 +933,7 @@ func addConversionFuncs() { } return nil }, - func(in *ResourceQuota, out *newer.ResourceQuota, s conversion.Scope) error { + func(in *ResourceQuota, out *api.ResourceQuota, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -952,22 +952,22 @@ func addConversionFuncs() { return nil }, - func(in *newer.ResourceQuotaSpec, out *ResourceQuotaSpec, s conversion.Scope) error { + func(in *api.ResourceQuotaSpec, out *ResourceQuotaSpec, s conversion.Scope) error { *out = ResourceQuotaSpec{} if err := s.Convert(&in.Hard, &out.Hard, 0); err != nil { return err } return nil }, - func(in *ResourceQuotaSpec, out *newer.ResourceQuotaSpec, s conversion.Scope) error { - *out = newer.ResourceQuotaSpec{} + func(in *ResourceQuotaSpec, out *api.ResourceQuotaSpec, s conversion.Scope) error { + *out = api.ResourceQuotaSpec{} if err := s.Convert(&in.Hard, &out.Hard, 0); err != nil { return err } return nil }, - func(in *newer.ResourceQuotaStatus, out *ResourceQuotaStatus, s conversion.Scope) error { + func(in *api.ResourceQuotaStatus, out *ResourceQuotaStatus, s conversion.Scope) error { *out = ResourceQuotaStatus{} if err := s.Convert(&in.Hard, &out.Hard, 0); err != nil { return err @@ -977,8 +977,8 @@ func addConversionFuncs() { } return nil }, - func(in *ResourceQuotaStatus, out *newer.ResourceQuotaStatus, s conversion.Scope) error { - *out = newer.ResourceQuotaStatus{} + func(in *ResourceQuotaStatus, out *api.ResourceQuotaStatus, s conversion.Scope) error { + *out = api.ResourceQuotaStatus{} if err := s.Convert(&in.Hard, &out.Hard, 0); err != nil { return err } @@ -990,7 +990,7 @@ func addConversionFuncs() { // Object ID <-> Name // TODO: amend the conversion package to allow overriding specific fields. - func(in *ObjectReference, out *newer.ObjectReference, s conversion.Scope) error { + func(in *ObjectReference, out *api.ObjectReference, s conversion.Scope) error { out.Kind = in.Kind out.Namespace = in.Namespace out.Name = in.ID @@ -1000,7 +1000,7 @@ func addConversionFuncs() { out.FieldPath = in.FieldPath return nil }, - func(in *newer.ObjectReference, out *ObjectReference, s conversion.Scope) error { + func(in *api.ObjectReference, out *ObjectReference, s conversion.Scope) error { out.Kind = in.Kind out.Namespace = in.Namespace out.ID = in.Name @@ -1015,7 +1015,7 @@ func addConversionFuncs() { // Event Source <-> Source.Component // Event Host <-> Source.Host // TODO: remove this when it becomes possible to specify a field name conversion on a specific type - func(in *newer.Event, out *Event, s conversion.Scope) error { + func(in *api.Event, out *Event, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -1032,7 +1032,7 @@ func addConversionFuncs() { out.Count = in.Count return s.Convert(&in.InvolvedObject, &out.InvolvedObject, 0) }, - func(in *Event, out *newer.Event, s conversion.Scope) error { + func(in *Event, out *api.Event, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -1081,28 +1081,28 @@ func addConversionFuncs() { }, // Convert resource lists. - func(in *ResourceList, out *newer.ResourceList, s conversion.Scope) error { - *out = newer.ResourceList{} + func(in *ResourceList, out *api.ResourceList, s conversion.Scope) error { + *out = api.ResourceList{} for k, v := range *in { fv, err := strconv.ParseFloat(v.String(), 64) if err != nil { - return &newer.ConversionError{ + return &api.ConversionError{ In: in, Out: out, Message: fmt.Sprintf("value '%v' of '%v': %v", v, k, err), } } if k == ResourceCPU { - (*out)[newer.ResourceCPU] = *resource.NewMilliQuantity(int64(fv*1000), resource.DecimalSI) + (*out)[api.ResourceCPU] = *resource.NewMilliQuantity(int64(fv*1000), resource.DecimalSI) } else { - (*out)[newer.ResourceName(k)] = *resource.NewQuantity(int64(fv), resource.BinarySI) + (*out)[api.ResourceName(k)] = *resource.NewQuantity(int64(fv), resource.BinarySI) } } return nil }, - func(in *newer.ResourceList, out *ResourceList, s conversion.Scope) error { + func(in *api.ResourceList, out *ResourceList, s conversion.Scope) error { *out = ResourceList{} for k, v := range *in { - if k == newer.ResourceCPU { + if k == api.ResourceCPU { (*out)[ResourceCPU] = util.NewIntOrStringFromString(fmt.Sprintf("%v", float64(v.MilliValue())/1000)) } else { (*out)[ResourceName(k)] = util.NewIntOrStringFromInt(int(v.Value())) @@ -1111,14 +1111,14 @@ func addConversionFuncs() { return nil }, - func(in *newer.Volume, out *Volume, s conversion.Scope) error { + func(in *api.Volume, out *Volume, s conversion.Scope) error { if err := s.Convert(&in.VolumeSource, &out.Source, 0); err != nil { return err } out.Name = in.Name return nil }, - func(in *Volume, out *newer.Volume, s conversion.Scope) error { + func(in *Volume, out *api.Volume, s conversion.Scope) error { if err := s.Convert(&in.Source, &out.VolumeSource, 0); err != nil { return err } @@ -1126,7 +1126,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.VolumeSource, out *VolumeSource, s conversion.Scope) error { + func(in *api.VolumeSource, out *VolumeSource, s conversion.Scope) error { if err := s.Convert(&in.EmptyDir, &out.EmptyDir, 0); err != nil { return err } @@ -1159,7 +1159,7 @@ func addConversionFuncs() { } return nil }, - func(in *VolumeSource, out *newer.VolumeSource, s conversion.Scope) error { + func(in *VolumeSource, out *api.VolumeSource, s conversion.Scope) error { if err := s.Convert(&in.EmptyDir, &out.EmptyDir, 0); err != nil { return err } @@ -1193,13 +1193,13 @@ func addConversionFuncs() { return nil }, - func(in *newer.PullPolicy, out *PullPolicy, s conversion.Scope) error { + func(in *api.PullPolicy, out *PullPolicy, s conversion.Scope) error { switch *in { - case newer.PullAlways: + case api.PullAlways: *out = PullAlways - case newer.PullNever: + case api.PullNever: *out = PullNever - case newer.PullIfNotPresent: + case api.PullIfNotPresent: *out = PullIfNotPresent case "": *out = "" @@ -1209,51 +1209,51 @@ func addConversionFuncs() { } return nil }, - func(in *PullPolicy, out *newer.PullPolicy, s conversion.Scope) error { + func(in *PullPolicy, out *api.PullPolicy, s conversion.Scope) error { switch *in { case PullAlways: - *out = newer.PullAlways + *out = api.PullAlways case PullNever: - *out = newer.PullNever + *out = api.PullNever case PullIfNotPresent: - *out = newer.PullIfNotPresent + *out = api.PullIfNotPresent case "": *out = "" default: // Let unknown values through - they will get caught by validation - *out = newer.PullPolicy(*in) + *out = api.PullPolicy(*in) } return nil }, - func(in *newer.RestartPolicy, out *RestartPolicy, s conversion.Scope) error { + func(in *api.RestartPolicy, out *RestartPolicy, s conversion.Scope) error { switch *in { - case newer.RestartPolicyAlways: + case api.RestartPolicyAlways: *out = RestartPolicy{Always: &RestartPolicyAlways{}} - case newer.RestartPolicyNever: + case api.RestartPolicyNever: *out = RestartPolicy{Never: &RestartPolicyNever{}} - case newer.RestartPolicyOnFailure: + case api.RestartPolicyOnFailure: *out = RestartPolicy{OnFailure: &RestartPolicyOnFailure{}} default: *out = RestartPolicy{} } return nil }, - func(in *RestartPolicy, out *newer.RestartPolicy, s conversion.Scope) error { + func(in *RestartPolicy, out *api.RestartPolicy, s conversion.Scope) error { switch { case in.Always != nil: - *out = newer.RestartPolicyAlways + *out = api.RestartPolicyAlways case in.Never != nil: - *out = newer.RestartPolicyNever + *out = api.RestartPolicyNever case in.OnFailure != nil: - *out = newer.RestartPolicyOnFailure + *out = api.RestartPolicyOnFailure default: *out = "" } return nil }, - func(in *newer.Probe, out *LivenessProbe, s conversion.Scope) error { + func(in *api.Probe, out *LivenessProbe, s conversion.Scope) error { if err := s.Convert(&in.Exec, &out.Exec, 0); err != nil { return err } @@ -1267,7 +1267,7 @@ func addConversionFuncs() { out.TimeoutSeconds = in.TimeoutSeconds return nil }, - func(in *LivenessProbe, out *newer.Probe, s conversion.Scope) error { + func(in *LivenessProbe, out *api.Probe, s conversion.Scope) error { if err := s.Convert(&in.Exec, &out.Exec, 0); err != nil { return err } @@ -1282,7 +1282,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.Endpoints, out *Endpoints, s conversion.Scope) error { + func(in *api.Endpoints, out *Endpoints, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -1329,7 +1329,7 @@ func addConversionFuncs() { } return nil }, - func(in *Endpoints, out *newer.Endpoints, s conversion.Scope) error { + func(in *Endpoints, out *api.Endpoints, s conversion.Scope) error { if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } @@ -1343,7 +1343,7 @@ func addConversionFuncs() { return nil }, - func(in *newer.NodeCondition, out *NodeCondition, s conversion.Scope) error { + func(in *api.NodeCondition, out *NodeCondition, s conversion.Scope) error { if err := s.Convert(&in.Type, &out.Kind, 0); err != nil { return err } @@ -1364,7 +1364,7 @@ func addConversionFuncs() { } return nil }, - func(in *NodeCondition, out *newer.NodeCondition, s conversion.Scope) error { + func(in *NodeCondition, out *api.NodeCondition, s conversion.Scope) error { if err := s.Convert(&in.Kind, &out.Type, 0); err != nil { return err } @@ -1386,9 +1386,9 @@ func addConversionFuncs() { return nil }, - func(in *newer.NodeConditionType, out *NodeConditionKind, s conversion.Scope) error { + func(in *api.NodeConditionType, out *NodeConditionKind, s conversion.Scope) error { switch *in { - case newer.NodeReady: + case api.NodeReady: *out = NodeReady break case "": @@ -1399,26 +1399,26 @@ func addConversionFuncs() { } return nil }, - func(in *NodeConditionKind, out *newer.NodeConditionType, s conversion.Scope) error { + func(in *NodeConditionKind, out *api.NodeConditionType, s conversion.Scope) error { switch *in { case NodeReady: - *out = newer.NodeReady + *out = api.NodeReady break case "": *out = "" default: - *out = newer.NodeConditionType(*in) + *out = api.NodeConditionType(*in) break } return nil }, - func(in *newer.ConditionStatus, out *ConditionStatus, s conversion.Scope) error { + func(in *api.ConditionStatus, out *ConditionStatus, s conversion.Scope) error { switch *in { - case newer.ConditionTrue: + case api.ConditionTrue: *out = ConditionFull break - case newer.ConditionFalse: + case api.ConditionFalse: *out = ConditionNone break default: @@ -1427,22 +1427,22 @@ func addConversionFuncs() { } return nil }, - func(in *ConditionStatus, out *newer.ConditionStatus, s conversion.Scope) error { + func(in *ConditionStatus, out *api.ConditionStatus, s conversion.Scope) error { switch *in { case ConditionFull: - *out = newer.ConditionTrue + *out = api.ConditionTrue break case ConditionNone: - *out = newer.ConditionFalse + *out = api.ConditionFalse break default: - *out = newer.ConditionStatus(*in) + *out = api.ConditionStatus(*in) break } return nil }, - func(in *newer.PodCondition, out *PodCondition, s conversion.Scope) error { + func(in *api.PodCondition, out *PodCondition, s conversion.Scope) error { if err := s.Convert(&in.Type, &out.Kind, 0); err != nil { return err } @@ -1451,7 +1451,7 @@ func addConversionFuncs() { } return nil }, - func(in *PodCondition, out *newer.PodCondition, s conversion.Scope) error { + func(in *PodCondition, out *api.PodCondition, s conversion.Scope) error { if err := s.Convert(&in.Kind, &out.Type, 0); err != nil { return err } @@ -1461,9 +1461,9 @@ func addConversionFuncs() { return nil }, - func(in *newer.PodConditionType, out *PodConditionKind, s conversion.Scope) error { + func(in *api.PodConditionType, out *PodConditionKind, s conversion.Scope) error { switch *in { - case newer.PodReady: + case api.PodReady: *out = PodReady break case "": @@ -1474,31 +1474,31 @@ func addConversionFuncs() { } return nil }, - func(in *PodConditionKind, out *newer.PodConditionType, s conversion.Scope) error { + func(in *PodConditionKind, out *api.PodConditionType, s conversion.Scope) error { switch *in { case PodReady: - *out = newer.PodReady + *out = api.PodReady break case "": *out = "" default: - *out = newer.PodConditionType(*in) + *out = api.PodConditionType(*in) break } return nil }, - func(in *Binding, out *newer.Binding, s conversion.Scope) error { + func(in *Binding, out *api.Binding, s conversion.Scope) error { if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { return err } - out.Target = newer.ObjectReference{ + out.Target = api.ObjectReference{ Name: in.Host, } out.Name = in.PodID return nil }, - func(in *newer.Binding, out *Binding, s conversion.Scope) error { + func(in *api.Binding, out *Binding, s conversion.Scope) error { if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { return err } @@ -1506,11 +1506,11 @@ func addConversionFuncs() { out.PodID = in.Name return nil }, - func(in *newer.SecretVolumeSource, out *SecretVolumeSource, s conversion.Scope) error { + func(in *api.SecretVolumeSource, out *SecretVolumeSource, s conversion.Scope) error { out.Target.ID = in.SecretName return nil }, - func(in *SecretVolumeSource, out *newer.SecretVolumeSource, s conversion.Scope) error { + func(in *SecretVolumeSource, out *api.SecretVolumeSource, s conversion.Scope) error { out.SecretName = in.Target.ID return nil }, @@ -1521,7 +1521,7 @@ func addConversionFuncs() { } // Add field conversion funcs. - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta2", "Pod", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta2", "Pod", func(label, value string) (string, string, error) { switch label { case "name": @@ -1530,8 +1530,8 @@ func addConversionFuncs() { return "spec.host", value, nil case "DesiredState.Status": podStatus := PodStatus(value) - var internalValue newer.PodPhase - newer.Scheme.Convert(&podStatus, &internalValue) + var internalValue api.PodPhase + api.Scheme.Convert(&podStatus, &internalValue) return "status.phase", string(internalValue), nil default: return "", "", fmt.Errorf("field label not supported: %s", label) @@ -1541,7 +1541,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta2", "Node", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta2", "Node", func(label, value string) (string, string, error) { switch label { case "name": @@ -1556,7 +1556,7 @@ func addConversionFuncs() { // if one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta2", "ReplicationController", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta2", "ReplicationController", func(label, value string) (string, string, error) { switch label { case "name": @@ -1571,7 +1571,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta2", "Event", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta2", "Event", func(label, value string) (string, string, error) { switch label { case "involvedObject.kind", @@ -1593,7 +1593,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta2", "Namespace", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta2", "Namespace", func(label, value string) (string, string, error) { switch label { case "status.phase": @@ -1606,7 +1606,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta2", "Secret", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta2", "Secret", func(label, value string) (string, string, error) { switch label { case "type": @@ -1619,7 +1619,7 @@ func addConversionFuncs() { // If one of the conversion functions is malformed, detect it immediately. panic(err) } - err = newer.Scheme.AddFieldLabelConversionFunc("v1beta2", "ServiceAccount", + err = api.Scheme.AddFieldLabelConversionFunc("v1beta2", "ServiceAccount", func(label, value string) (string, string, error) { switch label { case "name": diff --git a/pkg/api/v1beta2/conversion_test.go b/pkg/api/v1beta2/conversion_test.go index 08bbe634a07..a154546647e 100644 --- a/pkg/api/v1beta2/conversion_test.go +++ b/pkg/api/v1beta2/conversion_test.go @@ -21,39 +21,39 @@ import ( "reflect" "testing" - newer "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - current "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta2" + versioned "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta2" "github.com/GoogleCloudPlatform/kubernetes/pkg/util" ) func TestServiceEmptySelector(t *testing.T) { // Nil map should be preserved - svc := ¤t.Service{Selector: nil} - data, err := newer.Scheme.EncodeToVersion(svc, "v1beta2") + svc := &versioned.Service{Selector: nil} + data, err := api.Scheme.EncodeToVersion(svc, "v1beta2") if err != nil { t.Fatalf("unexpected error: %v", err) } - obj, err := newer.Scheme.Decode(data) + obj, err := api.Scheme.Decode(data) if err != nil { t.Fatalf("unexpected error: %v", err) } - selector := obj.(*newer.Service).Spec.Selector + selector := obj.(*api.Service).Spec.Selector if selector != nil { t.Errorf("unexpected selector: %#v", obj) } // Empty map should be preserved - svc2 := ¤t.Service{Selector: map[string]string{}} - data, err = newer.Scheme.EncodeToVersion(svc2, "v1beta2") + svc2 := &versioned.Service{Selector: map[string]string{}} + data, err = api.Scheme.EncodeToVersion(svc2, "v1beta2") if err != nil { t.Fatalf("unexpected error: %v", err) } - obj, err = newer.Scheme.Decode(data) + obj, err = api.Scheme.Decode(data) if err != nil { t.Fatalf("unexpected error: %v", err) } - selector = obj.(*newer.Service).Spec.Selector + selector = obj.(*api.Service).Spec.Selector if selector == nil || len(selector) != 0 { t.Errorf("unexpected selector: %#v", obj) } @@ -61,160 +61,160 @@ func TestServiceEmptySelector(t *testing.T) { func TestServicePorts(t *testing.T) { testCases := []struct { - given current.Service - expected newer.Service - roundtrip current.Service + given versioned.Service + expected api.Service + roundtrip versioned.Service }{ { - given: current.Service{ - TypeMeta: current.TypeMeta{ + given: versioned.Service{ + TypeMeta: versioned.TypeMeta{ ID: "legacy-with-defaults", }, Port: 111, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, }, - expected: newer.Service{ - Spec: newer.ServiceSpec{Ports: []newer.ServicePort{{ + expected: api.Service{ + Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Port: 111, - Protocol: newer.ProtocolTCP, + Protocol: api.ProtocolTCP, }}}, }, - roundtrip: current.Service{ - Ports: []current.ServicePort{{ + roundtrip: versioned.Service{ + Ports: []versioned.ServicePort{{ Port: 111, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, }}, }, }, { - given: current.Service{ - TypeMeta: current.TypeMeta{ + given: versioned.Service{ + TypeMeta: versioned.TypeMeta{ ID: "legacy-full", }, PortName: "p", Port: 111, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, ContainerPort: util.NewIntOrStringFromString("p"), }, - expected: newer.Service{ - Spec: newer.ServiceSpec{Ports: []newer.ServicePort{{ + expected: api.Service{ + Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Name: "p", Port: 111, - Protocol: newer.ProtocolTCP, + Protocol: api.ProtocolTCP, TargetPort: util.NewIntOrStringFromString("p"), }}}, }, - roundtrip: current.Service{ - Ports: []current.ServicePort{{ + roundtrip: versioned.Service{ + Ports: []versioned.ServicePort{{ Name: "p", Port: 111, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, ContainerPort: util.NewIntOrStringFromString("p"), }}, }, }, { - given: current.Service{ - TypeMeta: current.TypeMeta{ + given: versioned.Service{ + TypeMeta: versioned.TypeMeta{ ID: "both", }, PortName: "p", Port: 111, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, ContainerPort: util.NewIntOrStringFromString("p"), - Ports: []current.ServicePort{{ + Ports: []versioned.ServicePort{{ Name: "q", Port: 222, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }}, }, - expected: newer.Service{ - Spec: newer.ServiceSpec{Ports: []newer.ServicePort{{ + expected: api.Service{ + Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Name: "q", Port: 222, - Protocol: newer.ProtocolUDP, + Protocol: api.ProtocolUDP, TargetPort: util.NewIntOrStringFromInt(93), }}}, }, - roundtrip: current.Service{ - Ports: []current.ServicePort{{ + roundtrip: versioned.Service{ + Ports: []versioned.ServicePort{{ Name: "q", Port: 222, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }}, }, }, { - given: current.Service{ - TypeMeta: current.TypeMeta{ + given: versioned.Service{ + TypeMeta: versioned.TypeMeta{ ID: "one", }, - Ports: []current.ServicePort{{ + Ports: []versioned.ServicePort{{ Name: "p", Port: 111, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }}, }, - expected: newer.Service{ - Spec: newer.ServiceSpec{Ports: []newer.ServicePort{{ + expected: api.Service{ + Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Name: "p", Port: 111, - Protocol: newer.ProtocolUDP, + Protocol: api.ProtocolUDP, TargetPort: util.NewIntOrStringFromInt(93), }}}, }, - roundtrip: current.Service{ - Ports: []current.ServicePort{{ + roundtrip: versioned.Service{ + Ports: []versioned.ServicePort{{ Name: "p", Port: 111, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }}, }, }, { - given: current.Service{ - TypeMeta: current.TypeMeta{ + given: versioned.Service{ + TypeMeta: versioned.TypeMeta{ ID: "two", }, - Ports: []current.ServicePort{{ + Ports: []versioned.ServicePort{{ Name: "p", Port: 111, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }, { Name: "q", Port: 222, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, ContainerPort: util.NewIntOrStringFromInt(76), }}, }, - expected: newer.Service{ - Spec: newer.ServiceSpec{Ports: []newer.ServicePort{{ + expected: api.Service{ + Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Name: "p", Port: 111, - Protocol: newer.ProtocolUDP, + Protocol: api.ProtocolUDP, TargetPort: util.NewIntOrStringFromInt(93), }, { Name: "q", Port: 222, - Protocol: newer.ProtocolTCP, + Protocol: api.ProtocolTCP, TargetPort: util.NewIntOrStringFromInt(76), }}}, }, - roundtrip: current.Service{ - Ports: []current.ServicePort{{ + roundtrip: versioned.Service{ + Ports: []versioned.ServicePort{{ Name: "p", Port: 111, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, ContainerPort: util.NewIntOrStringFromInt(93), }, { Name: "q", Port: 222, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, ContainerPort: util.NewIntOrStringFromInt(76), }}, }, @@ -223,8 +223,8 @@ func TestServicePorts(t *testing.T) { for i, tc := range testCases { // Convert versioned -> internal. - got := newer.Service{} - if err := newer.Scheme.Convert(&tc.given, &got); err != nil { + got := api.Service{} + if err := api.Scheme.Convert(&tc.given, &got); err != nil { t.Errorf("[Case: %d] Unexpected error: %v", i, err) continue } @@ -233,8 +233,8 @@ func TestServicePorts(t *testing.T) { } // Convert internal -> versioned. - got2 := current.Service{} - if err := newer.Scheme.Convert(&got, &got2); err != nil { + got2 := versioned.Service{} + if err := api.Scheme.Convert(&got, &got2); err != nil { t.Errorf("[Case: %d] Unexpected error: %v", i, err) continue } @@ -245,7 +245,7 @@ func TestServicePorts(t *testing.T) { } func TestNodeConversion(t *testing.T) { - version, kind, err := newer.Scheme.ObjectVersionAndKind(¤t.Minion{}) + version, kind, err := api.Scheme.ObjectVersionAndKind(&versioned.Minion{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -253,30 +253,30 @@ func TestNodeConversion(t *testing.T) { t.Errorf("unexpected version and kind: %s %s", version, kind) } - newer.Scheme.Log(t) - obj, err := current.Codec.Decode([]byte(`{"kind":"Node","apiVersion":"v1beta2"}`)) + api.Scheme.Log(t) + obj, err := versioned.Codec.Decode([]byte(`{"kind":"Node","apiVersion":"v1beta2"}`)) 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":"NodeList","apiVersion":"v1beta2"}`)) + obj, err = versioned.Codec.Decode([]byte(`{"kind":"NodeList","apiVersion":"v1beta2"}`)) 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":"Node","apiVersion":"v1beta2"}`), obj); err != nil { + obj = &api.Node{} + if err := versioned.Codec.DecodeInto([]byte(`{"kind":"Node","apiVersion":"v1beta2"}`), obj); err != nil { t.Fatalf("unexpected error: %v", err) } - obj = &newer.Node{} - data, err := current.Codec.Encode(obj) + obj = &api.Node{} + data, err := versioned.Codec.Encode(obj) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -291,18 +291,18 @@ func TestNodeConversion(t *testing.T) { func TestPullPolicyConversion(t *testing.T) { table := []struct { - versioned current.PullPolicy - internal newer.PullPolicy + versioned versioned.PullPolicy + internal api.PullPolicy }{ { - versioned: current.PullAlways, - internal: newer.PullAlways, + versioned: versioned.PullAlways, + internal: api.PullAlways, }, { - versioned: current.PullNever, - internal: newer.PullNever, + versioned: versioned.PullNever, + internal: api.PullNever, }, { - versioned: current.PullIfNotPresent, - internal: newer.PullIfNotPresent, + versioned: versioned.PullIfNotPresent, + internal: api.PullIfNotPresent, }, { versioned: "", internal: "", @@ -312,8 +312,8 @@ func TestPullPolicyConversion(t *testing.T) { }, } for _, item := range table { - var got newer.PullPolicy - err := newer.Scheme.Convert(&item.versioned, &got) + var got api.PullPolicy + err := api.Scheme.Convert(&item.versioned, &got) if err != nil { t.Errorf("Unexpected error: %v", err) continue @@ -323,8 +323,8 @@ func TestPullPolicyConversion(t *testing.T) { } } for _, item := range table { - var got current.PullPolicy - err := newer.Scheme.Convert(&item.internal, &got) + var got versioned.PullPolicy + err := api.Scheme.Convert(&item.internal, &got) if err != nil { t.Errorf("Unexpected error: %v", err) continue @@ -335,14 +335,14 @@ func TestPullPolicyConversion(t *testing.T) { } } -func getResourceRequirements(cpu, memory resource.Quantity) current.ResourceRequirements { - res := current.ResourceRequirements{} - res.Limits = current.ResourceList{} +func getResourceRequirements(cpu, memory resource.Quantity) versioned.ResourceRequirements { + res := versioned.ResourceRequirements{} + res.Limits = versioned.ResourceList{} if cpu.Value() > 0 { - res.Limits[current.ResourceCPU] = util.NewIntOrStringFromInt(int(cpu.Value())) + res.Limits[versioned.ResourceCPU] = util.NewIntOrStringFromInt(int(cpu.Value())) } if memory.Value() > 0 { - res.Limits[current.ResourceMemory] = util.NewIntOrStringFromInt(int(memory.Value())) + res.Limits[versioned.ResourceMemory] = util.NewIntOrStringFromInt(int(memory.Value())) } return res @@ -352,7 +352,7 @@ func TestContainerConversion(t *testing.T) { cpuLimit := resource.MustParse("10") memoryLimit := resource.MustParse("10M") null := resource.Quantity{} - testCases := []current.Container{ + testCases := []versioned.Container{ { Name: "container", Resources: getResourceRequirements(cpuLimit, memoryLimit), @@ -385,8 +385,8 @@ func TestContainerConversion(t *testing.T) { } for i, tc := range testCases { - got := newer.Container{} - if err := newer.Scheme.Convert(&tc, &got); err != nil { + got := api.Container{} + if err := api.Scheme.Convert(&tc, &got); err != nil { t.Errorf("[Case: %d] Unexpected error: %v", i, err) continue } @@ -401,114 +401,114 @@ func TestContainerConversion(t *testing.T) { func TestEndpointsConversion(t *testing.T) { testCases := []struct { - given current.Endpoints - expected newer.Endpoints + given versioned.Endpoints + expected api.Endpoints }{ { - given: current.Endpoints{ - TypeMeta: current.TypeMeta{ + given: versioned.Endpoints{ + TypeMeta: versioned.TypeMeta{ ID: "empty", }, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, Endpoints: []string{}, }, - expected: newer.Endpoints{ - Subsets: []newer.EndpointSubset{}, + expected: api.Endpoints{ + Subsets: []api.EndpointSubset{}, }, }, { - given: current.Endpoints{ - TypeMeta: current.TypeMeta{ + given: versioned.Endpoints{ + TypeMeta: versioned.TypeMeta{ ID: "one legacy", }, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, Endpoints: []string{"1.2.3.4:88"}, }, - expected: newer.Endpoints{ - Subsets: []newer.EndpointSubset{{ - Ports: []newer.EndpointPort{{Name: "", Port: 88, Protocol: newer.ProtocolTCP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}}, + expected: api.Endpoints{ + Subsets: []api.EndpointSubset{{ + Ports: []api.EndpointPort{{Name: "", Port: 88, Protocol: api.ProtocolTCP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, }}, }, }, { - given: current.Endpoints{ - TypeMeta: current.TypeMeta{ + given: versioned.Endpoints{ + TypeMeta: versioned.TypeMeta{ ID: "several legacy", }, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, Endpoints: []string{"1.2.3.4:88", "1.2.3.4:89", "1.2.3.4:90"}, }, - expected: newer.Endpoints{ - Subsets: []newer.EndpointSubset{ + expected: api.Endpoints{ + Subsets: []api.EndpointSubset{ { - Ports: []newer.EndpointPort{{Name: "", Port: 88, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}}, + Ports: []api.EndpointPort{{Name: "", Port: 88, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, }, { - Ports: []newer.EndpointPort{{Name: "", Port: 89, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}}, + Ports: []api.EndpointPort{{Name: "", Port: 89, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, }, { - Ports: []newer.EndpointPort{{Name: "", Port: 90, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}}, + Ports: []api.EndpointPort{{Name: "", Port: 90, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, }, }}, }, { - given: current.Endpoints{ - TypeMeta: current.TypeMeta{ + given: versioned.Endpoints{ + TypeMeta: versioned.TypeMeta{ ID: "one subset", }, - Protocol: current.ProtocolTCP, + Protocol: versioned.ProtocolTCP, Endpoints: []string{"1.2.3.4:88"}, - Subsets: []current.EndpointSubset{{ - Ports: []current.EndpointPort{{Name: "", Port: 88, Protocol: current.ProtocolTCP}}, - Addresses: []current.EndpointAddress{{IP: "1.2.3.4"}}, + Subsets: []versioned.EndpointSubset{{ + Ports: []versioned.EndpointPort{{Name: "", Port: 88, Protocol: versioned.ProtocolTCP}}, + Addresses: []versioned.EndpointAddress{{IP: "1.2.3.4"}}, }}, }, - expected: newer.Endpoints{ - Subsets: []newer.EndpointSubset{{ - Ports: []newer.EndpointPort{{Name: "", Port: 88, Protocol: newer.ProtocolTCP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}}, + expected: api.Endpoints{ + Subsets: []api.EndpointSubset{{ + Ports: []api.EndpointPort{{Name: "", Port: 88, Protocol: api.ProtocolTCP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, }}, }, }, { - given: current.Endpoints{ - TypeMeta: current.TypeMeta{ + given: versioned.Endpoints{ + TypeMeta: versioned.TypeMeta{ ID: "several subset", }, - Protocol: current.ProtocolUDP, + Protocol: versioned.ProtocolUDP, Endpoints: []string{"1.2.3.4:88", "5.6.7.8:88", "1.2.3.4:89", "5.6.7.8:89"}, - Subsets: []current.EndpointSubset{ + Subsets: []versioned.EndpointSubset{ { - Ports: []current.EndpointPort{{Name: "", Port: 88, Protocol: current.ProtocolUDP}}, - Addresses: []current.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []versioned.EndpointPort{{Name: "", Port: 88, Protocol: versioned.ProtocolUDP}}, + Addresses: []versioned.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, { - Ports: []current.EndpointPort{{Name: "", Port: 89, Protocol: current.ProtocolUDP}}, - Addresses: []current.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []versioned.EndpointPort{{Name: "", Port: 89, Protocol: versioned.ProtocolUDP}}, + Addresses: []versioned.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, { - Ports: []current.EndpointPort{{Name: "named", Port: 90, Protocol: current.ProtocolUDP}}, - Addresses: []current.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []versioned.EndpointPort{{Name: "named", Port: 90, Protocol: versioned.ProtocolUDP}}, + Addresses: []versioned.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, }, }, - expected: newer.Endpoints{ - Subsets: []newer.EndpointSubset{ + expected: api.Endpoints{ + Subsets: []api.EndpointSubset{ { - Ports: []newer.EndpointPort{{Name: "", Port: 88, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []api.EndpointPort{{Name: "", Port: 88, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, { - Ports: []newer.EndpointPort{{Name: "", Port: 89, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []api.EndpointPort{{Name: "", Port: 89, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, { - Ports: []newer.EndpointPort{{Name: "named", Port: 90, Protocol: newer.ProtocolUDP}}, - Addresses: []newer.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, + Ports: []api.EndpointPort{{Name: "named", Port: 90, Protocol: api.ProtocolUDP}}, + Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, }, }}, }, @@ -516,48 +516,48 @@ func TestEndpointsConversion(t *testing.T) { for i, tc := range testCases { // Convert versioned -> internal. - got := newer.Endpoints{} - if err := newer.Scheme.Convert(&tc.given, &got); err != nil { + got := api.Endpoints{} + if err := api.Scheme.Convert(&tc.given, &got); err != nil { t.Errorf("[Case: %d] Unexpected error: %v", i, err) continue } - if !newer.Semantic.DeepEqual(got.Subsets, tc.expected.Subsets) { + if !api.Semantic.DeepEqual(got.Subsets, tc.expected.Subsets) { t.Errorf("[Case: %d] Expected %#v, got %#v", i, tc.expected.Subsets, got.Subsets) } // Convert internal -> versioned. - got2 := current.Endpoints{} - if err := newer.Scheme.Convert(&got, &got2); err != nil { + got2 := versioned.Endpoints{} + if err := api.Scheme.Convert(&got, &got2); err != nil { t.Errorf("[Case: %d] Unexpected error: %v", i, err) continue } - if got2.Protocol != tc.given.Protocol || !newer.Semantic.DeepEqual(got2.Endpoints, tc.given.Endpoints) { + if got2.Protocol != tc.given.Protocol || !api.Semantic.DeepEqual(got2.Endpoints, tc.given.Endpoints) { t.Errorf("[Case: %d] Expected %#v, got %#v", i, tc.given.Endpoints, got2.Endpoints) } } } func TestSecretVolumeSourceConversion(t *testing.T) { - given := current.SecretVolumeSource{ - Target: current.ObjectReference{ + given := versioned.SecretVolumeSource{ + Target: versioned.ObjectReference{ ID: "foo", }, } - expected := newer.SecretVolumeSource{ + expected := api.SecretVolumeSource{ SecretName: "foo", } - got := newer.SecretVolumeSource{} - if err := newer.Scheme.Convert(&given, &got); err != nil { + got := api.SecretVolumeSource{} + if err := api.Scheme.Convert(&given, &got); err != nil { t.Errorf("Unexpected error: %v", err) } if got.SecretName != expected.SecretName { t.Errorf("Expected %v; got %v", expected, got) } - got2 := current.SecretVolumeSource{} - if err := newer.Scheme.Convert(&got, &got2); err != nil { + got2 := versioned.SecretVolumeSource{} + if err := api.Scheme.Convert(&got, &got2); err != nil { t.Errorf("Unexpected error: %v", err) } if got2.Target.ID != given.Target.ID { @@ -568,42 +568,42 @@ func TestSecretVolumeSourceConversion(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: ¤t.Container{ + c: &versioned.Container{ Privileged: true, - SecurityContext: ¤t.SecurityContext{ + SecurityContext: &versioned.SecurityContext{ Privileged: &priv, }, }, err: "container privileged settings do not match security context settings, cannot convert", }, "mismatched caps add": { - c: ¤t.Container{ - Capabilities: current.Capabilities{ - Add: []current.Capability{"foo"}, + c: &versioned.Container{ + Capabilities: versioned.Capabilities{ + Add: []versioned.Capability{"foo"}, }, - SecurityContext: ¤t.SecurityContext{ - Capabilities: ¤t.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: ¤t.Container{ - Capabilities: current.Capabilities{ - Drop: []current.Capability{"foo"}, + c: &versioned.Container{ + Capabilities: versioned.Capabilities{ + Drop: []versioned.Capability{"foo"}, }, - SecurityContext: ¤t.SecurityContext{ - Capabilities: ¤t.Capabilities{ - Drop: []current.Capability{"bar"}, + SecurityContext: &versioned.SecurityContext{ + Capabilities: &versioned.Capabilities{ + Drop: []versioned.Capability{"bar"}, }, }, }, @@ -612,8 +612,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 { diff --git a/pkg/api/v1beta3/conversion.go b/pkg/api/v1beta3/conversion.go index 45bf0ef562f..9dd70e539ca 100644 --- a/pkg/api/v1beta3/conversion.go +++ b/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 diff --git a/pkg/api/v1beta3/conversion_generated.go b/pkg/api/v1beta3/conversion_generated.go index 837c6f02560..668f4b110a5 100644 --- a/pkg/api/v1beta3/conversion_generated.go +++ b/pkg/api/v1beta3/conversion_generated.go @@ -19,13 +19,13 @@ package v1beta3 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" ) // AUTO-GENERATED FUNCTIONS START HERE -func convert_v1beta3_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in *AWSElasticBlockStoreVolumeSource, out *newer.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { +func convert_v1beta3_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in *AWSElasticBlockStoreVolumeSource, out *api.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*AWSElasticBlockStoreVolumeSource))(in) } @@ -36,9 +36,9 @@ func convert_v1beta3_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStor return nil } -func convert_api_AWSElasticBlockStoreVolumeSource_To_v1beta3_AWSElasticBlockStoreVolumeSource(in *newer.AWSElasticBlockStoreVolumeSource, out *AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { +func convert_api_AWSElasticBlockStoreVolumeSource_To_v1beta3_AWSElasticBlockStoreVolumeSource(in *api.AWSElasticBlockStoreVolumeSource, out *AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.AWSElasticBlockStoreVolumeSource))(in) + defaulting.(func(*api.AWSElasticBlockStoreVolumeSource))(in) } out.VolumeID = in.VolumeID out.FSType = in.FSType @@ -47,7 +47,7 @@ func convert_api_AWSElasticBlockStoreVolumeSource_To_v1beta3_AWSElasticBlockStor return nil } -func convert_v1beta3_Binding_To_api_Binding(in *Binding, out *newer.Binding, s conversion.Scope) error { +func convert_v1beta3_Binding_To_api_Binding(in *Binding, out *api.Binding, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Binding))(in) } @@ -63,9 +63,9 @@ func convert_v1beta3_Binding_To_api_Binding(in *Binding, out *newer.Binding, s c return nil } -func convert_api_Binding_To_v1beta3_Binding(in *newer.Binding, out *Binding, s conversion.Scope) error { +func convert_api_Binding_To_v1beta3_Binding(in *api.Binding, out *Binding, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Binding))(in) + defaulting.(func(*api.Binding))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -79,9 +79,9 @@ func convert_api_Binding_To_v1beta3_Binding(in *newer.Binding, out *Binding, s c return nil } -func convert_api_Capabilities_To_v1beta3_Capabilities(in *newer.Capabilities, out *Capabilities, s conversion.Scope) error { +func convert_api_Capabilities_To_v1beta3_Capabilities(in *api.Capabilities, out *Capabilities, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Capabilities))(in) + defaulting.(func(*api.Capabilities))(in) } if in.Add != nil { out.Add = make([]Capability, len(in.Add)) @@ -102,22 +102,22 @@ func convert_api_Capabilities_To_v1beta3_Capabilities(in *newer.Capabilities, ou return nil } -func convert_v1beta3_Capabilities_To_api_Capabilities(in *Capabilities, out *newer.Capabilities, s conversion.Scope) error { +func convert_v1beta3_Capabilities_To_api_Capabilities(in *Capabilities, out *api.Capabilities, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Capabilities))(in) } if in.Add != nil { - out.Add = make([]newer.Capability, len(in.Add)) + out.Add = make([]api.Capability, len(in.Add)) for i := range in.Add { - out.Add[i] = newer.Capability(in.Add[i]) + out.Add[i] = api.Capability(in.Add[i]) } } else { out.Add = nil } if in.Drop != nil { - out.Drop = make([]newer.Capability, len(in.Drop)) + out.Drop = make([]api.Capability, len(in.Drop)) for i := range in.Drop { - out.Drop[i] = newer.Capability(in.Drop[i]) + out.Drop[i] = api.Capability(in.Drop[i]) } } else { out.Drop = nil @@ -125,20 +125,20 @@ func convert_v1beta3_Capabilities_To_api_Capabilities(in *Capabilities, out *new return nil } -func convert_v1beta3_ComponentCondition_To_api_ComponentCondition(in *ComponentCondition, out *newer.ComponentCondition, s conversion.Scope) error { +func convert_v1beta3_ComponentCondition_To_api_ComponentCondition(in *ComponentCondition, out *api.ComponentCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ComponentCondition))(in) } - out.Type = newer.ComponentConditionType(in.Type) - out.Status = newer.ConditionStatus(in.Status) + out.Type = api.ComponentConditionType(in.Type) + out.Status = api.ConditionStatus(in.Status) out.Message = in.Message out.Error = in.Error return nil } -func convert_api_ComponentCondition_To_v1beta3_ComponentCondition(in *newer.ComponentCondition, out *ComponentCondition, s conversion.Scope) error { +func convert_api_ComponentCondition_To_v1beta3_ComponentCondition(in *api.ComponentCondition, out *ComponentCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ComponentCondition))(in) + defaulting.(func(*api.ComponentCondition))(in) } out.Type = ComponentConditionType(in.Type) out.Status = ConditionStatus(in.Status) @@ -147,7 +147,7 @@ func convert_api_ComponentCondition_To_v1beta3_ComponentCondition(in *newer.Comp return nil } -func convert_v1beta3_ComponentStatus_To_api_ComponentStatus(in *ComponentStatus, out *newer.ComponentStatus, s conversion.Scope) error { +func convert_v1beta3_ComponentStatus_To_api_ComponentStatus(in *ComponentStatus, out *api.ComponentStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ComponentStatus))(in) } @@ -158,7 +158,7 @@ func convert_v1beta3_ComponentStatus_To_api_ComponentStatus(in *ComponentStatus, return err } if in.Conditions != nil { - out.Conditions = make([]newer.ComponentCondition, len(in.Conditions)) + out.Conditions = make([]api.ComponentCondition, len(in.Conditions)) for i := range in.Conditions { if err := convert_v1beta3_ComponentCondition_To_api_ComponentCondition(&in.Conditions[i], &out.Conditions[i], s); err != nil { return err @@ -170,9 +170,9 @@ func convert_v1beta3_ComponentStatus_To_api_ComponentStatus(in *ComponentStatus, return nil } -func convert_api_ComponentStatus_To_v1beta3_ComponentStatus(in *newer.ComponentStatus, out *ComponentStatus, s conversion.Scope) error { +func convert_api_ComponentStatus_To_v1beta3_ComponentStatus(in *api.ComponentStatus, out *ComponentStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ComponentStatus))(in) + defaulting.(func(*api.ComponentStatus))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -193,7 +193,7 @@ func convert_api_ComponentStatus_To_v1beta3_ComponentStatus(in *newer.ComponentS return nil } -func convert_v1beta3_ComponentStatusList_To_api_ComponentStatusList(in *ComponentStatusList, out *newer.ComponentStatusList, s conversion.Scope) error { +func convert_v1beta3_ComponentStatusList_To_api_ComponentStatusList(in *ComponentStatusList, out *api.ComponentStatusList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ComponentStatusList))(in) } @@ -204,7 +204,7 @@ func convert_v1beta3_ComponentStatusList_To_api_ComponentStatusList(in *Componen return err } if in.Items != nil { - out.Items = make([]newer.ComponentStatus, len(in.Items)) + out.Items = make([]api.ComponentStatus, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_ComponentStatus_To_api_ComponentStatus(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -216,9 +216,9 @@ func convert_v1beta3_ComponentStatusList_To_api_ComponentStatusList(in *Componen return nil } -func convert_api_ComponentStatusList_To_v1beta3_ComponentStatusList(in *newer.ComponentStatusList, out *ComponentStatusList, s conversion.Scope) error { +func convert_api_ComponentStatusList_To_v1beta3_ComponentStatusList(in *api.ComponentStatusList, out *ComponentStatusList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ComponentStatusList))(in) + defaulting.(func(*api.ComponentStatusList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -239,21 +239,21 @@ func convert_api_ComponentStatusList_To_v1beta3_ComponentStatusList(in *newer.Co return nil } -func convert_v1beta3_ContainerPort_To_api_ContainerPort(in *ContainerPort, out *newer.ContainerPort, s conversion.Scope) error { +func convert_v1beta3_ContainerPort_To_api_ContainerPort(in *ContainerPort, out *api.ContainerPort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerPort))(in) } out.Name = in.Name out.HostPort = in.HostPort out.ContainerPort = in.ContainerPort - out.Protocol = newer.Protocol(in.Protocol) + out.Protocol = api.Protocol(in.Protocol) out.HostIP = in.HostIP return nil } -func convert_api_ContainerPort_To_v1beta3_ContainerPort(in *newer.ContainerPort, out *ContainerPort, s conversion.Scope) error { +func convert_api_ContainerPort_To_v1beta3_ContainerPort(in *api.ContainerPort, out *ContainerPort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerPort))(in) + defaulting.(func(*api.ContainerPort))(in) } out.Name = in.Name out.HostPort = in.HostPort @@ -263,12 +263,12 @@ func convert_api_ContainerPort_To_v1beta3_ContainerPort(in *newer.ContainerPort, return nil } -func convert_v1beta3_ContainerState_To_api_ContainerState(in *ContainerState, out *newer.ContainerState, s conversion.Scope) error { +func convert_v1beta3_ContainerState_To_api_ContainerState(in *ContainerState, out *api.ContainerState, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerState))(in) } if in.Waiting != nil { - out.Waiting = new(newer.ContainerStateWaiting) + out.Waiting = new(api.ContainerStateWaiting) if err := convert_v1beta3_ContainerStateWaiting_To_api_ContainerStateWaiting(in.Waiting, out.Waiting, s); err != nil { return err } @@ -276,7 +276,7 @@ func convert_v1beta3_ContainerState_To_api_ContainerState(in *ContainerState, ou out.Waiting = nil } if in.Running != nil { - out.Running = new(newer.ContainerStateRunning) + out.Running = new(api.ContainerStateRunning) if err := convert_v1beta3_ContainerStateRunning_To_api_ContainerStateRunning(in.Running, out.Running, s); err != nil { return err } @@ -284,7 +284,7 @@ func convert_v1beta3_ContainerState_To_api_ContainerState(in *ContainerState, ou out.Running = nil } if in.Termination != nil { - out.Termination = new(newer.ContainerStateTerminated) + out.Termination = new(api.ContainerStateTerminated) if err := convert_v1beta3_ContainerStateTerminated_To_api_ContainerStateTerminated(in.Termination, out.Termination, s); err != nil { return err } @@ -294,9 +294,9 @@ func convert_v1beta3_ContainerState_To_api_ContainerState(in *ContainerState, ou return nil } -func convert_api_ContainerState_To_v1beta3_ContainerState(in *newer.ContainerState, out *ContainerState, s conversion.Scope) error { +func convert_api_ContainerState_To_v1beta3_ContainerState(in *api.ContainerState, out *ContainerState, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerState))(in) + defaulting.(func(*api.ContainerState))(in) } if in.Waiting != nil { out.Waiting = new(ContainerStateWaiting) @@ -325,7 +325,7 @@ func convert_api_ContainerState_To_v1beta3_ContainerState(in *newer.ContainerSta return nil } -func convert_v1beta3_ContainerStateRunning_To_api_ContainerStateRunning(in *ContainerStateRunning, out *newer.ContainerStateRunning, s conversion.Scope) error { +func convert_v1beta3_ContainerStateRunning_To_api_ContainerStateRunning(in *ContainerStateRunning, out *api.ContainerStateRunning, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerStateRunning))(in) } @@ -335,9 +335,9 @@ func convert_v1beta3_ContainerStateRunning_To_api_ContainerStateRunning(in *Cont return nil } -func convert_api_ContainerStateRunning_To_v1beta3_ContainerStateRunning(in *newer.ContainerStateRunning, out *ContainerStateRunning, s conversion.Scope) error { +func convert_api_ContainerStateRunning_To_v1beta3_ContainerStateRunning(in *api.ContainerStateRunning, out *ContainerStateRunning, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerStateRunning))(in) + defaulting.(func(*api.ContainerStateRunning))(in) } if err := s.Convert(&in.StartedAt, &out.StartedAt, 0); err != nil { return err @@ -345,7 +345,7 @@ func convert_api_ContainerStateRunning_To_v1beta3_ContainerStateRunning(in *newe return nil } -func convert_v1beta3_ContainerStateTerminated_To_api_ContainerStateTerminated(in *ContainerStateTerminated, out *newer.ContainerStateTerminated, s conversion.Scope) error { +func convert_v1beta3_ContainerStateTerminated_To_api_ContainerStateTerminated(in *ContainerStateTerminated, out *api.ContainerStateTerminated, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerStateTerminated))(in) } @@ -363,9 +363,9 @@ func convert_v1beta3_ContainerStateTerminated_To_api_ContainerStateTerminated(in return nil } -func convert_api_ContainerStateTerminated_To_v1beta3_ContainerStateTerminated(in *newer.ContainerStateTerminated, out *ContainerStateTerminated, s conversion.Scope) error { +func convert_api_ContainerStateTerminated_To_v1beta3_ContainerStateTerminated(in *api.ContainerStateTerminated, out *ContainerStateTerminated, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerStateTerminated))(in) + defaulting.(func(*api.ContainerStateTerminated))(in) } out.ExitCode = in.ExitCode out.Signal = in.Signal @@ -381,7 +381,7 @@ func convert_api_ContainerStateTerminated_To_v1beta3_ContainerStateTerminated(in return nil } -func convert_v1beta3_ContainerStateWaiting_To_api_ContainerStateWaiting(in *ContainerStateWaiting, out *newer.ContainerStateWaiting, s conversion.Scope) error { +func convert_v1beta3_ContainerStateWaiting_To_api_ContainerStateWaiting(in *ContainerStateWaiting, out *api.ContainerStateWaiting, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerStateWaiting))(in) } @@ -389,15 +389,15 @@ func convert_v1beta3_ContainerStateWaiting_To_api_ContainerStateWaiting(in *Cont return nil } -func convert_api_ContainerStateWaiting_To_v1beta3_ContainerStateWaiting(in *newer.ContainerStateWaiting, out *ContainerStateWaiting, s conversion.Scope) error { +func convert_api_ContainerStateWaiting_To_v1beta3_ContainerStateWaiting(in *api.ContainerStateWaiting, out *ContainerStateWaiting, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerStateWaiting))(in) + defaulting.(func(*api.ContainerStateWaiting))(in) } out.Reason = in.Reason return nil } -func convert_v1beta3_ContainerStatus_To_api_ContainerStatus(in *ContainerStatus, out *newer.ContainerStatus, s conversion.Scope) error { +func convert_v1beta3_ContainerStatus_To_api_ContainerStatus(in *ContainerStatus, out *api.ContainerStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ContainerStatus))(in) } @@ -416,9 +416,9 @@ func convert_v1beta3_ContainerStatus_To_api_ContainerStatus(in *ContainerStatus, return nil } -func convert_api_ContainerStatus_To_v1beta3_ContainerStatus(in *newer.ContainerStatus, out *ContainerStatus, s conversion.Scope) error { +func convert_api_ContainerStatus_To_v1beta3_ContainerStatus(in *api.ContainerStatus, out *ContainerStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ContainerStatus))(in) + defaulting.(func(*api.ContainerStatus))(in) } out.Name = in.Name if err := convert_api_ContainerState_To_v1beta3_ContainerState(&in.State, &out.State, s); err != nil { @@ -435,7 +435,7 @@ func convert_api_ContainerStatus_To_v1beta3_ContainerStatus(in *newer.ContainerS return nil } -func convert_v1beta3_DeleteOptions_To_api_DeleteOptions(in *DeleteOptions, out *newer.DeleteOptions, s conversion.Scope) error { +func convert_v1beta3_DeleteOptions_To_api_DeleteOptions(in *DeleteOptions, out *api.DeleteOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*DeleteOptions))(in) } @@ -451,9 +451,9 @@ func convert_v1beta3_DeleteOptions_To_api_DeleteOptions(in *DeleteOptions, out * return nil } -func convert_api_DeleteOptions_To_v1beta3_DeleteOptions(in *newer.DeleteOptions, out *DeleteOptions, s conversion.Scope) error { +func convert_api_DeleteOptions_To_v1beta3_DeleteOptions(in *api.DeleteOptions, out *DeleteOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.DeleteOptions))(in) + defaulting.(func(*api.DeleteOptions))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -467,29 +467,29 @@ func convert_api_DeleteOptions_To_v1beta3_DeleteOptions(in *newer.DeleteOptions, return nil } -func convert_v1beta3_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *EmptyDirVolumeSource, out *newer.EmptyDirVolumeSource, s conversion.Scope) error { +func convert_v1beta3_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *EmptyDirVolumeSource, out *api.EmptyDirVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EmptyDirVolumeSource))(in) } - out.Medium = newer.StorageMedium(in.Medium) + out.Medium = api.StorageMedium(in.Medium) return nil } -func convert_api_EmptyDirVolumeSource_To_v1beta3_EmptyDirVolumeSource(in *newer.EmptyDirVolumeSource, out *EmptyDirVolumeSource, s conversion.Scope) error { +func convert_api_EmptyDirVolumeSource_To_v1beta3_EmptyDirVolumeSource(in *api.EmptyDirVolumeSource, out *EmptyDirVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EmptyDirVolumeSource))(in) + defaulting.(func(*api.EmptyDirVolumeSource))(in) } out.Medium = StorageMedium(in.Medium) return nil } -func convert_v1beta3_EndpointAddress_To_api_EndpointAddress(in *EndpointAddress, out *newer.EndpointAddress, s conversion.Scope) error { +func convert_v1beta3_EndpointAddress_To_api_EndpointAddress(in *EndpointAddress, out *api.EndpointAddress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EndpointAddress))(in) } out.IP = in.IP if in.TargetRef != nil { - out.TargetRef = new(newer.ObjectReference) + out.TargetRef = new(api.ObjectReference) if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(in.TargetRef, out.TargetRef, s); err != nil { return err } @@ -499,9 +499,9 @@ func convert_v1beta3_EndpointAddress_To_api_EndpointAddress(in *EndpointAddress, return nil } -func convert_api_EndpointAddress_To_v1beta3_EndpointAddress(in *newer.EndpointAddress, out *EndpointAddress, s conversion.Scope) error { +func convert_api_EndpointAddress_To_v1beta3_EndpointAddress(in *api.EndpointAddress, out *EndpointAddress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EndpointAddress))(in) + defaulting.(func(*api.EndpointAddress))(in) } out.IP = in.IP if in.TargetRef != nil { @@ -515,19 +515,19 @@ func convert_api_EndpointAddress_To_v1beta3_EndpointAddress(in *newer.EndpointAd return nil } -func convert_v1beta3_EndpointPort_To_api_EndpointPort(in *EndpointPort, out *newer.EndpointPort, s conversion.Scope) error { +func convert_v1beta3_EndpointPort_To_api_EndpointPort(in *EndpointPort, out *api.EndpointPort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EndpointPort))(in) } out.Name = in.Name out.Port = in.Port - out.Protocol = newer.Protocol(in.Protocol) + out.Protocol = api.Protocol(in.Protocol) return nil } -func convert_api_EndpointPort_To_v1beta3_EndpointPort(in *newer.EndpointPort, out *EndpointPort, s conversion.Scope) error { +func convert_api_EndpointPort_To_v1beta3_EndpointPort(in *api.EndpointPort, out *EndpointPort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EndpointPort))(in) + defaulting.(func(*api.EndpointPort))(in) } out.Name = in.Name out.Port = in.Port @@ -535,12 +535,12 @@ func convert_api_EndpointPort_To_v1beta3_EndpointPort(in *newer.EndpointPort, ou return nil } -func convert_v1beta3_EndpointSubset_To_api_EndpointSubset(in *EndpointSubset, out *newer.EndpointSubset, s conversion.Scope) error { +func convert_v1beta3_EndpointSubset_To_api_EndpointSubset(in *EndpointSubset, out *api.EndpointSubset, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EndpointSubset))(in) } if in.Addresses != nil { - out.Addresses = make([]newer.EndpointAddress, len(in.Addresses)) + out.Addresses = make([]api.EndpointAddress, len(in.Addresses)) for i := range in.Addresses { if err := convert_v1beta3_EndpointAddress_To_api_EndpointAddress(&in.Addresses[i], &out.Addresses[i], s); err != nil { return err @@ -550,7 +550,7 @@ func convert_v1beta3_EndpointSubset_To_api_EndpointSubset(in *EndpointSubset, ou out.Addresses = nil } if in.Ports != nil { - out.Ports = make([]newer.EndpointPort, len(in.Ports)) + out.Ports = make([]api.EndpointPort, len(in.Ports)) for i := range in.Ports { if err := convert_v1beta3_EndpointPort_To_api_EndpointPort(&in.Ports[i], &out.Ports[i], s); err != nil { return err @@ -562,9 +562,9 @@ func convert_v1beta3_EndpointSubset_To_api_EndpointSubset(in *EndpointSubset, ou return nil } -func convert_api_EndpointSubset_To_v1beta3_EndpointSubset(in *newer.EndpointSubset, out *EndpointSubset, s conversion.Scope) error { +func convert_api_EndpointSubset_To_v1beta3_EndpointSubset(in *api.EndpointSubset, out *EndpointSubset, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EndpointSubset))(in) + defaulting.(func(*api.EndpointSubset))(in) } if in.Addresses != nil { out.Addresses = make([]EndpointAddress, len(in.Addresses)) @@ -589,7 +589,7 @@ func convert_api_EndpointSubset_To_v1beta3_EndpointSubset(in *newer.EndpointSubs return nil } -func convert_v1beta3_Endpoints_To_api_Endpoints(in *Endpoints, out *newer.Endpoints, s conversion.Scope) error { +func convert_v1beta3_Endpoints_To_api_Endpoints(in *Endpoints, out *api.Endpoints, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Endpoints))(in) } @@ -600,7 +600,7 @@ func convert_v1beta3_Endpoints_To_api_Endpoints(in *Endpoints, out *newer.Endpoi return err } if in.Subsets != nil { - out.Subsets = make([]newer.EndpointSubset, len(in.Subsets)) + out.Subsets = make([]api.EndpointSubset, len(in.Subsets)) for i := range in.Subsets { if err := convert_v1beta3_EndpointSubset_To_api_EndpointSubset(&in.Subsets[i], &out.Subsets[i], s); err != nil { return err @@ -612,9 +612,9 @@ func convert_v1beta3_Endpoints_To_api_Endpoints(in *Endpoints, out *newer.Endpoi return nil } -func convert_api_Endpoints_To_v1beta3_Endpoints(in *newer.Endpoints, out *Endpoints, s conversion.Scope) error { +func convert_api_Endpoints_To_v1beta3_Endpoints(in *api.Endpoints, out *Endpoints, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Endpoints))(in) + defaulting.(func(*api.Endpoints))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -635,7 +635,7 @@ func convert_api_Endpoints_To_v1beta3_Endpoints(in *newer.Endpoints, out *Endpoi return nil } -func convert_v1beta3_EndpointsList_To_api_EndpointsList(in *EndpointsList, out *newer.EndpointsList, s conversion.Scope) error { +func convert_v1beta3_EndpointsList_To_api_EndpointsList(in *EndpointsList, out *api.EndpointsList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EndpointsList))(in) } @@ -646,7 +646,7 @@ func convert_v1beta3_EndpointsList_To_api_EndpointsList(in *EndpointsList, out * return err } if in.Items != nil { - out.Items = make([]newer.Endpoints, len(in.Items)) + out.Items = make([]api.Endpoints, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_Endpoints_To_api_Endpoints(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -658,9 +658,9 @@ func convert_v1beta3_EndpointsList_To_api_EndpointsList(in *EndpointsList, out * return nil } -func convert_api_EndpointsList_To_v1beta3_EndpointsList(in *newer.EndpointsList, out *EndpointsList, s conversion.Scope) error { +func convert_api_EndpointsList_To_v1beta3_EndpointsList(in *api.EndpointsList, out *EndpointsList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EndpointsList))(in) + defaulting.(func(*api.EndpointsList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -681,14 +681,14 @@ func convert_api_EndpointsList_To_v1beta3_EndpointsList(in *newer.EndpointsList, return nil } -func convert_v1beta3_EnvVar_To_api_EnvVar(in *EnvVar, out *newer.EnvVar, s conversion.Scope) error { +func convert_v1beta3_EnvVar_To_api_EnvVar(in *EnvVar, out *api.EnvVar, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EnvVar))(in) } out.Name = in.Name out.Value = in.Value if in.ValueFrom != nil { - out.ValueFrom = new(newer.EnvVarSource) + out.ValueFrom = new(api.EnvVarSource) if err := convert_v1beta3_EnvVarSource_To_api_EnvVarSource(in.ValueFrom, out.ValueFrom, s); err != nil { return err } @@ -698,9 +698,9 @@ func convert_v1beta3_EnvVar_To_api_EnvVar(in *EnvVar, out *newer.EnvVar, s conve return nil } -func convert_api_EnvVar_To_v1beta3_EnvVar(in *newer.EnvVar, out *EnvVar, s conversion.Scope) error { +func convert_api_EnvVar_To_v1beta3_EnvVar(in *api.EnvVar, out *EnvVar, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EnvVar))(in) + defaulting.(func(*api.EnvVar))(in) } out.Name = in.Name out.Value = in.Value @@ -715,12 +715,12 @@ func convert_api_EnvVar_To_v1beta3_EnvVar(in *newer.EnvVar, out *EnvVar, s conve return nil } -func convert_v1beta3_EnvVarSource_To_api_EnvVarSource(in *EnvVarSource, out *newer.EnvVarSource, s conversion.Scope) error { +func convert_v1beta3_EnvVarSource_To_api_EnvVarSource(in *EnvVarSource, out *api.EnvVarSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EnvVarSource))(in) } if in.FieldRef != nil { - out.FieldRef = new(newer.ObjectFieldSelector) + out.FieldRef = new(api.ObjectFieldSelector) if err := convert_v1beta3_ObjectFieldSelector_To_api_ObjectFieldSelector(in.FieldRef, out.FieldRef, s); err != nil { return err } @@ -730,9 +730,9 @@ func convert_v1beta3_EnvVarSource_To_api_EnvVarSource(in *EnvVarSource, out *new return nil } -func convert_api_EnvVarSource_To_v1beta3_EnvVarSource(in *newer.EnvVarSource, out *EnvVarSource, s conversion.Scope) error { +func convert_api_EnvVarSource_To_v1beta3_EnvVarSource(in *api.EnvVarSource, out *EnvVarSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EnvVarSource))(in) + defaulting.(func(*api.EnvVarSource))(in) } if in.FieldRef != nil { out.FieldRef = new(ObjectFieldSelector) @@ -745,7 +745,7 @@ func convert_api_EnvVarSource_To_v1beta3_EnvVarSource(in *newer.EnvVarSource, ou return nil } -func convert_v1beta3_Event_To_api_Event(in *Event, out *newer.Event, s conversion.Scope) error { +func convert_v1beta3_Event_To_api_Event(in *Event, out *api.Event, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Event))(in) } @@ -773,9 +773,9 @@ func convert_v1beta3_Event_To_api_Event(in *Event, out *newer.Event, s conversio return nil } -func convert_api_Event_To_v1beta3_Event(in *newer.Event, out *Event, s conversion.Scope) error { +func convert_api_Event_To_v1beta3_Event(in *api.Event, out *Event, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Event))(in) + defaulting.(func(*api.Event))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -801,7 +801,7 @@ func convert_api_Event_To_v1beta3_Event(in *newer.Event, out *Event, s conversio return nil } -func convert_v1beta3_EventList_To_api_EventList(in *EventList, out *newer.EventList, s conversion.Scope) error { +func convert_v1beta3_EventList_To_api_EventList(in *EventList, out *api.EventList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EventList))(in) } @@ -812,7 +812,7 @@ func convert_v1beta3_EventList_To_api_EventList(in *EventList, out *newer.EventL return err } if in.Items != nil { - out.Items = make([]newer.Event, len(in.Items)) + out.Items = make([]api.Event, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_Event_To_api_Event(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -824,9 +824,9 @@ func convert_v1beta3_EventList_To_api_EventList(in *EventList, out *newer.EventL return nil } -func convert_api_EventList_To_v1beta3_EventList(in *newer.EventList, out *EventList, s conversion.Scope) error { +func convert_api_EventList_To_v1beta3_EventList(in *api.EventList, out *EventList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EventList))(in) + defaulting.(func(*api.EventList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -847,7 +847,7 @@ func convert_api_EventList_To_v1beta3_EventList(in *newer.EventList, out *EventL return nil } -func convert_v1beta3_EventSource_To_api_EventSource(in *EventSource, out *newer.EventSource, s conversion.Scope) error { +func convert_v1beta3_EventSource_To_api_EventSource(in *EventSource, out *api.EventSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*EventSource))(in) } @@ -856,16 +856,16 @@ func convert_v1beta3_EventSource_To_api_EventSource(in *EventSource, out *newer. return nil } -func convert_api_EventSource_To_v1beta3_EventSource(in *newer.EventSource, out *EventSource, s conversion.Scope) error { +func convert_api_EventSource_To_v1beta3_EventSource(in *api.EventSource, out *EventSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.EventSource))(in) + defaulting.(func(*api.EventSource))(in) } out.Component = in.Component out.Host = in.Host return nil } -func convert_v1beta3_ExecAction_To_api_ExecAction(in *ExecAction, out *newer.ExecAction, s conversion.Scope) error { +func convert_v1beta3_ExecAction_To_api_ExecAction(in *ExecAction, out *api.ExecAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ExecAction))(in) } @@ -880,9 +880,9 @@ func convert_v1beta3_ExecAction_To_api_ExecAction(in *ExecAction, out *newer.Exe return nil } -func convert_api_ExecAction_To_v1beta3_ExecAction(in *newer.ExecAction, out *ExecAction, s conversion.Scope) error { +func convert_api_ExecAction_To_v1beta3_ExecAction(in *api.ExecAction, out *ExecAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ExecAction))(in) + defaulting.(func(*api.ExecAction))(in) } if in.Command != nil { out.Command = make([]string, len(in.Command)) @@ -895,7 +895,7 @@ func convert_api_ExecAction_To_v1beta3_ExecAction(in *newer.ExecAction, out *Exe return nil } -func convert_v1beta3_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in *GCEPersistentDiskVolumeSource, out *newer.GCEPersistentDiskVolumeSource, s conversion.Scope) error { +func convert_v1beta3_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in *GCEPersistentDiskVolumeSource, out *api.GCEPersistentDiskVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*GCEPersistentDiskVolumeSource))(in) } @@ -906,9 +906,9 @@ func convert_v1beta3_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolum return nil } -func convert_api_GCEPersistentDiskVolumeSource_To_v1beta3_GCEPersistentDiskVolumeSource(in *newer.GCEPersistentDiskVolumeSource, out *GCEPersistentDiskVolumeSource, s conversion.Scope) error { +func convert_api_GCEPersistentDiskVolumeSource_To_v1beta3_GCEPersistentDiskVolumeSource(in *api.GCEPersistentDiskVolumeSource, out *GCEPersistentDiskVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.GCEPersistentDiskVolumeSource))(in) + defaulting.(func(*api.GCEPersistentDiskVolumeSource))(in) } out.PDName = in.PDName out.FSType = in.FSType @@ -917,7 +917,7 @@ func convert_api_GCEPersistentDiskVolumeSource_To_v1beta3_GCEPersistentDiskVolum return nil } -func convert_v1beta3_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in *GitRepoVolumeSource, out *newer.GitRepoVolumeSource, s conversion.Scope) error { +func convert_v1beta3_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in *GitRepoVolumeSource, out *api.GitRepoVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*GitRepoVolumeSource))(in) } @@ -926,16 +926,16 @@ func convert_v1beta3_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in *GitRepoV return nil } -func convert_api_GitRepoVolumeSource_To_v1beta3_GitRepoVolumeSource(in *newer.GitRepoVolumeSource, out *GitRepoVolumeSource, s conversion.Scope) error { +func convert_api_GitRepoVolumeSource_To_v1beta3_GitRepoVolumeSource(in *api.GitRepoVolumeSource, out *GitRepoVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.GitRepoVolumeSource))(in) + defaulting.(func(*api.GitRepoVolumeSource))(in) } out.Repository = in.Repository out.Revision = in.Revision return nil } -func convert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in *GlusterfsVolumeSource, out *newer.GlusterfsVolumeSource, s conversion.Scope) error { +func convert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in *GlusterfsVolumeSource, out *api.GlusterfsVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*GlusterfsVolumeSource))(in) } @@ -945,9 +945,9 @@ func convert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in *Glus return nil } -func convert_api_GlusterfsVolumeSource_To_v1beta3_GlusterfsVolumeSource(in *newer.GlusterfsVolumeSource, out *GlusterfsVolumeSource, s conversion.Scope) error { +func convert_api_GlusterfsVolumeSource_To_v1beta3_GlusterfsVolumeSource(in *api.GlusterfsVolumeSource, out *GlusterfsVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.GlusterfsVolumeSource))(in) + defaulting.(func(*api.GlusterfsVolumeSource))(in) } out.EndpointsName = in.EndpointsName out.Path = in.Path @@ -955,7 +955,7 @@ func convert_api_GlusterfsVolumeSource_To_v1beta3_GlusterfsVolumeSource(in *newe return nil } -func convert_v1beta3_HTTPGetAction_To_api_HTTPGetAction(in *HTTPGetAction, out *newer.HTTPGetAction, s conversion.Scope) error { +func convert_v1beta3_HTTPGetAction_To_api_HTTPGetAction(in *HTTPGetAction, out *api.HTTPGetAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*HTTPGetAction))(in) } @@ -967,9 +967,9 @@ func convert_v1beta3_HTTPGetAction_To_api_HTTPGetAction(in *HTTPGetAction, out * return nil } -func convert_api_HTTPGetAction_To_v1beta3_HTTPGetAction(in *newer.HTTPGetAction, out *HTTPGetAction, s conversion.Scope) error { +func convert_api_HTTPGetAction_To_v1beta3_HTTPGetAction(in *api.HTTPGetAction, out *HTTPGetAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.HTTPGetAction))(in) + defaulting.(func(*api.HTTPGetAction))(in) } out.Path = in.Path if err := s.Convert(&in.Port, &out.Port, 0); err != nil { @@ -979,12 +979,12 @@ func convert_api_HTTPGetAction_To_v1beta3_HTTPGetAction(in *newer.HTTPGetAction, return nil } -func convert_v1beta3_Handler_To_api_Handler(in *Handler, out *newer.Handler, s conversion.Scope) error { +func convert_v1beta3_Handler_To_api_Handler(in *Handler, out *api.Handler, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Handler))(in) } if in.Exec != nil { - out.Exec = new(newer.ExecAction) + out.Exec = new(api.ExecAction) if err := convert_v1beta3_ExecAction_To_api_ExecAction(in.Exec, out.Exec, s); err != nil { return err } @@ -992,7 +992,7 @@ func convert_v1beta3_Handler_To_api_Handler(in *Handler, out *newer.Handler, s c out.Exec = nil } if in.HTTPGet != nil { - out.HTTPGet = new(newer.HTTPGetAction) + out.HTTPGet = new(api.HTTPGetAction) if err := convert_v1beta3_HTTPGetAction_To_api_HTTPGetAction(in.HTTPGet, out.HTTPGet, s); err != nil { return err } @@ -1000,7 +1000,7 @@ func convert_v1beta3_Handler_To_api_Handler(in *Handler, out *newer.Handler, s c out.HTTPGet = nil } if in.TCPSocket != nil { - out.TCPSocket = new(newer.TCPSocketAction) + out.TCPSocket = new(api.TCPSocketAction) if err := convert_v1beta3_TCPSocketAction_To_api_TCPSocketAction(in.TCPSocket, out.TCPSocket, s); err != nil { return err } @@ -1010,9 +1010,9 @@ func convert_v1beta3_Handler_To_api_Handler(in *Handler, out *newer.Handler, s c return nil } -func convert_api_Handler_To_v1beta3_Handler(in *newer.Handler, out *Handler, s conversion.Scope) error { +func convert_api_Handler_To_v1beta3_Handler(in *api.Handler, out *Handler, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Handler))(in) + defaulting.(func(*api.Handler))(in) } if in.Exec != nil { out.Exec = new(ExecAction) @@ -1041,7 +1041,7 @@ func convert_api_Handler_To_v1beta3_Handler(in *newer.Handler, out *Handler, s c return nil } -func convert_v1beta3_HostPathVolumeSource_To_api_HostPathVolumeSource(in *HostPathVolumeSource, out *newer.HostPathVolumeSource, s conversion.Scope) error { +func convert_v1beta3_HostPathVolumeSource_To_api_HostPathVolumeSource(in *HostPathVolumeSource, out *api.HostPathVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*HostPathVolumeSource))(in) } @@ -1049,15 +1049,15 @@ func convert_v1beta3_HostPathVolumeSource_To_api_HostPathVolumeSource(in *HostPa return nil } -func convert_api_HostPathVolumeSource_To_v1beta3_HostPathVolumeSource(in *newer.HostPathVolumeSource, out *HostPathVolumeSource, s conversion.Scope) error { +func convert_api_HostPathVolumeSource_To_v1beta3_HostPathVolumeSource(in *api.HostPathVolumeSource, out *HostPathVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.HostPathVolumeSource))(in) + defaulting.(func(*api.HostPathVolumeSource))(in) } out.Path = in.Path return nil } -func convert_v1beta3_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in *ISCSIVolumeSource, out *newer.ISCSIVolumeSource, s conversion.Scope) error { +func convert_v1beta3_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in *ISCSIVolumeSource, out *api.ISCSIVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ISCSIVolumeSource))(in) } @@ -1069,9 +1069,9 @@ func convert_v1beta3_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in *ISCSIVolumeS return nil } -func convert_api_ISCSIVolumeSource_To_v1beta3_ISCSIVolumeSource(in *newer.ISCSIVolumeSource, out *ISCSIVolumeSource, s conversion.Scope) error { +func convert_api_ISCSIVolumeSource_To_v1beta3_ISCSIVolumeSource(in *api.ISCSIVolumeSource, out *ISCSIVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ISCSIVolumeSource))(in) + defaulting.(func(*api.ISCSIVolumeSource))(in) } out.TargetPortal = in.TargetPortal out.IQN = in.IQN @@ -1081,12 +1081,12 @@ func convert_api_ISCSIVolumeSource_To_v1beta3_ISCSIVolumeSource(in *newer.ISCSIV return nil } -func convert_v1beta3_Lifecycle_To_api_Lifecycle(in *Lifecycle, out *newer.Lifecycle, s conversion.Scope) error { +func convert_v1beta3_Lifecycle_To_api_Lifecycle(in *Lifecycle, out *api.Lifecycle, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Lifecycle))(in) } if in.PostStart != nil { - out.PostStart = new(newer.Handler) + out.PostStart = new(api.Handler) if err := convert_v1beta3_Handler_To_api_Handler(in.PostStart, out.PostStart, s); err != nil { return err } @@ -1094,7 +1094,7 @@ func convert_v1beta3_Lifecycle_To_api_Lifecycle(in *Lifecycle, out *newer.Lifecy out.PostStart = nil } if in.PreStop != nil { - out.PreStop = new(newer.Handler) + out.PreStop = new(api.Handler) if err := convert_v1beta3_Handler_To_api_Handler(in.PreStop, out.PreStop, s); err != nil { return err } @@ -1104,9 +1104,9 @@ func convert_v1beta3_Lifecycle_To_api_Lifecycle(in *Lifecycle, out *newer.Lifecy return nil } -func convert_api_Lifecycle_To_v1beta3_Lifecycle(in *newer.Lifecycle, out *Lifecycle, s conversion.Scope) error { +func convert_api_Lifecycle_To_v1beta3_Lifecycle(in *api.Lifecycle, out *Lifecycle, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Lifecycle))(in) + defaulting.(func(*api.Lifecycle))(in) } if in.PostStart != nil { out.PostStart = new(Handler) @@ -1127,7 +1127,7 @@ func convert_api_Lifecycle_To_v1beta3_Lifecycle(in *newer.Lifecycle, out *Lifecy return nil } -func convert_v1beta3_LimitRange_To_api_LimitRange(in *LimitRange, out *newer.LimitRange, s conversion.Scope) error { +func convert_v1beta3_LimitRange_To_api_LimitRange(in *LimitRange, out *api.LimitRange, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*LimitRange))(in) } @@ -1143,9 +1143,9 @@ func convert_v1beta3_LimitRange_To_api_LimitRange(in *LimitRange, out *newer.Lim return nil } -func convert_api_LimitRange_To_v1beta3_LimitRange(in *newer.LimitRange, out *LimitRange, s conversion.Scope) error { +func convert_api_LimitRange_To_v1beta3_LimitRange(in *api.LimitRange, out *LimitRange, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.LimitRange))(in) + defaulting.(func(*api.LimitRange))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1159,43 +1159,43 @@ func convert_api_LimitRange_To_v1beta3_LimitRange(in *newer.LimitRange, out *Lim return nil } -func convert_v1beta3_LimitRangeItem_To_api_LimitRangeItem(in *LimitRangeItem, out *newer.LimitRangeItem, s conversion.Scope) error { +func convert_v1beta3_LimitRangeItem_To_api_LimitRangeItem(in *LimitRangeItem, out *api.LimitRangeItem, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*LimitRangeItem))(in) } - out.Type = newer.LimitType(in.Type) + out.Type = api.LimitType(in.Type) if in.Max != nil { - out.Max = make(map[newer.ResourceName]resource.Quantity) + out.Max = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Max { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Max[newer.ResourceName(key)] = newVal + out.Max[api.ResourceName(key)] = newVal } } else { out.Max = nil } if in.Min != nil { - out.Min = make(map[newer.ResourceName]resource.Quantity) + out.Min = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Min { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Min[newer.ResourceName(key)] = newVal + out.Min[api.ResourceName(key)] = newVal } } else { out.Min = nil } if in.Default != nil { - out.Default = make(map[newer.ResourceName]resource.Quantity) + out.Default = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Default { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Default[newer.ResourceName(key)] = newVal + out.Default[api.ResourceName(key)] = newVal } } else { out.Default = nil @@ -1203,9 +1203,9 @@ func convert_v1beta3_LimitRangeItem_To_api_LimitRangeItem(in *LimitRangeItem, ou return nil } -func convert_api_LimitRangeItem_To_v1beta3_LimitRangeItem(in *newer.LimitRangeItem, out *LimitRangeItem, s conversion.Scope) error { +func convert_api_LimitRangeItem_To_v1beta3_LimitRangeItem(in *api.LimitRangeItem, out *LimitRangeItem, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.LimitRangeItem))(in) + defaulting.(func(*api.LimitRangeItem))(in) } out.Type = LimitType(in.Type) if in.Max != nil { @@ -1247,7 +1247,7 @@ func convert_api_LimitRangeItem_To_v1beta3_LimitRangeItem(in *newer.LimitRangeIt return nil } -func convert_v1beta3_LimitRangeList_To_api_LimitRangeList(in *LimitRangeList, out *newer.LimitRangeList, s conversion.Scope) error { +func convert_v1beta3_LimitRangeList_To_api_LimitRangeList(in *LimitRangeList, out *api.LimitRangeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*LimitRangeList))(in) } @@ -1258,7 +1258,7 @@ func convert_v1beta3_LimitRangeList_To_api_LimitRangeList(in *LimitRangeList, ou return err } if in.Items != nil { - out.Items = make([]newer.LimitRange, len(in.Items)) + out.Items = make([]api.LimitRange, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_LimitRange_To_api_LimitRange(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -1270,9 +1270,9 @@ func convert_v1beta3_LimitRangeList_To_api_LimitRangeList(in *LimitRangeList, ou return nil } -func convert_api_LimitRangeList_To_v1beta3_LimitRangeList(in *newer.LimitRangeList, out *LimitRangeList, s conversion.Scope) error { +func convert_api_LimitRangeList_To_v1beta3_LimitRangeList(in *api.LimitRangeList, out *LimitRangeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.LimitRangeList))(in) + defaulting.(func(*api.LimitRangeList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1293,12 +1293,12 @@ func convert_api_LimitRangeList_To_v1beta3_LimitRangeList(in *newer.LimitRangeLi return nil } -func convert_v1beta3_LimitRangeSpec_To_api_LimitRangeSpec(in *LimitRangeSpec, out *newer.LimitRangeSpec, s conversion.Scope) error { +func convert_v1beta3_LimitRangeSpec_To_api_LimitRangeSpec(in *LimitRangeSpec, out *api.LimitRangeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*LimitRangeSpec))(in) } if in.Limits != nil { - out.Limits = make([]newer.LimitRangeItem, len(in.Limits)) + out.Limits = make([]api.LimitRangeItem, len(in.Limits)) for i := range in.Limits { if err := convert_v1beta3_LimitRangeItem_To_api_LimitRangeItem(&in.Limits[i], &out.Limits[i], s); err != nil { return err @@ -1310,9 +1310,9 @@ func convert_v1beta3_LimitRangeSpec_To_api_LimitRangeSpec(in *LimitRangeSpec, ou return nil } -func convert_api_LimitRangeSpec_To_v1beta3_LimitRangeSpec(in *newer.LimitRangeSpec, out *LimitRangeSpec, s conversion.Scope) error { +func convert_api_LimitRangeSpec_To_v1beta3_LimitRangeSpec(in *api.LimitRangeSpec, out *LimitRangeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.LimitRangeSpec))(in) + defaulting.(func(*api.LimitRangeSpec))(in) } if in.Limits != nil { out.Limits = make([]LimitRangeItem, len(in.Limits)) @@ -1327,7 +1327,7 @@ func convert_api_LimitRangeSpec_To_v1beta3_LimitRangeSpec(in *newer.LimitRangeSp return nil } -func convert_v1beta3_List_To_api_List(in *List, out *newer.List, s conversion.Scope) error { +func convert_v1beta3_List_To_api_List(in *List, out *api.List, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*List))(in) } @@ -1343,9 +1343,9 @@ func convert_v1beta3_List_To_api_List(in *List, out *newer.List, s conversion.Sc return nil } -func convert_api_List_To_v1beta3_List(in *newer.List, out *List, s conversion.Scope) error { +func convert_api_List_To_v1beta3_List(in *api.List, out *List, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.List))(in) + defaulting.(func(*api.List))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1359,7 +1359,7 @@ func convert_api_List_To_v1beta3_List(in *newer.List, out *List, s conversion.Sc return nil } -func convert_v1beta3_ListMeta_To_api_ListMeta(in *ListMeta, out *newer.ListMeta, s conversion.Scope) error { +func convert_v1beta3_ListMeta_To_api_ListMeta(in *ListMeta, out *api.ListMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ListMeta))(in) } @@ -1368,16 +1368,16 @@ func convert_v1beta3_ListMeta_To_api_ListMeta(in *ListMeta, out *newer.ListMeta, return nil } -func convert_api_ListMeta_To_v1beta3_ListMeta(in *newer.ListMeta, out *ListMeta, s conversion.Scope) error { +func convert_api_ListMeta_To_v1beta3_ListMeta(in *api.ListMeta, out *ListMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ListMeta))(in) + defaulting.(func(*api.ListMeta))(in) } out.SelfLink = in.SelfLink out.ResourceVersion = in.ResourceVersion return nil } -func convert_v1beta3_ListOptions_To_api_ListOptions(in *ListOptions, out *newer.ListOptions, s conversion.Scope) error { +func convert_v1beta3_ListOptions_To_api_ListOptions(in *ListOptions, out *api.ListOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ListOptions))(in) } @@ -1395,9 +1395,9 @@ func convert_v1beta3_ListOptions_To_api_ListOptions(in *ListOptions, out *newer. return nil } -func convert_api_ListOptions_To_v1beta3_ListOptions(in *newer.ListOptions, out *ListOptions, s conversion.Scope) error { +func convert_api_ListOptions_To_v1beta3_ListOptions(in *api.ListOptions, out *ListOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ListOptions))(in) + defaulting.(func(*api.ListOptions))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1413,7 +1413,7 @@ func convert_api_ListOptions_To_v1beta3_ListOptions(in *newer.ListOptions, out * return nil } -func convert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(in *LocalObjectReference, out *newer.LocalObjectReference, s conversion.Scope) error { +func convert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(in *LocalObjectReference, out *api.LocalObjectReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*LocalObjectReference))(in) } @@ -1421,15 +1421,15 @@ func convert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(in *LocalO return nil } -func convert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(in *newer.LocalObjectReference, out *LocalObjectReference, s conversion.Scope) error { +func convert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(in *api.LocalObjectReference, out *LocalObjectReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.LocalObjectReference))(in) + defaulting.(func(*api.LocalObjectReference))(in) } out.Name = in.Name return nil } -func convert_v1beta3_NFSVolumeSource_To_api_NFSVolumeSource(in *NFSVolumeSource, out *newer.NFSVolumeSource, s conversion.Scope) error { +func convert_v1beta3_NFSVolumeSource_To_api_NFSVolumeSource(in *NFSVolumeSource, out *api.NFSVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NFSVolumeSource))(in) } @@ -1439,9 +1439,9 @@ func convert_v1beta3_NFSVolumeSource_To_api_NFSVolumeSource(in *NFSVolumeSource, return nil } -func convert_api_NFSVolumeSource_To_v1beta3_NFSVolumeSource(in *newer.NFSVolumeSource, out *NFSVolumeSource, s conversion.Scope) error { +func convert_api_NFSVolumeSource_To_v1beta3_NFSVolumeSource(in *api.NFSVolumeSource, out *NFSVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NFSVolumeSource))(in) + defaulting.(func(*api.NFSVolumeSource))(in) } out.Server = in.Server out.Path = in.Path @@ -1449,7 +1449,7 @@ func convert_api_NFSVolumeSource_To_v1beta3_NFSVolumeSource(in *newer.NFSVolumeS return nil } -func convert_v1beta3_Namespace_To_api_Namespace(in *Namespace, out *newer.Namespace, s conversion.Scope) error { +func convert_v1beta3_Namespace_To_api_Namespace(in *Namespace, out *api.Namespace, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Namespace))(in) } @@ -1468,9 +1468,9 @@ func convert_v1beta3_Namespace_To_api_Namespace(in *Namespace, out *newer.Namesp return nil } -func convert_api_Namespace_To_v1beta3_Namespace(in *newer.Namespace, out *Namespace, s conversion.Scope) error { +func convert_api_Namespace_To_v1beta3_Namespace(in *api.Namespace, out *Namespace, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Namespace))(in) + defaulting.(func(*api.Namespace))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1487,7 +1487,7 @@ func convert_api_Namespace_To_v1beta3_Namespace(in *newer.Namespace, out *Namesp return nil } -func convert_v1beta3_NamespaceList_To_api_NamespaceList(in *NamespaceList, out *newer.NamespaceList, s conversion.Scope) error { +func convert_v1beta3_NamespaceList_To_api_NamespaceList(in *NamespaceList, out *api.NamespaceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NamespaceList))(in) } @@ -1498,7 +1498,7 @@ func convert_v1beta3_NamespaceList_To_api_NamespaceList(in *NamespaceList, out * return err } if in.Items != nil { - out.Items = make([]newer.Namespace, len(in.Items)) + out.Items = make([]api.Namespace, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_Namespace_To_api_Namespace(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -1510,9 +1510,9 @@ func convert_v1beta3_NamespaceList_To_api_NamespaceList(in *NamespaceList, out * return nil } -func convert_api_NamespaceList_To_v1beta3_NamespaceList(in *newer.NamespaceList, out *NamespaceList, s conversion.Scope) error { +func convert_api_NamespaceList_To_v1beta3_NamespaceList(in *api.NamespaceList, out *NamespaceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NamespaceList))(in) + defaulting.(func(*api.NamespaceList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1533,14 +1533,14 @@ func convert_api_NamespaceList_To_v1beta3_NamespaceList(in *newer.NamespaceList, return nil } -func convert_v1beta3_NamespaceSpec_To_api_NamespaceSpec(in *NamespaceSpec, out *newer.NamespaceSpec, s conversion.Scope) error { +func convert_v1beta3_NamespaceSpec_To_api_NamespaceSpec(in *NamespaceSpec, out *api.NamespaceSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NamespaceSpec))(in) } if in.Finalizers != nil { - out.Finalizers = make([]newer.FinalizerName, len(in.Finalizers)) + out.Finalizers = make([]api.FinalizerName, len(in.Finalizers)) for i := range in.Finalizers { - out.Finalizers[i] = newer.FinalizerName(in.Finalizers[i]) + out.Finalizers[i] = api.FinalizerName(in.Finalizers[i]) } } else { out.Finalizers = nil @@ -1548,9 +1548,9 @@ func convert_v1beta3_NamespaceSpec_To_api_NamespaceSpec(in *NamespaceSpec, out * return nil } -func convert_api_NamespaceSpec_To_v1beta3_NamespaceSpec(in *newer.NamespaceSpec, out *NamespaceSpec, s conversion.Scope) error { +func convert_api_NamespaceSpec_To_v1beta3_NamespaceSpec(in *api.NamespaceSpec, out *NamespaceSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NamespaceSpec))(in) + defaulting.(func(*api.NamespaceSpec))(in) } if in.Finalizers != nil { out.Finalizers = make([]FinalizerName, len(in.Finalizers)) @@ -1563,23 +1563,23 @@ func convert_api_NamespaceSpec_To_v1beta3_NamespaceSpec(in *newer.NamespaceSpec, return nil } -func convert_v1beta3_NamespaceStatus_To_api_NamespaceStatus(in *NamespaceStatus, out *newer.NamespaceStatus, s conversion.Scope) error { +func convert_v1beta3_NamespaceStatus_To_api_NamespaceStatus(in *NamespaceStatus, out *api.NamespaceStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NamespaceStatus))(in) } - out.Phase = newer.NamespacePhase(in.Phase) + out.Phase = api.NamespacePhase(in.Phase) return nil } -func convert_api_NamespaceStatus_To_v1beta3_NamespaceStatus(in *newer.NamespaceStatus, out *NamespaceStatus, s conversion.Scope) error { +func convert_api_NamespaceStatus_To_v1beta3_NamespaceStatus(in *api.NamespaceStatus, out *NamespaceStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NamespaceStatus))(in) + defaulting.(func(*api.NamespaceStatus))(in) } out.Phase = NamespacePhase(in.Phase) return nil } -func convert_v1beta3_Node_To_api_Node(in *Node, out *newer.Node, s conversion.Scope) error { +func convert_v1beta3_Node_To_api_Node(in *Node, out *api.Node, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Node))(in) } @@ -1598,9 +1598,9 @@ func convert_v1beta3_Node_To_api_Node(in *Node, out *newer.Node, s conversion.Sc return nil } -func convert_api_Node_To_v1beta3_Node(in *newer.Node, out *Node, s conversion.Scope) error { +func convert_api_Node_To_v1beta3_Node(in *api.Node, out *Node, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Node))(in) + defaulting.(func(*api.Node))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1617,30 +1617,30 @@ func convert_api_Node_To_v1beta3_Node(in *newer.Node, out *Node, s conversion.Sc return nil } -func convert_v1beta3_NodeAddress_To_api_NodeAddress(in *NodeAddress, out *newer.NodeAddress, s conversion.Scope) error { +func convert_v1beta3_NodeAddress_To_api_NodeAddress(in *NodeAddress, out *api.NodeAddress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeAddress))(in) } - out.Type = newer.NodeAddressType(in.Type) + out.Type = api.NodeAddressType(in.Type) out.Address = in.Address return nil } -func convert_api_NodeAddress_To_v1beta3_NodeAddress(in *newer.NodeAddress, out *NodeAddress, s conversion.Scope) error { +func convert_api_NodeAddress_To_v1beta3_NodeAddress(in *api.NodeAddress, out *NodeAddress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeAddress))(in) + defaulting.(func(*api.NodeAddress))(in) } out.Type = NodeAddressType(in.Type) out.Address = in.Address return nil } -func convert_v1beta3_NodeCondition_To_api_NodeCondition(in *NodeCondition, out *newer.NodeCondition, s conversion.Scope) error { +func convert_v1beta3_NodeCondition_To_api_NodeCondition(in *NodeCondition, out *api.NodeCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeCondition))(in) } - out.Type = newer.NodeConditionType(in.Type) - out.Status = newer.ConditionStatus(in.Status) + out.Type = api.NodeConditionType(in.Type) + out.Status = api.ConditionStatus(in.Status) if err := s.Convert(&in.LastHeartbeatTime, &out.LastHeartbeatTime, 0); err != nil { return err } @@ -1652,9 +1652,9 @@ func convert_v1beta3_NodeCondition_To_api_NodeCondition(in *NodeCondition, out * return nil } -func convert_api_NodeCondition_To_v1beta3_NodeCondition(in *newer.NodeCondition, out *NodeCondition, s conversion.Scope) error { +func convert_api_NodeCondition_To_v1beta3_NodeCondition(in *api.NodeCondition, out *NodeCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeCondition))(in) + defaulting.(func(*api.NodeCondition))(in) } out.Type = NodeConditionType(in.Type) out.Status = ConditionStatus(in.Status) @@ -1669,7 +1669,7 @@ func convert_api_NodeCondition_To_v1beta3_NodeCondition(in *newer.NodeCondition, return nil } -func convert_v1beta3_NodeList_To_api_NodeList(in *NodeList, out *newer.NodeList, s conversion.Scope) error { +func convert_v1beta3_NodeList_To_api_NodeList(in *NodeList, out *api.NodeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeList))(in) } @@ -1680,7 +1680,7 @@ func convert_v1beta3_NodeList_To_api_NodeList(in *NodeList, out *newer.NodeList, return err } if in.Items != nil { - out.Items = make([]newer.Node, len(in.Items)) + out.Items = make([]api.Node, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_Node_To_api_Node(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -1692,9 +1692,9 @@ func convert_v1beta3_NodeList_To_api_NodeList(in *NodeList, out *newer.NodeList, return nil } -func convert_api_NodeList_To_v1beta3_NodeList(in *newer.NodeList, out *NodeList, s conversion.Scope) error { +func convert_api_NodeList_To_v1beta3_NodeList(in *api.NodeList, out *NodeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeList))(in) + defaulting.(func(*api.NodeList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -1715,7 +1715,7 @@ func convert_api_NodeList_To_v1beta3_NodeList(in *newer.NodeList, out *NodeList, return nil } -func convert_v1beta3_NodeSpec_To_api_NodeSpec(in *NodeSpec, out *newer.NodeSpec, s conversion.Scope) error { +func convert_v1beta3_NodeSpec_To_api_NodeSpec(in *NodeSpec, out *api.NodeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeSpec))(in) } @@ -1725,9 +1725,9 @@ func convert_v1beta3_NodeSpec_To_api_NodeSpec(in *NodeSpec, out *newer.NodeSpec, return nil } -func convert_api_NodeSpec_To_v1beta3_NodeSpec(in *newer.NodeSpec, out *NodeSpec, s conversion.Scope) error { +func convert_api_NodeSpec_To_v1beta3_NodeSpec(in *api.NodeSpec, out *NodeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeSpec))(in) + defaulting.(func(*api.NodeSpec))(in) } out.PodCIDR = in.PodCIDR out.ExternalID = in.ExternalID @@ -1735,25 +1735,25 @@ func convert_api_NodeSpec_To_v1beta3_NodeSpec(in *newer.NodeSpec, out *NodeSpec, return nil } -func convert_v1beta3_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *newer.NodeStatus, s conversion.Scope) error { +func convert_v1beta3_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *api.NodeStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeStatus))(in) } if in.Capacity != nil { - out.Capacity = make(map[newer.ResourceName]resource.Quantity) + out.Capacity = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Capacity[newer.ResourceName(key)] = newVal + out.Capacity[api.ResourceName(key)] = newVal } } else { out.Capacity = nil } - out.Phase = newer.NodePhase(in.Phase) + out.Phase = api.NodePhase(in.Phase) if in.Conditions != nil { - out.Conditions = make([]newer.NodeCondition, len(in.Conditions)) + out.Conditions = make([]api.NodeCondition, len(in.Conditions)) for i := range in.Conditions { if err := convert_v1beta3_NodeCondition_To_api_NodeCondition(&in.Conditions[i], &out.Conditions[i], s); err != nil { return err @@ -1763,7 +1763,7 @@ func convert_v1beta3_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *newer.Nod out.Conditions = nil } if in.Addresses != nil { - out.Addresses = make([]newer.NodeAddress, len(in.Addresses)) + out.Addresses = make([]api.NodeAddress, len(in.Addresses)) for i := range in.Addresses { if err := convert_v1beta3_NodeAddress_To_api_NodeAddress(&in.Addresses[i], &out.Addresses[i], s); err != nil { return err @@ -1778,9 +1778,9 @@ func convert_v1beta3_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *newer.Nod return nil } -func convert_api_NodeStatus_To_v1beta3_NodeStatus(in *newer.NodeStatus, out *NodeStatus, s conversion.Scope) error { +func convert_api_NodeStatus_To_v1beta3_NodeStatus(in *api.NodeStatus, out *NodeStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeStatus))(in) + defaulting.(func(*api.NodeStatus))(in) } if in.Capacity != nil { out.Capacity = make(map[ResourceName]resource.Quantity) @@ -1821,7 +1821,7 @@ func convert_api_NodeStatus_To_v1beta3_NodeStatus(in *newer.NodeStatus, out *Nod return nil } -func convert_v1beta3_NodeSystemInfo_To_api_NodeSystemInfo(in *NodeSystemInfo, out *newer.NodeSystemInfo, s conversion.Scope) error { +func convert_v1beta3_NodeSystemInfo_To_api_NodeSystemInfo(in *NodeSystemInfo, out *api.NodeSystemInfo, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeSystemInfo))(in) } @@ -1836,9 +1836,9 @@ func convert_v1beta3_NodeSystemInfo_To_api_NodeSystemInfo(in *NodeSystemInfo, ou return nil } -func convert_api_NodeSystemInfo_To_v1beta3_NodeSystemInfo(in *newer.NodeSystemInfo, out *NodeSystemInfo, s conversion.Scope) error { +func convert_api_NodeSystemInfo_To_v1beta3_NodeSystemInfo(in *api.NodeSystemInfo, out *NodeSystemInfo, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.NodeSystemInfo))(in) + defaulting.(func(*api.NodeSystemInfo))(in) } out.MachineID = in.MachineID out.SystemUUID = in.SystemUUID @@ -1851,7 +1851,7 @@ func convert_api_NodeSystemInfo_To_v1beta3_NodeSystemInfo(in *newer.NodeSystemIn return nil } -func convert_v1beta3_ObjectFieldSelector_To_api_ObjectFieldSelector(in *ObjectFieldSelector, out *newer.ObjectFieldSelector, s conversion.Scope) error { +func convert_v1beta3_ObjectFieldSelector_To_api_ObjectFieldSelector(in *ObjectFieldSelector, out *api.ObjectFieldSelector, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ObjectFieldSelector))(in) } @@ -1860,16 +1860,16 @@ func convert_v1beta3_ObjectFieldSelector_To_api_ObjectFieldSelector(in *ObjectFi return nil } -func convert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(in *newer.ObjectFieldSelector, out *ObjectFieldSelector, s conversion.Scope) error { +func convert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(in *api.ObjectFieldSelector, out *ObjectFieldSelector, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ObjectFieldSelector))(in) + defaulting.(func(*api.ObjectFieldSelector))(in) } out.APIVersion = in.APIVersion out.FieldPath = in.FieldPath return nil } -func convert_v1beta3_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *newer.ObjectMeta, s conversion.Scope) error { +func convert_v1beta3_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *api.ObjectMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ObjectMeta))(in) } @@ -1908,9 +1908,9 @@ func convert_v1beta3_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *newer.Obj return nil } -func convert_api_ObjectMeta_To_v1beta3_ObjectMeta(in *newer.ObjectMeta, out *ObjectMeta, s conversion.Scope) error { +func convert_api_ObjectMeta_To_v1beta3_ObjectMeta(in *api.ObjectMeta, out *ObjectMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ObjectMeta))(in) + defaulting.(func(*api.ObjectMeta))(in) } out.Name = in.Name out.GenerateName = in.GenerateName @@ -1947,7 +1947,7 @@ func convert_api_ObjectMeta_To_v1beta3_ObjectMeta(in *newer.ObjectMeta, out *Obj return nil } -func convert_v1beta3_ObjectReference_To_api_ObjectReference(in *ObjectReference, out *newer.ObjectReference, s conversion.Scope) error { +func convert_v1beta3_ObjectReference_To_api_ObjectReference(in *ObjectReference, out *api.ObjectReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ObjectReference))(in) } @@ -1961,9 +1961,9 @@ func convert_v1beta3_ObjectReference_To_api_ObjectReference(in *ObjectReference, return nil } -func convert_api_ObjectReference_To_v1beta3_ObjectReference(in *newer.ObjectReference, out *ObjectReference, s conversion.Scope) error { +func convert_api_ObjectReference_To_v1beta3_ObjectReference(in *api.ObjectReference, out *ObjectReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ObjectReference))(in) + defaulting.(func(*api.ObjectReference))(in) } out.Kind = in.Kind out.Namespace = in.Namespace @@ -1975,7 +1975,7 @@ func convert_api_ObjectReference_To_v1beta3_ObjectReference(in *newer.ObjectRefe return nil } -func convert_v1beta3_PersistentVolume_To_api_PersistentVolume(in *PersistentVolume, out *newer.PersistentVolume, s conversion.Scope) error { +func convert_v1beta3_PersistentVolume_To_api_PersistentVolume(in *PersistentVolume, out *api.PersistentVolume, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolume))(in) } @@ -1994,9 +1994,9 @@ func convert_v1beta3_PersistentVolume_To_api_PersistentVolume(in *PersistentVolu return nil } -func convert_api_PersistentVolume_To_v1beta3_PersistentVolume(in *newer.PersistentVolume, out *PersistentVolume, s conversion.Scope) error { +func convert_api_PersistentVolume_To_v1beta3_PersistentVolume(in *api.PersistentVolume, out *PersistentVolume, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolume))(in) + defaulting.(func(*api.PersistentVolume))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2013,7 +2013,7 @@ func convert_api_PersistentVolume_To_v1beta3_PersistentVolume(in *newer.Persiste return nil } -func convert_v1beta3_PersistentVolumeClaim_To_api_PersistentVolumeClaim(in *PersistentVolumeClaim, out *newer.PersistentVolumeClaim, s conversion.Scope) error { +func convert_v1beta3_PersistentVolumeClaim_To_api_PersistentVolumeClaim(in *PersistentVolumeClaim, out *api.PersistentVolumeClaim, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeClaim))(in) } @@ -2032,9 +2032,9 @@ func convert_v1beta3_PersistentVolumeClaim_To_api_PersistentVolumeClaim(in *Pers return nil } -func convert_api_PersistentVolumeClaim_To_v1beta3_PersistentVolumeClaim(in *newer.PersistentVolumeClaim, out *PersistentVolumeClaim, s conversion.Scope) error { +func convert_api_PersistentVolumeClaim_To_v1beta3_PersistentVolumeClaim(in *api.PersistentVolumeClaim, out *PersistentVolumeClaim, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeClaim))(in) + defaulting.(func(*api.PersistentVolumeClaim))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2051,7 +2051,7 @@ func convert_api_PersistentVolumeClaim_To_v1beta3_PersistentVolumeClaim(in *newe return nil } -func convert_v1beta3_PersistentVolumeClaimList_To_api_PersistentVolumeClaimList(in *PersistentVolumeClaimList, out *newer.PersistentVolumeClaimList, s conversion.Scope) error { +func convert_v1beta3_PersistentVolumeClaimList_To_api_PersistentVolumeClaimList(in *PersistentVolumeClaimList, out *api.PersistentVolumeClaimList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeClaimList))(in) } @@ -2062,7 +2062,7 @@ func convert_v1beta3_PersistentVolumeClaimList_To_api_PersistentVolumeClaimList( return err } if in.Items != nil { - out.Items = make([]newer.PersistentVolumeClaim, len(in.Items)) + out.Items = make([]api.PersistentVolumeClaim, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_PersistentVolumeClaim_To_api_PersistentVolumeClaim(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -2074,9 +2074,9 @@ func convert_v1beta3_PersistentVolumeClaimList_To_api_PersistentVolumeClaimList( return nil } -func convert_api_PersistentVolumeClaimList_To_v1beta3_PersistentVolumeClaimList(in *newer.PersistentVolumeClaimList, out *PersistentVolumeClaimList, s conversion.Scope) error { +func convert_api_PersistentVolumeClaimList_To_v1beta3_PersistentVolumeClaimList(in *api.PersistentVolumeClaimList, out *PersistentVolumeClaimList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeClaimList))(in) + defaulting.(func(*api.PersistentVolumeClaimList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2097,14 +2097,14 @@ func convert_api_PersistentVolumeClaimList_To_v1beta3_PersistentVolumeClaimList( return nil } -func convert_v1beta3_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *PersistentVolumeClaimSpec, out *newer.PersistentVolumeClaimSpec, s conversion.Scope) error { +func convert_v1beta3_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *PersistentVolumeClaimSpec, out *api.PersistentVolumeClaimSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeClaimSpec))(in) } if in.AccessModes != nil { - out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) + out.AccessModes = make([]api.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) + out.AccessModes[i] = api.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2116,9 +2116,9 @@ func convert_v1beta3_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec( return nil } -func convert_api_PersistentVolumeClaimSpec_To_v1beta3_PersistentVolumeClaimSpec(in *newer.PersistentVolumeClaimSpec, out *PersistentVolumeClaimSpec, s conversion.Scope) error { +func convert_api_PersistentVolumeClaimSpec_To_v1beta3_PersistentVolumeClaimSpec(in *api.PersistentVolumeClaimSpec, out *PersistentVolumeClaimSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeClaimSpec))(in) + defaulting.(func(*api.PersistentVolumeClaimSpec))(in) } if in.AccessModes != nil { out.AccessModes = make([]PersistentVolumeAccessMode, len(in.AccessModes)) @@ -2135,27 +2135,27 @@ func convert_api_PersistentVolumeClaimSpec_To_v1beta3_PersistentVolumeClaimSpec( return nil } -func convert_v1beta3_PersistentVolumeClaimStatus_To_api_PersistentVolumeClaimStatus(in *PersistentVolumeClaimStatus, out *newer.PersistentVolumeClaimStatus, s conversion.Scope) error { +func convert_v1beta3_PersistentVolumeClaimStatus_To_api_PersistentVolumeClaimStatus(in *PersistentVolumeClaimStatus, out *api.PersistentVolumeClaimStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeClaimStatus))(in) } - out.Phase = newer.PersistentVolumeClaimPhase(in.Phase) + out.Phase = api.PersistentVolumeClaimPhase(in.Phase) if in.AccessModes != nil { - out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) + out.AccessModes = make([]api.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) + out.AccessModes[i] = api.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil } if in.Capacity != nil { - out.Capacity = make(map[newer.ResourceName]resource.Quantity) + out.Capacity = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Capacity[newer.ResourceName(key)] = newVal + out.Capacity[api.ResourceName(key)] = newVal } } else { out.Capacity = nil @@ -2163,9 +2163,9 @@ func convert_v1beta3_PersistentVolumeClaimStatus_To_api_PersistentVolumeClaimSta return nil } -func convert_api_PersistentVolumeClaimStatus_To_v1beta3_PersistentVolumeClaimStatus(in *newer.PersistentVolumeClaimStatus, out *PersistentVolumeClaimStatus, s conversion.Scope) error { +func convert_api_PersistentVolumeClaimStatus_To_v1beta3_PersistentVolumeClaimStatus(in *api.PersistentVolumeClaimStatus, out *PersistentVolumeClaimStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeClaimStatus))(in) + defaulting.(func(*api.PersistentVolumeClaimStatus))(in) } out.Phase = PersistentVolumeClaimPhase(in.Phase) if in.AccessModes != nil { @@ -2191,7 +2191,7 @@ func convert_api_PersistentVolumeClaimStatus_To_v1beta3_PersistentVolumeClaimSta return nil } -func convert_v1beta3_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in *PersistentVolumeClaimVolumeSource, out *newer.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { +func convert_v1beta3_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in *PersistentVolumeClaimVolumeSource, out *api.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeClaimVolumeSource))(in) } @@ -2200,16 +2200,16 @@ func convert_v1beta3_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeCl return nil } -func convert_api_PersistentVolumeClaimVolumeSource_To_v1beta3_PersistentVolumeClaimVolumeSource(in *newer.PersistentVolumeClaimVolumeSource, out *PersistentVolumeClaimVolumeSource, s conversion.Scope) error { +func convert_api_PersistentVolumeClaimVolumeSource_To_v1beta3_PersistentVolumeClaimVolumeSource(in *api.PersistentVolumeClaimVolumeSource, out *PersistentVolumeClaimVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeClaimVolumeSource))(in) + defaulting.(func(*api.PersistentVolumeClaimVolumeSource))(in) } out.ClaimName = in.ClaimName out.ReadOnly = in.ReadOnly return nil } -func convert_v1beta3_PersistentVolumeList_To_api_PersistentVolumeList(in *PersistentVolumeList, out *newer.PersistentVolumeList, s conversion.Scope) error { +func convert_v1beta3_PersistentVolumeList_To_api_PersistentVolumeList(in *PersistentVolumeList, out *api.PersistentVolumeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeList))(in) } @@ -2220,7 +2220,7 @@ func convert_v1beta3_PersistentVolumeList_To_api_PersistentVolumeList(in *Persis return err } if in.Items != nil { - out.Items = make([]newer.PersistentVolume, len(in.Items)) + out.Items = make([]api.PersistentVolume, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_PersistentVolume_To_api_PersistentVolume(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -2232,9 +2232,9 @@ func convert_v1beta3_PersistentVolumeList_To_api_PersistentVolumeList(in *Persis return nil } -func convert_api_PersistentVolumeList_To_v1beta3_PersistentVolumeList(in *newer.PersistentVolumeList, out *PersistentVolumeList, s conversion.Scope) error { +func convert_api_PersistentVolumeList_To_v1beta3_PersistentVolumeList(in *api.PersistentVolumeList, out *PersistentVolumeList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeList))(in) + defaulting.(func(*api.PersistentVolumeList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2255,12 +2255,12 @@ func convert_api_PersistentVolumeList_To_v1beta3_PersistentVolumeList(in *newer. return nil } -func convert_v1beta3_PersistentVolumeSource_To_api_PersistentVolumeSource(in *PersistentVolumeSource, out *newer.PersistentVolumeSource, s conversion.Scope) error { +func convert_v1beta3_PersistentVolumeSource_To_api_PersistentVolumeSource(in *PersistentVolumeSource, out *api.PersistentVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeSource))(in) } if in.GCEPersistentDisk != nil { - out.GCEPersistentDisk = new(newer.GCEPersistentDiskVolumeSource) + out.GCEPersistentDisk = new(api.GCEPersistentDiskVolumeSource) if err := convert_v1beta3_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in.GCEPersistentDisk, out.GCEPersistentDisk, s); err != nil { return err } @@ -2268,7 +2268,7 @@ func convert_v1beta3_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Pe out.GCEPersistentDisk = nil } if in.AWSElasticBlockStore != nil { - out.AWSElasticBlockStore = new(newer.AWSElasticBlockStoreVolumeSource) + out.AWSElasticBlockStore = new(api.AWSElasticBlockStoreVolumeSource) if err := convert_v1beta3_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in.AWSElasticBlockStore, out.AWSElasticBlockStore, s); err != nil { return err } @@ -2276,7 +2276,7 @@ func convert_v1beta3_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Pe out.AWSElasticBlockStore = nil } if in.HostPath != nil { - out.HostPath = new(newer.HostPathVolumeSource) + out.HostPath = new(api.HostPathVolumeSource) if err := convert_v1beta3_HostPathVolumeSource_To_api_HostPathVolumeSource(in.HostPath, out.HostPath, s); err != nil { return err } @@ -2284,7 +2284,7 @@ func convert_v1beta3_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Pe out.HostPath = nil } if in.Glusterfs != nil { - out.Glusterfs = new(newer.GlusterfsVolumeSource) + out.Glusterfs = new(api.GlusterfsVolumeSource) if err := convert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in.Glusterfs, out.Glusterfs, s); err != nil { return err } @@ -2292,7 +2292,7 @@ func convert_v1beta3_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Pe out.Glusterfs = nil } if in.NFS != nil { - out.NFS = new(newer.NFSVolumeSource) + out.NFS = new(api.NFSVolumeSource) if err := convert_v1beta3_NFSVolumeSource_To_api_NFSVolumeSource(in.NFS, out.NFS, s); err != nil { return err } @@ -2302,9 +2302,9 @@ func convert_v1beta3_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Pe return nil } -func convert_api_PersistentVolumeSource_To_v1beta3_PersistentVolumeSource(in *newer.PersistentVolumeSource, out *PersistentVolumeSource, s conversion.Scope) error { +func convert_api_PersistentVolumeSource_To_v1beta3_PersistentVolumeSource(in *api.PersistentVolumeSource, out *PersistentVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeSource))(in) + defaulting.(func(*api.PersistentVolumeSource))(in) } if in.GCEPersistentDisk != nil { out.GCEPersistentDisk = new(GCEPersistentDiskVolumeSource) @@ -2349,18 +2349,18 @@ func convert_api_PersistentVolumeSource_To_v1beta3_PersistentVolumeSource(in *ne return nil } -func convert_v1beta3_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *PersistentVolumeSpec, out *newer.PersistentVolumeSpec, s conversion.Scope) error { +func convert_v1beta3_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *PersistentVolumeSpec, out *api.PersistentVolumeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeSpec))(in) } if in.Capacity != nil { - out.Capacity = make(map[newer.ResourceName]resource.Quantity) + out.Capacity = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Capacity[newer.ResourceName(key)] = newVal + out.Capacity[api.ResourceName(key)] = newVal } } else { out.Capacity = nil @@ -2369,15 +2369,15 @@ func convert_v1beta3_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *Persis return err } if in.AccessModes != nil { - out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) + out.AccessModes = make([]api.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) + out.AccessModes[i] = api.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil } if in.ClaimRef != nil { - out.ClaimRef = new(newer.ObjectReference) + out.ClaimRef = new(api.ObjectReference) if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(in.ClaimRef, out.ClaimRef, s); err != nil { return err } @@ -2387,9 +2387,9 @@ func convert_v1beta3_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *Persis return nil } -func convert_api_PersistentVolumeSpec_To_v1beta3_PersistentVolumeSpec(in *newer.PersistentVolumeSpec, out *PersistentVolumeSpec, s conversion.Scope) error { +func convert_api_PersistentVolumeSpec_To_v1beta3_PersistentVolumeSpec(in *api.PersistentVolumeSpec, out *PersistentVolumeSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeSpec))(in) + defaulting.(func(*api.PersistentVolumeSpec))(in) } if in.Capacity != nil { out.Capacity = make(map[ResourceName]resource.Quantity) @@ -2425,23 +2425,23 @@ func convert_api_PersistentVolumeSpec_To_v1beta3_PersistentVolumeSpec(in *newer. return nil } -func convert_v1beta3_PersistentVolumeStatus_To_api_PersistentVolumeStatus(in *PersistentVolumeStatus, out *newer.PersistentVolumeStatus, s conversion.Scope) error { +func convert_v1beta3_PersistentVolumeStatus_To_api_PersistentVolumeStatus(in *PersistentVolumeStatus, out *api.PersistentVolumeStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PersistentVolumeStatus))(in) } - out.Phase = newer.PersistentVolumePhase(in.Phase) + out.Phase = api.PersistentVolumePhase(in.Phase) return nil } -func convert_api_PersistentVolumeStatus_To_v1beta3_PersistentVolumeStatus(in *newer.PersistentVolumeStatus, out *PersistentVolumeStatus, s conversion.Scope) error { +func convert_api_PersistentVolumeStatus_To_v1beta3_PersistentVolumeStatus(in *api.PersistentVolumeStatus, out *PersistentVolumeStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PersistentVolumeStatus))(in) + defaulting.(func(*api.PersistentVolumeStatus))(in) } out.Phase = PersistentVolumePhase(in.Phase) return nil } -func convert_v1beta3_Pod_To_api_Pod(in *Pod, out *newer.Pod, s conversion.Scope) error { +func convert_v1beta3_Pod_To_api_Pod(in *Pod, out *api.Pod, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Pod))(in) } @@ -2460,9 +2460,9 @@ func convert_v1beta3_Pod_To_api_Pod(in *Pod, out *newer.Pod, s conversion.Scope) return nil } -func convert_api_Pod_To_v1beta3_Pod(in *newer.Pod, out *Pod, s conversion.Scope) error { +func convert_api_Pod_To_v1beta3_Pod(in *api.Pod, out *Pod, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Pod))(in) + defaulting.(func(*api.Pod))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2479,25 +2479,25 @@ func convert_api_Pod_To_v1beta3_Pod(in *newer.Pod, out *Pod, s conversion.Scope) return nil } -func convert_v1beta3_PodCondition_To_api_PodCondition(in *PodCondition, out *newer.PodCondition, s conversion.Scope) error { +func convert_v1beta3_PodCondition_To_api_PodCondition(in *PodCondition, out *api.PodCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodCondition))(in) } - out.Type = newer.PodConditionType(in.Type) - out.Status = newer.ConditionStatus(in.Status) + out.Type = api.PodConditionType(in.Type) + out.Status = api.ConditionStatus(in.Status) return nil } -func convert_api_PodCondition_To_v1beta3_PodCondition(in *newer.PodCondition, out *PodCondition, s conversion.Scope) error { +func convert_api_PodCondition_To_v1beta3_PodCondition(in *api.PodCondition, out *PodCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodCondition))(in) + defaulting.(func(*api.PodCondition))(in) } out.Type = PodConditionType(in.Type) out.Status = ConditionStatus(in.Status) return nil } -func convert_v1beta3_PodExecOptions_To_api_PodExecOptions(in *PodExecOptions, out *newer.PodExecOptions, s conversion.Scope) error { +func convert_v1beta3_PodExecOptions_To_api_PodExecOptions(in *PodExecOptions, out *api.PodExecOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodExecOptions))(in) } @@ -2520,9 +2520,9 @@ func convert_v1beta3_PodExecOptions_To_api_PodExecOptions(in *PodExecOptions, ou return nil } -func convert_api_PodExecOptions_To_v1beta3_PodExecOptions(in *newer.PodExecOptions, out *PodExecOptions, s conversion.Scope) error { +func convert_api_PodExecOptions_To_v1beta3_PodExecOptions(in *api.PodExecOptions, out *PodExecOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodExecOptions))(in) + defaulting.(func(*api.PodExecOptions))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2543,7 +2543,7 @@ func convert_api_PodExecOptions_To_v1beta3_PodExecOptions(in *newer.PodExecOptio return nil } -func convert_v1beta3_PodList_To_api_PodList(in *PodList, out *newer.PodList, s conversion.Scope) error { +func convert_v1beta3_PodList_To_api_PodList(in *PodList, out *api.PodList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodList))(in) } @@ -2554,7 +2554,7 @@ func convert_v1beta3_PodList_To_api_PodList(in *PodList, out *newer.PodList, s c return err } if in.Items != nil { - out.Items = make([]newer.Pod, len(in.Items)) + out.Items = make([]api.Pod, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_Pod_To_api_Pod(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -2566,9 +2566,9 @@ func convert_v1beta3_PodList_To_api_PodList(in *PodList, out *newer.PodList, s c return nil } -func convert_api_PodList_To_v1beta3_PodList(in *newer.PodList, out *PodList, s conversion.Scope) error { +func convert_api_PodList_To_v1beta3_PodList(in *api.PodList, out *PodList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodList))(in) + defaulting.(func(*api.PodList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2589,7 +2589,7 @@ func convert_api_PodList_To_v1beta3_PodList(in *newer.PodList, out *PodList, s c return nil } -func convert_v1beta3_PodLogOptions_To_api_PodLogOptions(in *PodLogOptions, out *newer.PodLogOptions, s conversion.Scope) error { +func convert_v1beta3_PodLogOptions_To_api_PodLogOptions(in *PodLogOptions, out *api.PodLogOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodLogOptions))(in) } @@ -2602,9 +2602,9 @@ func convert_v1beta3_PodLogOptions_To_api_PodLogOptions(in *PodLogOptions, out * return nil } -func convert_api_PodLogOptions_To_v1beta3_PodLogOptions(in *newer.PodLogOptions, out *PodLogOptions, s conversion.Scope) error { +func convert_api_PodLogOptions_To_v1beta3_PodLogOptions(in *api.PodLogOptions, out *PodLogOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodLogOptions))(in) + defaulting.(func(*api.PodLogOptions))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2615,7 +2615,7 @@ func convert_api_PodLogOptions_To_v1beta3_PodLogOptions(in *newer.PodLogOptions, return nil } -func convert_v1beta3_PodProxyOptions_To_api_PodProxyOptions(in *PodProxyOptions, out *newer.PodProxyOptions, s conversion.Scope) error { +func convert_v1beta3_PodProxyOptions_To_api_PodProxyOptions(in *PodProxyOptions, out *api.PodProxyOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodProxyOptions))(in) } @@ -2626,9 +2626,9 @@ func convert_v1beta3_PodProxyOptions_To_api_PodProxyOptions(in *PodProxyOptions, return nil } -func convert_api_PodProxyOptions_To_v1beta3_PodProxyOptions(in *newer.PodProxyOptions, out *PodProxyOptions, s conversion.Scope) error { +func convert_api_PodProxyOptions_To_v1beta3_PodProxyOptions(in *api.PodProxyOptions, out *PodProxyOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodProxyOptions))(in) + defaulting.(func(*api.PodProxyOptions))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2637,12 +2637,12 @@ func convert_api_PodProxyOptions_To_v1beta3_PodProxyOptions(in *newer.PodProxyOp return nil } -func convert_v1beta3_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s conversion.Scope) error { +func convert_v1beta3_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodSpec))(in) } if in.Volumes != nil { - out.Volumes = make([]newer.Volume, len(in.Volumes)) + out.Volumes = make([]api.Volume, len(in.Volumes)) for i := range in.Volumes { if err := convert_v1beta3_Volume_To_api_Volume(&in.Volumes[i], &out.Volumes[i], s); err != nil { return err @@ -2652,7 +2652,7 @@ func convert_v1beta3_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s c out.Volumes = nil } if in.Containers != nil { - out.Containers = make([]newer.Container, len(in.Containers)) + out.Containers = make([]api.Container, len(in.Containers)) for i := range in.Containers { if err := convert_v1beta3_Container_To_api_Container(&in.Containers[i], &out.Containers[i], s); err != nil { return err @@ -2661,7 +2661,7 @@ func convert_v1beta3_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s c } else { out.Containers = nil } - out.RestartPolicy = newer.RestartPolicy(in.RestartPolicy) + out.RestartPolicy = api.RestartPolicy(in.RestartPolicy) if in.TerminationGracePeriodSeconds != nil { out.TerminationGracePeriodSeconds = new(int64) *out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds @@ -2674,7 +2674,7 @@ func convert_v1beta3_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s c } else { out.ActiveDeadlineSeconds = nil } - out.DNSPolicy = newer.DNSPolicy(in.DNSPolicy) + out.DNSPolicy = api.DNSPolicy(in.DNSPolicy) if in.NodeSelector != nil { out.NodeSelector = make(map[string]string) for key, val := range in.NodeSelector { @@ -2687,7 +2687,7 @@ func convert_v1beta3_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s c out.Host = in.Host out.HostNetwork = in.HostNetwork if in.ImagePullSecrets != nil { - out.ImagePullSecrets = make([]newer.LocalObjectReference, len(in.ImagePullSecrets)) + out.ImagePullSecrets = make([]api.LocalObjectReference, len(in.ImagePullSecrets)) for i := range in.ImagePullSecrets { if err := convert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(&in.ImagePullSecrets[i], &out.ImagePullSecrets[i], s); err != nil { return err @@ -2699,9 +2699,9 @@ func convert_v1beta3_PodSpec_To_api_PodSpec(in *PodSpec, out *newer.PodSpec, s c return nil } -func convert_api_PodSpec_To_v1beta3_PodSpec(in *newer.PodSpec, out *PodSpec, s conversion.Scope) error { +func convert_api_PodSpec_To_v1beta3_PodSpec(in *api.PodSpec, out *PodSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodSpec))(in) + defaulting.(func(*api.PodSpec))(in) } if in.Volumes != nil { out.Volumes = make([]Volume, len(in.Volumes)) @@ -2761,13 +2761,13 @@ func convert_api_PodSpec_To_v1beta3_PodSpec(in *newer.PodSpec, out *PodSpec, s c return nil } -func convert_v1beta3_PodStatus_To_api_PodStatus(in *PodStatus, out *newer.PodStatus, s conversion.Scope) error { +func convert_v1beta3_PodStatus_To_api_PodStatus(in *PodStatus, out *api.PodStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodStatus))(in) } - out.Phase = newer.PodPhase(in.Phase) + out.Phase = api.PodPhase(in.Phase) if in.Conditions != nil { - out.Conditions = make([]newer.PodCondition, len(in.Conditions)) + out.Conditions = make([]api.PodCondition, len(in.Conditions)) for i := range in.Conditions { if err := convert_v1beta3_PodCondition_To_api_PodCondition(&in.Conditions[i], &out.Conditions[i], s); err != nil { return err @@ -2787,7 +2787,7 @@ func convert_v1beta3_PodStatus_To_api_PodStatus(in *PodStatus, out *newer.PodSta out.StartTime = nil } if in.ContainerStatuses != nil { - out.ContainerStatuses = make([]newer.ContainerStatus, len(in.ContainerStatuses)) + out.ContainerStatuses = make([]api.ContainerStatus, len(in.ContainerStatuses)) for i := range in.ContainerStatuses { if err := convert_v1beta3_ContainerStatus_To_api_ContainerStatus(&in.ContainerStatuses[i], &out.ContainerStatuses[i], s); err != nil { return err @@ -2799,9 +2799,9 @@ func convert_v1beta3_PodStatus_To_api_PodStatus(in *PodStatus, out *newer.PodSta return nil } -func convert_api_PodStatus_To_v1beta3_PodStatus(in *newer.PodStatus, out *PodStatus, s conversion.Scope) error { +func convert_api_PodStatus_To_v1beta3_PodStatus(in *api.PodStatus, out *PodStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodStatus))(in) + defaulting.(func(*api.PodStatus))(in) } out.Phase = PodPhase(in.Phase) if in.Conditions != nil { @@ -2837,7 +2837,7 @@ func convert_api_PodStatus_To_v1beta3_PodStatus(in *newer.PodStatus, out *PodSta return nil } -func convert_v1beta3_PodStatusResult_To_api_PodStatusResult(in *PodStatusResult, out *newer.PodStatusResult, s conversion.Scope) error { +func convert_v1beta3_PodStatusResult_To_api_PodStatusResult(in *PodStatusResult, out *api.PodStatusResult, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodStatusResult))(in) } @@ -2853,9 +2853,9 @@ func convert_v1beta3_PodStatusResult_To_api_PodStatusResult(in *PodStatusResult, return nil } -func convert_api_PodStatusResult_To_v1beta3_PodStatusResult(in *newer.PodStatusResult, out *PodStatusResult, s conversion.Scope) error { +func convert_api_PodStatusResult_To_v1beta3_PodStatusResult(in *api.PodStatusResult, out *PodStatusResult, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodStatusResult))(in) + defaulting.(func(*api.PodStatusResult))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2869,7 +2869,7 @@ func convert_api_PodStatusResult_To_v1beta3_PodStatusResult(in *newer.PodStatusR return nil } -func convert_v1beta3_PodTemplate_To_api_PodTemplate(in *PodTemplate, out *newer.PodTemplate, s conversion.Scope) error { +func convert_v1beta3_PodTemplate_To_api_PodTemplate(in *PodTemplate, out *api.PodTemplate, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodTemplate))(in) } @@ -2885,9 +2885,9 @@ func convert_v1beta3_PodTemplate_To_api_PodTemplate(in *PodTemplate, out *newer. return nil } -func convert_api_PodTemplate_To_v1beta3_PodTemplate(in *newer.PodTemplate, out *PodTemplate, s conversion.Scope) error { +func convert_api_PodTemplate_To_v1beta3_PodTemplate(in *api.PodTemplate, out *PodTemplate, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodTemplate))(in) + defaulting.(func(*api.PodTemplate))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2901,7 +2901,7 @@ func convert_api_PodTemplate_To_v1beta3_PodTemplate(in *newer.PodTemplate, out * return nil } -func convert_v1beta3_PodTemplateList_To_api_PodTemplateList(in *PodTemplateList, out *newer.PodTemplateList, s conversion.Scope) error { +func convert_v1beta3_PodTemplateList_To_api_PodTemplateList(in *PodTemplateList, out *api.PodTemplateList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodTemplateList))(in) } @@ -2912,7 +2912,7 @@ func convert_v1beta3_PodTemplateList_To_api_PodTemplateList(in *PodTemplateList, return err } if in.Items != nil { - out.Items = make([]newer.PodTemplate, len(in.Items)) + out.Items = make([]api.PodTemplate, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_PodTemplate_To_api_PodTemplate(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -2924,9 +2924,9 @@ func convert_v1beta3_PodTemplateList_To_api_PodTemplateList(in *PodTemplateList, return nil } -func convert_api_PodTemplateList_To_v1beta3_PodTemplateList(in *newer.PodTemplateList, out *PodTemplateList, s conversion.Scope) error { +func convert_api_PodTemplateList_To_v1beta3_PodTemplateList(in *api.PodTemplateList, out *PodTemplateList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodTemplateList))(in) + defaulting.(func(*api.PodTemplateList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -2947,7 +2947,7 @@ func convert_api_PodTemplateList_To_v1beta3_PodTemplateList(in *newer.PodTemplat return nil } -func convert_v1beta3_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out *newer.PodTemplateSpec, s conversion.Scope) error { +func convert_v1beta3_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out *api.PodTemplateSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*PodTemplateSpec))(in) } @@ -2960,9 +2960,9 @@ func convert_v1beta3_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, return nil } -func convert_api_PodTemplateSpec_To_v1beta3_PodTemplateSpec(in *newer.PodTemplateSpec, out *PodTemplateSpec, s conversion.Scope) error { +func convert_api_PodTemplateSpec_To_v1beta3_PodTemplateSpec(in *api.PodTemplateSpec, out *PodTemplateSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.PodTemplateSpec))(in) + defaulting.(func(*api.PodTemplateSpec))(in) } if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err @@ -2973,7 +2973,7 @@ func convert_api_PodTemplateSpec_To_v1beta3_PodTemplateSpec(in *newer.PodTemplat return nil } -func convert_v1beta3_Probe_To_api_Probe(in *Probe, out *newer.Probe, s conversion.Scope) error { +func convert_v1beta3_Probe_To_api_Probe(in *Probe, out *api.Probe, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Probe))(in) } @@ -2985,9 +2985,9 @@ func convert_v1beta3_Probe_To_api_Probe(in *Probe, out *newer.Probe, s conversio return nil } -func convert_api_Probe_To_v1beta3_Probe(in *newer.Probe, out *Probe, s conversion.Scope) error { +func convert_api_Probe_To_v1beta3_Probe(in *api.Probe, out *Probe, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Probe))(in) + defaulting.(func(*api.Probe))(in) } if err := convert_api_Handler_To_v1beta3_Handler(&in.Handler, &out.Handler, s); err != nil { return err @@ -2997,7 +2997,7 @@ func convert_api_Probe_To_v1beta3_Probe(in *newer.Probe, out *Probe, s conversio return nil } -func convert_v1beta3_RangeAllocation_To_api_RangeAllocation(in *RangeAllocation, out *newer.RangeAllocation, s conversion.Scope) error { +func convert_v1beta3_RangeAllocation_To_api_RangeAllocation(in *RangeAllocation, out *api.RangeAllocation, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*RangeAllocation))(in) } @@ -3014,9 +3014,9 @@ func convert_v1beta3_RangeAllocation_To_api_RangeAllocation(in *RangeAllocation, return nil } -func convert_api_RangeAllocation_To_v1beta3_RangeAllocation(in *newer.RangeAllocation, out *RangeAllocation, s conversion.Scope) error { +func convert_api_RangeAllocation_To_v1beta3_RangeAllocation(in *api.RangeAllocation, out *RangeAllocation, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.RangeAllocation))(in) + defaulting.(func(*api.RangeAllocation))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3031,7 +3031,7 @@ func convert_api_RangeAllocation_To_v1beta3_RangeAllocation(in *newer.RangeAlloc return nil } -func convert_v1beta3_ReplicationController_To_api_ReplicationController(in *ReplicationController, out *newer.ReplicationController, s conversion.Scope) error { +func convert_v1beta3_ReplicationController_To_api_ReplicationController(in *ReplicationController, out *api.ReplicationController, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ReplicationController))(in) } @@ -3050,9 +3050,9 @@ func convert_v1beta3_ReplicationController_To_api_ReplicationController(in *Repl return nil } -func convert_api_ReplicationController_To_v1beta3_ReplicationController(in *newer.ReplicationController, out *ReplicationController, s conversion.Scope) error { +func convert_api_ReplicationController_To_v1beta3_ReplicationController(in *api.ReplicationController, out *ReplicationController, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ReplicationController))(in) + defaulting.(func(*api.ReplicationController))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3069,7 +3069,7 @@ func convert_api_ReplicationController_To_v1beta3_ReplicationController(in *newe return nil } -func convert_v1beta3_ReplicationControllerList_To_api_ReplicationControllerList(in *ReplicationControllerList, out *newer.ReplicationControllerList, s conversion.Scope) error { +func convert_v1beta3_ReplicationControllerList_To_api_ReplicationControllerList(in *ReplicationControllerList, out *api.ReplicationControllerList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ReplicationControllerList))(in) } @@ -3080,7 +3080,7 @@ func convert_v1beta3_ReplicationControllerList_To_api_ReplicationControllerList( return err } if in.Items != nil { - out.Items = make([]newer.ReplicationController, len(in.Items)) + out.Items = make([]api.ReplicationController, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_ReplicationController_To_api_ReplicationController(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -3092,9 +3092,9 @@ func convert_v1beta3_ReplicationControllerList_To_api_ReplicationControllerList( return nil } -func convert_api_ReplicationControllerList_To_v1beta3_ReplicationControllerList(in *newer.ReplicationControllerList, out *ReplicationControllerList, s conversion.Scope) error { +func convert_api_ReplicationControllerList_To_v1beta3_ReplicationControllerList(in *api.ReplicationControllerList, out *ReplicationControllerList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ReplicationControllerList))(in) + defaulting.(func(*api.ReplicationControllerList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3115,7 +3115,7 @@ func convert_api_ReplicationControllerList_To_v1beta3_ReplicationControllerList( return nil } -func convert_v1beta3_ReplicationControllerSpec_To_api_ReplicationControllerSpec(in *ReplicationControllerSpec, out *newer.ReplicationControllerSpec, s conversion.Scope) error { +func convert_v1beta3_ReplicationControllerSpec_To_api_ReplicationControllerSpec(in *ReplicationControllerSpec, out *api.ReplicationControllerSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ReplicationControllerSpec))(in) } @@ -3129,7 +3129,7 @@ func convert_v1beta3_ReplicationControllerSpec_To_api_ReplicationControllerSpec( out.Selector = nil } if in.TemplateRef != nil { - out.TemplateRef = new(newer.ObjectReference) + out.TemplateRef = new(api.ObjectReference) if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(in.TemplateRef, out.TemplateRef, s); err != nil { return err } @@ -3137,7 +3137,7 @@ func convert_v1beta3_ReplicationControllerSpec_To_api_ReplicationControllerSpec( out.TemplateRef = nil } if in.Template != nil { - out.Template = new(newer.PodTemplateSpec) + out.Template = new(api.PodTemplateSpec) if err := convert_v1beta3_PodTemplateSpec_To_api_PodTemplateSpec(in.Template, out.Template, s); err != nil { return err } @@ -3147,9 +3147,9 @@ func convert_v1beta3_ReplicationControllerSpec_To_api_ReplicationControllerSpec( return nil } -func convert_api_ReplicationControllerSpec_To_v1beta3_ReplicationControllerSpec(in *newer.ReplicationControllerSpec, out *ReplicationControllerSpec, s conversion.Scope) error { +func convert_api_ReplicationControllerSpec_To_v1beta3_ReplicationControllerSpec(in *api.ReplicationControllerSpec, out *ReplicationControllerSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ReplicationControllerSpec))(in) + defaulting.(func(*api.ReplicationControllerSpec))(in) } out.Replicas = in.Replicas if in.Selector != nil { @@ -3179,7 +3179,7 @@ func convert_api_ReplicationControllerSpec_To_v1beta3_ReplicationControllerSpec( return nil } -func convert_v1beta3_ReplicationControllerStatus_To_api_ReplicationControllerStatus(in *ReplicationControllerStatus, out *newer.ReplicationControllerStatus, s conversion.Scope) error { +func convert_v1beta3_ReplicationControllerStatus_To_api_ReplicationControllerStatus(in *ReplicationControllerStatus, out *api.ReplicationControllerStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ReplicationControllerStatus))(in) } @@ -3187,15 +3187,15 @@ func convert_v1beta3_ReplicationControllerStatus_To_api_ReplicationControllerSta return nil } -func convert_api_ReplicationControllerStatus_To_v1beta3_ReplicationControllerStatus(in *newer.ReplicationControllerStatus, out *ReplicationControllerStatus, s conversion.Scope) error { +func convert_api_ReplicationControllerStatus_To_v1beta3_ReplicationControllerStatus(in *api.ReplicationControllerStatus, out *ReplicationControllerStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ReplicationControllerStatus))(in) + defaulting.(func(*api.ReplicationControllerStatus))(in) } out.Replicas = in.Replicas return nil } -func convert_v1beta3_ResourceQuota_To_api_ResourceQuota(in *ResourceQuota, out *newer.ResourceQuota, s conversion.Scope) error { +func convert_v1beta3_ResourceQuota_To_api_ResourceQuota(in *ResourceQuota, out *api.ResourceQuota, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceQuota))(in) } @@ -3214,9 +3214,9 @@ func convert_v1beta3_ResourceQuota_To_api_ResourceQuota(in *ResourceQuota, out * return nil } -func convert_api_ResourceQuota_To_v1beta3_ResourceQuota(in *newer.ResourceQuota, out *ResourceQuota, s conversion.Scope) error { +func convert_api_ResourceQuota_To_v1beta3_ResourceQuota(in *api.ResourceQuota, out *ResourceQuota, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ResourceQuota))(in) + defaulting.(func(*api.ResourceQuota))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3233,7 +3233,7 @@ func convert_api_ResourceQuota_To_v1beta3_ResourceQuota(in *newer.ResourceQuota, return nil } -func convert_v1beta3_ResourceQuotaList_To_api_ResourceQuotaList(in *ResourceQuotaList, out *newer.ResourceQuotaList, s conversion.Scope) error { +func convert_v1beta3_ResourceQuotaList_To_api_ResourceQuotaList(in *ResourceQuotaList, out *api.ResourceQuotaList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceQuotaList))(in) } @@ -3244,7 +3244,7 @@ func convert_v1beta3_ResourceQuotaList_To_api_ResourceQuotaList(in *ResourceQuot return err } if in.Items != nil { - out.Items = make([]newer.ResourceQuota, len(in.Items)) + out.Items = make([]api.ResourceQuota, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_ResourceQuota_To_api_ResourceQuota(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -3256,9 +3256,9 @@ func convert_v1beta3_ResourceQuotaList_To_api_ResourceQuotaList(in *ResourceQuot return nil } -func convert_api_ResourceQuotaList_To_v1beta3_ResourceQuotaList(in *newer.ResourceQuotaList, out *ResourceQuotaList, s conversion.Scope) error { +func convert_api_ResourceQuotaList_To_v1beta3_ResourceQuotaList(in *api.ResourceQuotaList, out *ResourceQuotaList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ResourceQuotaList))(in) + defaulting.(func(*api.ResourceQuotaList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3279,18 +3279,18 @@ func convert_api_ResourceQuotaList_To_v1beta3_ResourceQuotaList(in *newer.Resour return nil } -func convert_v1beta3_ResourceQuotaSpec_To_api_ResourceQuotaSpec(in *ResourceQuotaSpec, out *newer.ResourceQuotaSpec, s conversion.Scope) error { +func convert_v1beta3_ResourceQuotaSpec_To_api_ResourceQuotaSpec(in *ResourceQuotaSpec, out *api.ResourceQuotaSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceQuotaSpec))(in) } if in.Hard != nil { - out.Hard = make(map[newer.ResourceName]resource.Quantity) + out.Hard = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Hard { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Hard[newer.ResourceName(key)] = newVal + out.Hard[api.ResourceName(key)] = newVal } } else { out.Hard = nil @@ -3298,9 +3298,9 @@ func convert_v1beta3_ResourceQuotaSpec_To_api_ResourceQuotaSpec(in *ResourceQuot return nil } -func convert_api_ResourceQuotaSpec_To_v1beta3_ResourceQuotaSpec(in *newer.ResourceQuotaSpec, out *ResourceQuotaSpec, s conversion.Scope) error { +func convert_api_ResourceQuotaSpec_To_v1beta3_ResourceQuotaSpec(in *api.ResourceQuotaSpec, out *ResourceQuotaSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ResourceQuotaSpec))(in) + defaulting.(func(*api.ResourceQuotaSpec))(in) } if in.Hard != nil { out.Hard = make(map[ResourceName]resource.Quantity) @@ -3317,30 +3317,30 @@ func convert_api_ResourceQuotaSpec_To_v1beta3_ResourceQuotaSpec(in *newer.Resour return nil } -func convert_v1beta3_ResourceQuotaStatus_To_api_ResourceQuotaStatus(in *ResourceQuotaStatus, out *newer.ResourceQuotaStatus, s conversion.Scope) error { +func convert_v1beta3_ResourceQuotaStatus_To_api_ResourceQuotaStatus(in *ResourceQuotaStatus, out *api.ResourceQuotaStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceQuotaStatus))(in) } if in.Hard != nil { - out.Hard = make(map[newer.ResourceName]resource.Quantity) + out.Hard = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Hard { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Hard[newer.ResourceName(key)] = newVal + out.Hard[api.ResourceName(key)] = newVal } } else { out.Hard = nil } if in.Used != nil { - out.Used = make(map[newer.ResourceName]resource.Quantity) + out.Used = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Used { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Used[newer.ResourceName(key)] = newVal + out.Used[api.ResourceName(key)] = newVal } } else { out.Used = nil @@ -3348,9 +3348,9 @@ func convert_v1beta3_ResourceQuotaStatus_To_api_ResourceQuotaStatus(in *Resource return nil } -func convert_api_ResourceQuotaStatus_To_v1beta3_ResourceQuotaStatus(in *newer.ResourceQuotaStatus, out *ResourceQuotaStatus, s conversion.Scope) error { +func convert_api_ResourceQuotaStatus_To_v1beta3_ResourceQuotaStatus(in *api.ResourceQuotaStatus, out *ResourceQuotaStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ResourceQuotaStatus))(in) + defaulting.(func(*api.ResourceQuotaStatus))(in) } if in.Hard != nil { out.Hard = make(map[ResourceName]resource.Quantity) @@ -3379,30 +3379,30 @@ func convert_api_ResourceQuotaStatus_To_v1beta3_ResourceQuotaStatus(in *newer.Re return nil } -func convert_v1beta3_ResourceRequirements_To_api_ResourceRequirements(in *ResourceRequirements, out *newer.ResourceRequirements, s conversion.Scope) error { +func convert_v1beta3_ResourceRequirements_To_api_ResourceRequirements(in *ResourceRequirements, out *api.ResourceRequirements, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceRequirements))(in) } if in.Limits != nil { - out.Limits = make(map[newer.ResourceName]resource.Quantity) + out.Limits = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Limits { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Limits[newer.ResourceName(key)] = newVal + out.Limits[api.ResourceName(key)] = newVal } } else { out.Limits = nil } if in.Requests != nil { - out.Requests = make(map[newer.ResourceName]resource.Quantity) + out.Requests = make(map[api.ResourceName]resource.Quantity) for key, val := range in.Requests { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { return err } - out.Requests[newer.ResourceName(key)] = newVal + out.Requests[api.ResourceName(key)] = newVal } } else { out.Requests = nil @@ -3410,9 +3410,9 @@ func convert_v1beta3_ResourceRequirements_To_api_ResourceRequirements(in *Resour return nil } -func convert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(in *newer.ResourceRequirements, out *ResourceRequirements, s conversion.Scope) error { +func convert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(in *api.ResourceRequirements, out *ResourceRequirements, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ResourceRequirements))(in) + defaulting.(func(*api.ResourceRequirements))(in) } if in.Limits != nil { out.Limits = make(map[ResourceName]resource.Quantity) @@ -3441,9 +3441,9 @@ func convert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(in *newer. return nil } -func convert_api_SELinuxOptions_To_v1beta3_SELinuxOptions(in *newer.SELinuxOptions, out *SELinuxOptions, s conversion.Scope) error { +func convert_api_SELinuxOptions_To_v1beta3_SELinuxOptions(in *api.SELinuxOptions, out *SELinuxOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.SELinuxOptions))(in) + defaulting.(func(*api.SELinuxOptions))(in) } out.User = in.User out.Role = in.Role @@ -3452,7 +3452,7 @@ func convert_api_SELinuxOptions_To_v1beta3_SELinuxOptions(in *newer.SELinuxOptio return nil } -func convert_v1beta3_SELinuxOptions_To_api_SELinuxOptions(in *SELinuxOptions, out *newer.SELinuxOptions, s conversion.Scope) error { +func convert_v1beta3_SELinuxOptions_To_api_SELinuxOptions(in *SELinuxOptions, out *api.SELinuxOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SELinuxOptions))(in) } @@ -3463,7 +3463,7 @@ func convert_v1beta3_SELinuxOptions_To_api_SELinuxOptions(in *SELinuxOptions, ou return nil } -func convert_v1beta3_Secret_To_api_Secret(in *Secret, out *newer.Secret, s conversion.Scope) error { +func convert_v1beta3_Secret_To_api_Secret(in *Secret, out *api.Secret, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Secret))(in) } @@ -3485,13 +3485,13 @@ func convert_v1beta3_Secret_To_api_Secret(in *Secret, out *newer.Secret, s conve } else { out.Data = nil } - out.Type = newer.SecretType(in.Type) + out.Type = api.SecretType(in.Type) return nil } -func convert_api_Secret_To_v1beta3_Secret(in *newer.Secret, out *Secret, s conversion.Scope) error { +func convert_api_Secret_To_v1beta3_Secret(in *api.Secret, out *Secret, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Secret))(in) + defaulting.(func(*api.Secret))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3515,7 +3515,7 @@ func convert_api_Secret_To_v1beta3_Secret(in *newer.Secret, out *Secret, s conve return nil } -func convert_v1beta3_SecretList_To_api_SecretList(in *SecretList, out *newer.SecretList, s conversion.Scope) error { +func convert_v1beta3_SecretList_To_api_SecretList(in *SecretList, out *api.SecretList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SecretList))(in) } @@ -3526,7 +3526,7 @@ func convert_v1beta3_SecretList_To_api_SecretList(in *SecretList, out *newer.Sec return err } if in.Items != nil { - out.Items = make([]newer.Secret, len(in.Items)) + out.Items = make([]api.Secret, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_Secret_To_api_Secret(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -3538,9 +3538,9 @@ func convert_v1beta3_SecretList_To_api_SecretList(in *SecretList, out *newer.Sec return nil } -func convert_api_SecretList_To_v1beta3_SecretList(in *newer.SecretList, out *SecretList, s conversion.Scope) error { +func convert_api_SecretList_To_v1beta3_SecretList(in *api.SecretList, out *SecretList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.SecretList))(in) + defaulting.(func(*api.SecretList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3561,7 +3561,7 @@ func convert_api_SecretList_To_v1beta3_SecretList(in *newer.SecretList, out *Sec return nil } -func convert_v1beta3_SecretVolumeSource_To_api_SecretVolumeSource(in *SecretVolumeSource, out *newer.SecretVolumeSource, s conversion.Scope) error { +func convert_v1beta3_SecretVolumeSource_To_api_SecretVolumeSource(in *SecretVolumeSource, out *api.SecretVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SecretVolumeSource))(in) } @@ -3569,17 +3569,17 @@ func convert_v1beta3_SecretVolumeSource_To_api_SecretVolumeSource(in *SecretVolu return nil } -func convert_api_SecretVolumeSource_To_v1beta3_SecretVolumeSource(in *newer.SecretVolumeSource, out *SecretVolumeSource, s conversion.Scope) error { +func convert_api_SecretVolumeSource_To_v1beta3_SecretVolumeSource(in *api.SecretVolumeSource, out *SecretVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.SecretVolumeSource))(in) + defaulting.(func(*api.SecretVolumeSource))(in) } out.SecretName = in.SecretName return nil } -func convert_api_SecurityContext_To_v1beta3_SecurityContext(in *newer.SecurityContext, out *SecurityContext, s conversion.Scope) error { +func convert_api_SecurityContext_To_v1beta3_SecurityContext(in *api.SecurityContext, out *SecurityContext, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.SecurityContext))(in) + defaulting.(func(*api.SecurityContext))(in) } if in.Capabilities != nil { out.Capabilities = new(Capabilities) @@ -3612,12 +3612,12 @@ func convert_api_SecurityContext_To_v1beta3_SecurityContext(in *newer.SecurityCo return nil } -func convert_v1beta3_SecurityContext_To_api_SecurityContext(in *SecurityContext, out *newer.SecurityContext, s conversion.Scope) error { +func convert_v1beta3_SecurityContext_To_api_SecurityContext(in *SecurityContext, out *api.SecurityContext, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SecurityContext))(in) } if in.Capabilities != nil { - out.Capabilities = new(newer.Capabilities) + out.Capabilities = new(api.Capabilities) if err := convert_v1beta3_Capabilities_To_api_Capabilities(in.Capabilities, out.Capabilities, s); err != nil { return err } @@ -3631,7 +3631,7 @@ func convert_v1beta3_SecurityContext_To_api_SecurityContext(in *SecurityContext, out.Privileged = nil } if in.SELinuxOptions != nil { - out.SELinuxOptions = new(newer.SELinuxOptions) + out.SELinuxOptions = new(api.SELinuxOptions) if err := convert_v1beta3_SELinuxOptions_To_api_SELinuxOptions(in.SELinuxOptions, out.SELinuxOptions, s); err != nil { return err } @@ -3647,7 +3647,7 @@ func convert_v1beta3_SecurityContext_To_api_SecurityContext(in *SecurityContext, return nil } -func convert_v1beta3_SerializedReference_To_api_SerializedReference(in *SerializedReference, out *newer.SerializedReference, s conversion.Scope) error { +func convert_v1beta3_SerializedReference_To_api_SerializedReference(in *SerializedReference, out *api.SerializedReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SerializedReference))(in) } @@ -3660,9 +3660,9 @@ func convert_v1beta3_SerializedReference_To_api_SerializedReference(in *Serializ return nil } -func convert_api_SerializedReference_To_v1beta3_SerializedReference(in *newer.SerializedReference, out *SerializedReference, s conversion.Scope) error { +func convert_api_SerializedReference_To_v1beta3_SerializedReference(in *api.SerializedReference, out *SerializedReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.SerializedReference))(in) + defaulting.(func(*api.SerializedReference))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3673,7 +3673,7 @@ func convert_api_SerializedReference_To_v1beta3_SerializedReference(in *newer.Se return nil } -func convert_v1beta3_Service_To_api_Service(in *Service, out *newer.Service, s conversion.Scope) error { +func convert_v1beta3_Service_To_api_Service(in *Service, out *api.Service, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Service))(in) } @@ -3692,9 +3692,9 @@ func convert_v1beta3_Service_To_api_Service(in *Service, out *newer.Service, s c return nil } -func convert_api_Service_To_v1beta3_Service(in *newer.Service, out *Service, s conversion.Scope) error { +func convert_api_Service_To_v1beta3_Service(in *api.Service, out *Service, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Service))(in) + defaulting.(func(*api.Service))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3711,7 +3711,7 @@ func convert_api_Service_To_v1beta3_Service(in *newer.Service, out *Service, s c return nil } -func convert_v1beta3_ServiceAccount_To_api_ServiceAccount(in *ServiceAccount, out *newer.ServiceAccount, s conversion.Scope) error { +func convert_v1beta3_ServiceAccount_To_api_ServiceAccount(in *ServiceAccount, out *api.ServiceAccount, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServiceAccount))(in) } @@ -3722,7 +3722,7 @@ func convert_v1beta3_ServiceAccount_To_api_ServiceAccount(in *ServiceAccount, ou return err } if in.Secrets != nil { - out.Secrets = make([]newer.ObjectReference, len(in.Secrets)) + out.Secrets = make([]api.ObjectReference, len(in.Secrets)) for i := range in.Secrets { if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.Secrets[i], &out.Secrets[i], s); err != nil { return err @@ -3734,9 +3734,9 @@ func convert_v1beta3_ServiceAccount_To_api_ServiceAccount(in *ServiceAccount, ou return nil } -func convert_api_ServiceAccount_To_v1beta3_ServiceAccount(in *newer.ServiceAccount, out *ServiceAccount, s conversion.Scope) error { +func convert_api_ServiceAccount_To_v1beta3_ServiceAccount(in *api.ServiceAccount, out *ServiceAccount, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServiceAccount))(in) + defaulting.(func(*api.ServiceAccount))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3757,7 +3757,7 @@ func convert_api_ServiceAccount_To_v1beta3_ServiceAccount(in *newer.ServiceAccou return nil } -func convert_v1beta3_ServiceAccountList_To_api_ServiceAccountList(in *ServiceAccountList, out *newer.ServiceAccountList, s conversion.Scope) error { +func convert_v1beta3_ServiceAccountList_To_api_ServiceAccountList(in *ServiceAccountList, out *api.ServiceAccountList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServiceAccountList))(in) } @@ -3768,7 +3768,7 @@ func convert_v1beta3_ServiceAccountList_To_api_ServiceAccountList(in *ServiceAcc return err } if in.Items != nil { - out.Items = make([]newer.ServiceAccount, len(in.Items)) + out.Items = make([]api.ServiceAccount, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_ServiceAccount_To_api_ServiceAccount(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -3780,9 +3780,9 @@ func convert_v1beta3_ServiceAccountList_To_api_ServiceAccountList(in *ServiceAcc return nil } -func convert_api_ServiceAccountList_To_v1beta3_ServiceAccountList(in *newer.ServiceAccountList, out *ServiceAccountList, s conversion.Scope) error { +func convert_api_ServiceAccountList_To_v1beta3_ServiceAccountList(in *api.ServiceAccountList, out *ServiceAccountList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServiceAccountList))(in) + defaulting.(func(*api.ServiceAccountList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3803,7 +3803,7 @@ func convert_api_ServiceAccountList_To_v1beta3_ServiceAccountList(in *newer.Serv return nil } -func convert_v1beta3_ServiceList_To_api_ServiceList(in *ServiceList, out *newer.ServiceList, s conversion.Scope) error { +func convert_v1beta3_ServiceList_To_api_ServiceList(in *ServiceList, out *api.ServiceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServiceList))(in) } @@ -3814,7 +3814,7 @@ func convert_v1beta3_ServiceList_To_api_ServiceList(in *ServiceList, out *newer. return err } if in.Items != nil { - out.Items = make([]newer.Service, len(in.Items)) + out.Items = make([]api.Service, len(in.Items)) for i := range in.Items { if err := convert_v1beta3_Service_To_api_Service(&in.Items[i], &out.Items[i], s); err != nil { return err @@ -3826,9 +3826,9 @@ func convert_v1beta3_ServiceList_To_api_ServiceList(in *ServiceList, out *newer. return nil } -func convert_api_ServiceList_To_v1beta3_ServiceList(in *newer.ServiceList, out *ServiceList, s conversion.Scope) error { +func convert_api_ServiceList_To_v1beta3_ServiceList(in *api.ServiceList, out *ServiceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServiceList))(in) + defaulting.(func(*api.ServiceList))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -3849,12 +3849,12 @@ func convert_api_ServiceList_To_v1beta3_ServiceList(in *newer.ServiceList, out * return nil } -func convert_v1beta3_ServicePort_To_api_ServicePort(in *ServicePort, out *newer.ServicePort, s conversion.Scope) error { +func convert_v1beta3_ServicePort_To_api_ServicePort(in *ServicePort, out *api.ServicePort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServicePort))(in) } out.Name = in.Name - out.Protocol = newer.Protocol(in.Protocol) + out.Protocol = api.Protocol(in.Protocol) out.Port = in.Port if err := s.Convert(&in.TargetPort, &out.TargetPort, 0); err != nil { return err @@ -3862,9 +3862,9 @@ func convert_v1beta3_ServicePort_To_api_ServicePort(in *ServicePort, out *newer. return nil } -func convert_api_ServicePort_To_v1beta3_ServicePort(in *newer.ServicePort, out *ServicePort, s conversion.Scope) error { +func convert_api_ServicePort_To_v1beta3_ServicePort(in *api.ServicePort, out *ServicePort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServicePort))(in) + defaulting.(func(*api.ServicePort))(in) } out.Name = in.Name out.Protocol = Protocol(in.Protocol) @@ -3875,12 +3875,12 @@ func convert_api_ServicePort_To_v1beta3_ServicePort(in *newer.ServicePort, out * return nil } -func convert_v1beta3_ServiceSpec_To_api_ServiceSpec(in *ServiceSpec, out *newer.ServiceSpec, s conversion.Scope) error { +func convert_v1beta3_ServiceSpec_To_api_ServiceSpec(in *ServiceSpec, out *api.ServiceSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServiceSpec))(in) } if in.Ports != nil { - out.Ports = make([]newer.ServicePort, len(in.Ports)) + out.Ports = make([]api.ServicePort, len(in.Ports)) for i := range in.Ports { if err := convert_v1beta3_ServicePort_To_api_ServicePort(&in.Ports[i], &out.Ports[i], s); err != nil { return err @@ -3907,13 +3907,13 @@ func convert_v1beta3_ServiceSpec_To_api_ServiceSpec(in *ServiceSpec, out *newer. } else { out.PublicIPs = nil } - out.SessionAffinity = newer.ServiceAffinity(in.SessionAffinity) + out.SessionAffinity = api.ServiceAffinity(in.SessionAffinity) return nil } -func convert_api_ServiceSpec_To_v1beta3_ServiceSpec(in *newer.ServiceSpec, out *ServiceSpec, s conversion.Scope) error { +func convert_api_ServiceSpec_To_v1beta3_ServiceSpec(in *api.ServiceSpec, out *ServiceSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServiceSpec))(in) + defaulting.(func(*api.ServiceSpec))(in) } if in.Ports != nil { out.Ports = make([]ServicePort, len(in.Ports)) @@ -3947,21 +3947,21 @@ func convert_api_ServiceSpec_To_v1beta3_ServiceSpec(in *newer.ServiceSpec, out * return nil } -func convert_v1beta3_ServiceStatus_To_api_ServiceStatus(in *ServiceStatus, out *newer.ServiceStatus, s conversion.Scope) error { +func convert_v1beta3_ServiceStatus_To_api_ServiceStatus(in *ServiceStatus, out *api.ServiceStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ServiceStatus))(in) } return nil } -func convert_api_ServiceStatus_To_v1beta3_ServiceStatus(in *newer.ServiceStatus, out *ServiceStatus, s conversion.Scope) error { +func convert_api_ServiceStatus_To_v1beta3_ServiceStatus(in *api.ServiceStatus, out *ServiceStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.ServiceStatus))(in) + defaulting.(func(*api.ServiceStatus))(in) } return nil } -func convert_v1beta3_Status_To_api_Status(in *Status, out *newer.Status, s conversion.Scope) error { +func convert_v1beta3_Status_To_api_Status(in *Status, out *api.Status, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Status))(in) } @@ -3973,9 +3973,9 @@ func convert_v1beta3_Status_To_api_Status(in *Status, out *newer.Status, s conve } out.Status = in.Status out.Message = in.Message - out.Reason = newer.StatusReason(in.Reason) + out.Reason = api.StatusReason(in.Reason) if in.Details != nil { - out.Details = new(newer.StatusDetails) + out.Details = new(api.StatusDetails) if err := convert_v1beta3_StatusDetails_To_api_StatusDetails(in.Details, out.Details, s); err != nil { return err } @@ -3986,9 +3986,9 @@ func convert_v1beta3_Status_To_api_Status(in *Status, out *newer.Status, s conve return nil } -func convert_api_Status_To_v1beta3_Status(in *newer.Status, out *Status, s conversion.Scope) error { +func convert_api_Status_To_v1beta3_Status(in *api.Status, out *Status, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Status))(in) + defaulting.(func(*api.Status))(in) } if err := convert_api_TypeMeta_To_v1beta3_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err @@ -4011,19 +4011,19 @@ func convert_api_Status_To_v1beta3_Status(in *newer.Status, out *Status, s conve return nil } -func convert_v1beta3_StatusCause_To_api_StatusCause(in *StatusCause, out *newer.StatusCause, s conversion.Scope) error { +func convert_v1beta3_StatusCause_To_api_StatusCause(in *StatusCause, out *api.StatusCause, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*StatusCause))(in) } - out.Type = newer.CauseType(in.Type) + out.Type = api.CauseType(in.Type) out.Message = in.Message out.Field = in.Field return nil } -func convert_api_StatusCause_To_v1beta3_StatusCause(in *newer.StatusCause, out *StatusCause, s conversion.Scope) error { +func convert_api_StatusCause_To_v1beta3_StatusCause(in *api.StatusCause, out *StatusCause, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.StatusCause))(in) + defaulting.(func(*api.StatusCause))(in) } out.Type = CauseType(in.Type) out.Message = in.Message @@ -4031,14 +4031,14 @@ func convert_api_StatusCause_To_v1beta3_StatusCause(in *newer.StatusCause, out * return nil } -func convert_v1beta3_StatusDetails_To_api_StatusDetails(in *StatusDetails, out *newer.StatusDetails, s conversion.Scope) error { +func convert_v1beta3_StatusDetails_To_api_StatusDetails(in *StatusDetails, out *api.StatusDetails, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*StatusDetails))(in) } out.ID = in.ID out.Kind = in.Kind if in.Causes != nil { - out.Causes = make([]newer.StatusCause, len(in.Causes)) + out.Causes = make([]api.StatusCause, len(in.Causes)) for i := range in.Causes { if err := convert_v1beta3_StatusCause_To_api_StatusCause(&in.Causes[i], &out.Causes[i], s); err != nil { return err @@ -4051,9 +4051,9 @@ func convert_v1beta3_StatusDetails_To_api_StatusDetails(in *StatusDetails, out * return nil } -func convert_api_StatusDetails_To_v1beta3_StatusDetails(in *newer.StatusDetails, out *StatusDetails, s conversion.Scope) error { +func convert_api_StatusDetails_To_v1beta3_StatusDetails(in *api.StatusDetails, out *StatusDetails, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.StatusDetails))(in) + defaulting.(func(*api.StatusDetails))(in) } out.ID = in.ID out.Kind = in.Kind @@ -4071,7 +4071,7 @@ func convert_api_StatusDetails_To_v1beta3_StatusDetails(in *newer.StatusDetails, return nil } -func convert_v1beta3_TCPSocketAction_To_api_TCPSocketAction(in *TCPSocketAction, out *newer.TCPSocketAction, s conversion.Scope) error { +func convert_v1beta3_TCPSocketAction_To_api_TCPSocketAction(in *TCPSocketAction, out *api.TCPSocketAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*TCPSocketAction))(in) } @@ -4081,9 +4081,9 @@ func convert_v1beta3_TCPSocketAction_To_api_TCPSocketAction(in *TCPSocketAction, return nil } -func convert_api_TCPSocketAction_To_v1beta3_TCPSocketAction(in *newer.TCPSocketAction, out *TCPSocketAction, s conversion.Scope) error { +func convert_api_TCPSocketAction_To_v1beta3_TCPSocketAction(in *api.TCPSocketAction, out *TCPSocketAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.TCPSocketAction))(in) + defaulting.(func(*api.TCPSocketAction))(in) } if err := s.Convert(&in.Port, &out.Port, 0); err != nil { return err @@ -4091,7 +4091,7 @@ func convert_api_TCPSocketAction_To_v1beta3_TCPSocketAction(in *newer.TCPSocketA return nil } -func convert_v1beta3_TypeMeta_To_api_TypeMeta(in *TypeMeta, out *newer.TypeMeta, s conversion.Scope) error { +func convert_v1beta3_TypeMeta_To_api_TypeMeta(in *TypeMeta, out *api.TypeMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*TypeMeta))(in) } @@ -4100,16 +4100,16 @@ func convert_v1beta3_TypeMeta_To_api_TypeMeta(in *TypeMeta, out *newer.TypeMeta, return nil } -func convert_api_TypeMeta_To_v1beta3_TypeMeta(in *newer.TypeMeta, out *TypeMeta, s conversion.Scope) error { +func convert_api_TypeMeta_To_v1beta3_TypeMeta(in *api.TypeMeta, out *TypeMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.TypeMeta))(in) + defaulting.(func(*api.TypeMeta))(in) } out.Kind = in.Kind out.APIVersion = in.APIVersion return nil } -func convert_v1beta3_Volume_To_api_Volume(in *Volume, out *newer.Volume, s conversion.Scope) error { +func convert_v1beta3_Volume_To_api_Volume(in *Volume, out *api.Volume, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Volume))(in) } @@ -4120,9 +4120,9 @@ func convert_v1beta3_Volume_To_api_Volume(in *Volume, out *newer.Volume, s conve return nil } -func convert_api_Volume_To_v1beta3_Volume(in *newer.Volume, out *Volume, s conversion.Scope) error { +func convert_api_Volume_To_v1beta3_Volume(in *api.Volume, out *Volume, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.Volume))(in) + defaulting.(func(*api.Volume))(in) } out.Name = in.Name if err := convert_api_VolumeSource_To_v1beta3_VolumeSource(&in.VolumeSource, &out.VolumeSource, s); err != nil { @@ -4131,7 +4131,7 @@ func convert_api_Volume_To_v1beta3_Volume(in *newer.Volume, out *Volume, s conve return nil } -func convert_v1beta3_VolumeMount_To_api_VolumeMount(in *VolumeMount, out *newer.VolumeMount, s conversion.Scope) error { +func convert_v1beta3_VolumeMount_To_api_VolumeMount(in *VolumeMount, out *api.VolumeMount, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*VolumeMount))(in) } @@ -4141,9 +4141,9 @@ func convert_v1beta3_VolumeMount_To_api_VolumeMount(in *VolumeMount, out *newer. return nil } -func convert_api_VolumeMount_To_v1beta3_VolumeMount(in *newer.VolumeMount, out *VolumeMount, s conversion.Scope) error { +func convert_api_VolumeMount_To_v1beta3_VolumeMount(in *api.VolumeMount, out *VolumeMount, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.VolumeMount))(in) + defaulting.(func(*api.VolumeMount))(in) } out.Name = in.Name out.ReadOnly = in.ReadOnly @@ -4151,12 +4151,12 @@ func convert_api_VolumeMount_To_v1beta3_VolumeMount(in *newer.VolumeMount, out * return nil } -func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *newer.VolumeSource, s conversion.Scope) error { +func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *api.VolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*VolumeSource))(in) } if in.HostPath != nil { - out.HostPath = new(newer.HostPathVolumeSource) + out.HostPath = new(api.HostPathVolumeSource) if err := convert_v1beta3_HostPathVolumeSource_To_api_HostPathVolumeSource(in.HostPath, out.HostPath, s); err != nil { return err } @@ -4164,7 +4164,7 @@ func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *new out.HostPath = nil } if in.EmptyDir != nil { - out.EmptyDir = new(newer.EmptyDirVolumeSource) + out.EmptyDir = new(api.EmptyDirVolumeSource) if err := convert_v1beta3_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in.EmptyDir, out.EmptyDir, s); err != nil { return err } @@ -4172,7 +4172,7 @@ func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *new out.EmptyDir = nil } if in.GCEPersistentDisk != nil { - out.GCEPersistentDisk = new(newer.GCEPersistentDiskVolumeSource) + out.GCEPersistentDisk = new(api.GCEPersistentDiskVolumeSource) if err := convert_v1beta3_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in.GCEPersistentDisk, out.GCEPersistentDisk, s); err != nil { return err } @@ -4180,7 +4180,7 @@ func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *new out.GCEPersistentDisk = nil } if in.AWSElasticBlockStore != nil { - out.AWSElasticBlockStore = new(newer.AWSElasticBlockStoreVolumeSource) + out.AWSElasticBlockStore = new(api.AWSElasticBlockStoreVolumeSource) if err := convert_v1beta3_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in.AWSElasticBlockStore, out.AWSElasticBlockStore, s); err != nil { return err } @@ -4188,7 +4188,7 @@ func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *new out.AWSElasticBlockStore = nil } if in.GitRepo != nil { - out.GitRepo = new(newer.GitRepoVolumeSource) + out.GitRepo = new(api.GitRepoVolumeSource) if err := convert_v1beta3_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in.GitRepo, out.GitRepo, s); err != nil { return err } @@ -4196,7 +4196,7 @@ func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *new out.GitRepo = nil } if in.Secret != nil { - out.Secret = new(newer.SecretVolumeSource) + out.Secret = new(api.SecretVolumeSource) if err := convert_v1beta3_SecretVolumeSource_To_api_SecretVolumeSource(in.Secret, out.Secret, s); err != nil { return err } @@ -4204,7 +4204,7 @@ func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *new out.Secret = nil } if in.NFS != nil { - out.NFS = new(newer.NFSVolumeSource) + out.NFS = new(api.NFSVolumeSource) if err := convert_v1beta3_NFSVolumeSource_To_api_NFSVolumeSource(in.NFS, out.NFS, s); err != nil { return err } @@ -4212,7 +4212,7 @@ func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *new out.NFS = nil } if in.ISCSI != nil { - out.ISCSI = new(newer.ISCSIVolumeSource) + out.ISCSI = new(api.ISCSIVolumeSource) if err := convert_v1beta3_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in.ISCSI, out.ISCSI, s); err != nil { return err } @@ -4220,7 +4220,7 @@ func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *new out.ISCSI = nil } if in.Glusterfs != nil { - out.Glusterfs = new(newer.GlusterfsVolumeSource) + out.Glusterfs = new(api.GlusterfsVolumeSource) if err := convert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in.Glusterfs, out.Glusterfs, s); err != nil { return err } @@ -4228,7 +4228,7 @@ func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *new out.Glusterfs = nil } if in.PersistentVolumeClaimVolumeSource != nil { - out.PersistentVolumeClaimVolumeSource = new(newer.PersistentVolumeClaimVolumeSource) + out.PersistentVolumeClaimVolumeSource = new(api.PersistentVolumeClaimVolumeSource) if err := convert_v1beta3_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in.PersistentVolumeClaimVolumeSource, out.PersistentVolumeClaimVolumeSource, s); err != nil { return err } @@ -4238,9 +4238,9 @@ func convert_v1beta3_VolumeSource_To_api_VolumeSource(in *VolumeSource, out *new return nil } -func convert_api_VolumeSource_To_v1beta3_VolumeSource(in *newer.VolumeSource, out *VolumeSource, s conversion.Scope) error { +func convert_api_VolumeSource_To_v1beta3_VolumeSource(in *api.VolumeSource, out *VolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*newer.VolumeSource))(in) + defaulting.(func(*api.VolumeSource))(in) } if in.HostPath != nil { out.HostPath = new(HostPathVolumeSource) @@ -4326,7 +4326,7 @@ func convert_api_VolumeSource_To_v1beta3_VolumeSource(in *newer.VolumeSource, ou } func init() { - err := newer.Scheme.AddGeneratedConversionFuncs( + err := api.Scheme.AddGeneratedConversionFuncs( convert_api_AWSElasticBlockStoreVolumeSource_To_v1beta3_AWSElasticBlockStoreVolumeSource, convert_api_Binding_To_v1beta3_Binding, convert_api_Capabilities_To_v1beta3_Capabilities, diff --git a/pkg/api/v1beta3/conversion_test.go b/pkg/api/v1beta3/conversion_test.go index 2f611413fb4..a7772d3475e 100644 --- a/pkg/api/v1beta3/conversion_test.go +++ b/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: ¤t.Container{ + c: &versioned.Container{ Privileged: true, - SecurityContext: ¤t.SecurityContext{ + SecurityContext: &versioned.SecurityContext{ Privileged: &priv, }, }, err: "container privileged settings do not match security context settings, cannot convert", }, "mismatched caps add": { - c: ¤t.Container{ - Capabilities: current.Capabilities{ - Add: []current.Capability{"foo"}, + c: &versioned.Container{ + Capabilities: versioned.Capabilities{ + Add: []versioned.Capability{"foo"}, }, - SecurityContext: ¤t.SecurityContext{ - Capabilities: ¤t.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: ¤t.Container{ - Capabilities: current.Capabilities{ - Drop: []current.Capability{"foo"}, + c: &versioned.Container{ + Capabilities: versioned.Capabilities{ + Drop: []versioned.Capability{"foo"}, }, - SecurityContext: ¤t.SecurityContext{ - Capabilities: ¤t.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 { diff --git a/pkg/client/clientcmd/api/v1/conversion.go b/pkg/client/clientcmd/api/v1/conversion.go index e162c89ebcf..b88793c676f 100644 --- a/pkg/client/clientcmd/api/v1/conversion.go +++ b/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) diff --git a/pkg/runtime/conversion_generation_test.go b/pkg/runtime/conversion_generation_test.go index 3e68e6a6aff..9a69515cad2 100644 --- a/pkg/runtime/conversion_generation_test.go +++ b/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 } } diff --git a/pkg/runtime/conversion_generator.go b/pkg/runtime/conversion_generator.go index f257f0e7ea1..0ac40cdc4d4 100644 --- a/pkg/runtime/conversion_generator.go +++ b/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) {