From b508cab1cf48e92971bbe80e3d0d795c84425a72 Mon Sep 17 00:00:00 2001 From: Peter Engelbert Date: Thu, 29 Dec 2022 17:09:53 -0500 Subject: [PATCH] Rebase on PodTemplate changes (#555) and regenerate Signed-off-by: Peter Engelbert --- api/v1alpha1/zz_generated.conversion.go | 66 ++++------- config/crd/bases/eraser.sh_imagejobs.yaml | 108 +++++++++--------- ...bs.eraser.sh-customresourcedefinition.yaml | 98 ++++++++-------- manifest_staging/deploy/eraser.yaml | 98 ++++++++-------- 4 files changed, 175 insertions(+), 195 deletions(-) diff --git a/api/v1alpha1/zz_generated.conversion.go b/api/v1alpha1/zz_generated.conversion.go index d411d93e43..0edc8e44c9 100644 --- a/api/v1alpha1/zz_generated.conversion.go +++ b/api/v1alpha1/zz_generated.conversion.go @@ -66,16 +66,6 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ImageJobSpec)(nil), (*unversioned.ImageJobSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_ImageJobSpec_To_unversioned_ImageJobSpec(a.(*ImageJobSpec), b.(*unversioned.ImageJobSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*unversioned.ImageJobSpec)(nil), (*ImageJobSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_unversioned_ImageJobSpec_To_v1alpha1_ImageJobSpec(a.(*unversioned.ImageJobSpec), b.(*ImageJobSpec), scope) - }); err != nil { - return err - } if err := s.AddGeneratedConversionFunc((*ImageJobStatus)(nil), (*unversioned.ImageJobStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha1_ImageJobStatus_To_unversioned_ImageJobStatus(a.(*ImageJobStatus), b.(*unversioned.ImageJobStatus), scope) }); err != nil { @@ -155,9 +145,6 @@ func Convert_unversioned_Image_To_v1alpha1_Image(in *unversioned.Image, out *Ima func autoConvert_v1alpha1_ImageJob_To_unversioned_ImageJob(in *ImageJob, out *unversioned.ImageJob, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha1_ImageJobSpec_To_unversioned_ImageJobSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } if err := Convert_v1alpha1_ImageJobStatus_To_unversioned_ImageJobStatus(&in.Status, &out.Status, s); err != nil { return err } @@ -171,23 +158,26 @@ func Convert_v1alpha1_ImageJob_To_unversioned_ImageJob(in *ImageJob, out *unvers func autoConvert_unversioned_ImageJob_To_v1alpha1_ImageJob(in *unversioned.ImageJob, out *ImageJob, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_unversioned_ImageJobSpec_To_v1alpha1_ImageJobSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } + // WARNING: in.Spec requires manual conversion: does not exist in peer-type if err := Convert_unversioned_ImageJobStatus_To_v1alpha1_ImageJobStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_unversioned_ImageJob_To_v1alpha1_ImageJob is an autogenerated conversion function. -func Convert_unversioned_ImageJob_To_v1alpha1_ImageJob(in *unversioned.ImageJob, out *ImageJob, s conversion.Scope) error { - return autoConvert_unversioned_ImageJob_To_v1alpha1_ImageJob(in, out, s) -} - func autoConvert_v1alpha1_ImageJobList_To_unversioned_ImageJobList(in *ImageJobList, out *unversioned.ImageJobList, s conversion.Scope) error { out.ListMeta = in.ListMeta - out.Items = *(*[]unversioned.ImageJob)(unsafe.Pointer(&in.Items)) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]unversioned.ImageJob, len(*in)) + for i := range *in { + if err := Convert_v1alpha1_ImageJob_To_unversioned_ImageJob(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } return nil } @@ -198,7 +188,17 @@ func Convert_v1alpha1_ImageJobList_To_unversioned_ImageJobList(in *ImageJobList, func autoConvert_unversioned_ImageJobList_To_v1alpha1_ImageJobList(in *unversioned.ImageJobList, out *ImageJobList, s conversion.Scope) error { out.ListMeta = in.ListMeta - out.Items = *(*[]ImageJob)(unsafe.Pointer(&in.Items)) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ImageJob, len(*in)) + for i := range *in { + if err := Convert_unversioned_ImageJob_To_v1alpha1_ImageJob(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } return nil } @@ -207,26 +207,6 @@ func Convert_unversioned_ImageJobList_To_v1alpha1_ImageJobList(in *unversioned.I return autoConvert_unversioned_ImageJobList_To_v1alpha1_ImageJobList(in, out, s) } -func autoConvert_v1alpha1_ImageJobSpec_To_unversioned_ImageJobSpec(in *ImageJobSpec, out *unversioned.ImageJobSpec, s conversion.Scope) error { - out.JobTemplate = in.JobTemplate - return nil -} - -// Convert_v1alpha1_ImageJobSpec_To_unversioned_ImageJobSpec is an autogenerated conversion function. -func Convert_v1alpha1_ImageJobSpec_To_unversioned_ImageJobSpec(in *ImageJobSpec, out *unversioned.ImageJobSpec, s conversion.Scope) error { - return autoConvert_v1alpha1_ImageJobSpec_To_unversioned_ImageJobSpec(in, out, s) -} - -func autoConvert_unversioned_ImageJobSpec_To_v1alpha1_ImageJobSpec(in *unversioned.ImageJobSpec, out *ImageJobSpec, s conversion.Scope) error { - out.JobTemplate = in.JobTemplate - return nil -} - -// Convert_unversioned_ImageJobSpec_To_v1alpha1_ImageJobSpec is an autogenerated conversion function. -func Convert_unversioned_ImageJobSpec_To_v1alpha1_ImageJobSpec(in *unversioned.ImageJobSpec, out *ImageJobSpec, s conversion.Scope) error { - return autoConvert_unversioned_ImageJobSpec_To_v1alpha1_ImageJobSpec(in, out, s) -} - func autoConvert_v1alpha1_ImageJobStatus_To_unversioned_ImageJobStatus(in *ImageJobStatus, out *unversioned.ImageJobStatus, s conversion.Scope) error { out.Failed = in.Failed out.Succeeded = in.Succeeded diff --git a/config/crd/bases/eraser.sh_imagejobs.yaml b/config/crd/bases/eraser.sh_imagejobs.yaml index d576ac4b39..7490dae15e 100644 --- a/config/crd/bases/eraser.sh_imagejobs.yaml +++ b/config/crd/bases/eraser.sh_imagejobs.yaml @@ -16,60 +16,6 @@ spec: scope: Cluster versions: - name: v1 - schema: - openAPIV3Schema: - description: ImageJob is the Schema for the imagejobs API. - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - status: - description: ImageJobStatus defines the observed state of ImageJob. - properties: - deleteAfter: - description: Time to delay deletion until - format: date-time - type: string - desired: - description: desired number of pods - type: integer - failed: - description: number of pods that failed - type: integer - phase: - description: job running, successfully completed, or failed - type: string - skipped: - description: number of nodes that were skipped e.g. because they are - not a linux node - type: integer - succeeded: - description: number of pods that completed successfully - type: integer - required: - - desired - - failed - - phase - - skipped - - succeeded - type: object - type: object - served: true - storage: true - subresources: - status: {} - - deprecated: true - deprecationWarning: v1alpha1 of the eraser API has been deprecated - name: v1alpha1 schema: openAPIV3Schema: description: ImageJob is the Schema for the imagejobs API. @@ -7255,6 +7201,60 @@ spec: type: object type: object served: true + storage: true + subresources: + status: {} + - deprecated: true + deprecationWarning: v1alpha1 of the eraser API has been deprecated + name: v1alpha1 + schema: + openAPIV3Schema: + description: ImageJob is the Schema for the imagejobs API. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + status: + description: ImageJobStatus defines the observed state of ImageJob. + properties: + deleteAfter: + description: Time to delay deletion until + format: date-time + type: string + desired: + description: desired number of pods + type: integer + failed: + description: number of pods that failed + type: integer + phase: + description: job running, successfully completed, or failed + type: string + skipped: + description: number of nodes that were skipped e.g. because they are + not a linux node + type: integer + succeeded: + description: number of pods that completed successfully + type: integer + required: + - desired + - failed + - phase + - skipped + - succeeded + type: object + type: object + served: true storage: false subresources: status: {} diff --git a/manifest_staging/charts/eraser/templates/imagejobs.eraser.sh-customresourcedefinition.yaml b/manifest_staging/charts/eraser/templates/imagejobs.eraser.sh-customresourcedefinition.yaml index 6cd41dc092..f12ea36ec6 100644 --- a/manifest_staging/charts/eraser/templates/imagejobs.eraser.sh-customresourcedefinition.yaml +++ b/manifest_staging/charts/eraser/templates/imagejobs.eraser.sh-customresourcedefinition.yaml @@ -20,55 +20,6 @@ spec: scope: Cluster versions: - name: v1 - schema: - openAPIV3Schema: - description: ImageJob is the Schema for the imagejobs API. - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - status: - description: ImageJobStatus defines the observed state of ImageJob. - properties: - deleteAfter: - description: Time to delay deletion until - format: date-time - type: string - desired: - description: desired number of pods - type: integer - failed: - description: number of pods that failed - type: integer - phase: - description: job running, successfully completed, or failed - type: string - skipped: - description: number of nodes that were skipped e.g. because they are not a linux node - type: integer - succeeded: - description: number of pods that completed successfully - type: integer - required: - - desired - - failed - - phase - - skipped - - succeeded - type: object - type: object - served: true - storage: true - subresources: - status: {} - - deprecated: true - deprecationWarning: v1alpha1 of the eraser API has been deprecated - name: v1alpha1 schema: openAPIV3Schema: description: ImageJob is the Schema for the imagejobs API. @@ -4189,6 +4140,55 @@ spec: type: object type: object served: true + storage: true + subresources: + status: {} + - deprecated: true + deprecationWarning: v1alpha1 of the eraser API has been deprecated + name: v1alpha1 + schema: + openAPIV3Schema: + description: ImageJob is the Schema for the imagejobs API. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + status: + description: ImageJobStatus defines the observed state of ImageJob. + properties: + deleteAfter: + description: Time to delay deletion until + format: date-time + type: string + desired: + description: desired number of pods + type: integer + failed: + description: number of pods that failed + type: integer + phase: + description: job running, successfully completed, or failed + type: string + skipped: + description: number of nodes that were skipped e.g. because they are not a linux node + type: integer + succeeded: + description: number of pods that completed successfully + type: integer + required: + - desired + - failed + - phase + - skipped + - succeeded + type: object + type: object + served: true storage: false subresources: status: {} diff --git a/manifest_staging/deploy/eraser.yaml b/manifest_staging/deploy/eraser.yaml index 20290b6c34..11498248ba 100644 --- a/manifest_staging/deploy/eraser.yaml +++ b/manifest_staging/deploy/eraser.yaml @@ -22,55 +22,6 @@ spec: scope: Cluster versions: - name: v1 - schema: - openAPIV3Schema: - description: ImageJob is the Schema for the imagejobs API. - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - status: - description: ImageJobStatus defines the observed state of ImageJob. - properties: - deleteAfter: - description: Time to delay deletion until - format: date-time - type: string - desired: - description: desired number of pods - type: integer - failed: - description: number of pods that failed - type: integer - phase: - description: job running, successfully completed, or failed - type: string - skipped: - description: number of nodes that were skipped e.g. because they are not a linux node - type: integer - succeeded: - description: number of pods that completed successfully - type: integer - required: - - desired - - failed - - phase - - skipped - - succeeded - type: object - type: object - served: true - storage: true - subresources: - status: {} - - deprecated: true - deprecationWarning: v1alpha1 of the eraser API has been deprecated - name: v1alpha1 schema: openAPIV3Schema: description: ImageJob is the Schema for the imagejobs API. @@ -4191,6 +4142,55 @@ spec: type: object type: object served: true + storage: true + subresources: + status: {} + - deprecated: true + deprecationWarning: v1alpha1 of the eraser API has been deprecated + name: v1alpha1 + schema: + openAPIV3Schema: + description: ImageJob is the Schema for the imagejobs API. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + status: + description: ImageJobStatus defines the observed state of ImageJob. + properties: + deleteAfter: + description: Time to delay deletion until + format: date-time + type: string + desired: + description: desired number of pods + type: integer + failed: + description: number of pods that failed + type: integer + phase: + description: job running, successfully completed, or failed + type: string + skipped: + description: number of nodes that were skipped e.g. because they are not a linux node + type: integer + succeeded: + description: number of pods that completed successfully + type: integer + required: + - desired + - failed + - phase + - skipped + - succeeded + type: object + type: object + served: true storage: false subresources: status: {}