mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #97617 from alculquicondor/convert-job
Use autogenerated Job conversion functions
This commit is contained in:
commit
d4bbe3e691
@ -19,12 +19,10 @@ package v1
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
batchv1 "k8s.io/api/batch/v1"
|
v1 "k8s.io/api/batch/v1"
|
||||||
|
|
||||||
"k8s.io/apimachinery/pkg/conversion"
|
"k8s.io/apimachinery/pkg/conversion"
|
||||||
"k8s.io/apimachinery/pkg/runtime"
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
"k8s.io/kubernetes/pkg/apis/batch"
|
"k8s.io/kubernetes/pkg/apis/batch"
|
||||||
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func addConversionFuncs(scheme *runtime.Scheme) error {
|
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 {
|
// The following functions don't do anything special, but they need to be added
|
||||||
out.Parallelism = in.Parallelism
|
// here due to the dependency of v1beta1 and v2alpha1 on v1.
|
||||||
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_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
|
func Convert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *v1.JobSpec, s conversion.Scope) error {
|
||||||
return err
|
return autoConvert_batch_JobSpec_To_v1_JobSpec(in, out, s)
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func Convert_v1_JobSpec_To_batch_JobSpec(in *batchv1.JobSpec, out *batch.JobSpec, s conversion.Scope) error {
|
func Convert_v1_JobSpec_To_batch_JobSpec(in *v1.JobSpec, out *batch.JobSpec, s conversion.Scope) error {
|
||||||
out.Parallelism = in.Parallelism
|
return autoConvert_v1_JobSpec_To_batch_JobSpec(in, out, s)
|
||||||
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
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user