From 4c85317d8dd513bbf788cdf1a78e2c1b49a1f977 Mon Sep 17 00:00:00 2001 From: Aldo Culquicondor Date: Wed, 30 Dec 2020 11:56:50 -0500 Subject: [PATCH] Use autogenerated Job conversion functions Change-Id: I46691310faa1973b153e344c95989bbea0ac8d6c --- pkg/apis/batch/v1/conversion.go | 45 +++++---------------------------- 1 file changed, 7 insertions(+), 38 deletions(-) diff --git a/pkg/apis/batch/v1/conversion.go b/pkg/apis/batch/v1/conversion.go index 873876cbfc0..cf8d3f3325b 100644 --- a/pkg/apis/batch/v1/conversion.go +++ b/pkg/apis/batch/v1/conversion.go @@ -19,12 +19,10 @@ package v1 import ( "fmt" - batchv1 "k8s.io/api/batch/v1" - + v1 "k8s.io/api/batch/v1" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/batch" - k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1" ) func addConversionFuncs(scheme *runtime.Scheme) error { @@ -40,42 +38,13 @@ func addConversionFuncs(scheme *runtime.Scheme) error { ) } -func Convert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *batchv1.JobSpec, s conversion.Scope) error { - out.Parallelism = in.Parallelism - out.Completions = in.Completions - out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds - out.BackoffLimit = in.BackoffLimit - out.TTLSecondsAfterFinished = in.TTLSecondsAfterFinished - out.Selector = in.Selector - if in.ManualSelector != nil { - out.ManualSelector = new(bool) - *out.ManualSelector = *in.ManualSelector - } else { - out.ManualSelector = nil - } +// The following functions don't do anything special, but they need to be added +// here due to the dependency of v1beta1 and v2alpha1 on v1. - if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { - return err - } - return nil +func Convert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *v1.JobSpec, s conversion.Scope) error { + return autoConvert_batch_JobSpec_To_v1_JobSpec(in, out, s) } -func Convert_v1_JobSpec_To_batch_JobSpec(in *batchv1.JobSpec, out *batch.JobSpec, s conversion.Scope) error { - out.Parallelism = in.Parallelism - out.Completions = in.Completions - out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds - out.BackoffLimit = in.BackoffLimit - out.TTLSecondsAfterFinished = in.TTLSecondsAfterFinished - out.Selector = in.Selector - if in.ManualSelector != nil { - out.ManualSelector = new(bool) - *out.ManualSelector = *in.ManualSelector - } else { - out.ManualSelector = nil - } - - if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { - return err - } - return nil +func Convert_v1_JobSpec_To_batch_JobSpec(in *v1.JobSpec, out *batch.JobSpec, s conversion.Scope) error { + return autoConvert_v1_JobSpec_To_batch_JobSpec(in, out, s) }