diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c456dca4..0b900221 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,9 @@ jobs: fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} + - name: "Verify CRD conversions" + run: make verify + - name: "Lowercase repository name for docker build" id: lowercase-repository-name run: echo "REPO_NAME=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV diff --git a/api/v1alpha1/conversion.go b/api/v1alpha1/conversion.go index 7bcb1e77..8095f03c 100644 --- a/api/v1alpha1/conversion.go +++ b/api/v1alpha1/conversion.go @@ -539,6 +539,10 @@ func (dst *WorkflowList) ConvertFrom(srcRaw conversion.Hub) error { // The conversion-gen tool dropped these from zz_generated.conversion.go to // force us to acknowledge that we are addressing the conversion requirements. +func Convert_v1alpha2_ClientMountStatus_To_v1alpha1_ClientMountStatus(in *dwsv1alpha2.ClientMountStatus, out *ClientMountStatus, s apiconversion.Scope) error { + return autoConvert_v1alpha2_ClientMountStatus_To_v1alpha1_ClientMountStatus(in, out, s) +} + func Convert_v1alpha1_ResourceErrorInfo_To_v1alpha2_ResourceErrorInfo(in *ResourceErrorInfo, out *dwsv1alpha2.ResourceErrorInfo, s apiconversion.Scope) error { return autoConvert_v1alpha1_ResourceErrorInfo_To_v1alpha2_ResourceErrorInfo(in, out, s) } diff --git a/api/v1alpha1/zz_generated.conversion.go b/api/v1alpha1/zz_generated.conversion.go index e3ed5f50..6aeca58d 100644 --- a/api/v1alpha1/zz_generated.conversion.go +++ b/api/v1alpha1/zz_generated.conversion.go @@ -168,11 +168,6 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha2.ClientMountStatus)(nil), (*ClientMountStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha2_ClientMountStatus_To_v1alpha1_ClientMountStatus(a.(*v1alpha2.ClientMountStatus), b.(*ClientMountStatus), scope) - }); err != nil { - return err - } if err := s.AddGeneratedConversionFunc((*ComputeBreakdown)(nil), (*v1alpha2.ComputeBreakdown)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha1_ComputeBreakdown_To_v1alpha2_ComputeBreakdown(a.(*ComputeBreakdown), b.(*v1alpha2.ComputeBreakdown), scope) }); err != nil { @@ -503,11 +498,6 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha2.StorageSpec)(nil), (*StorageSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha2_StorageSpec_To_v1alpha1_StorageSpec(a.(*v1alpha2.StorageSpec), b.(*StorageSpec), scope) - }); err != nil { - return err - } if err := s.AddGeneratedConversionFunc((*StorageStatus)(nil), (*v1alpha2.StorageStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha1_StorageStatus_To_v1alpha2_StorageStatus(a.(*StorageStatus), b.(*v1alpha2.StorageStatus), scope) }); err != nil { @@ -623,6 +613,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*v1alpha2.ClientMountStatus)(nil), (*ClientMountStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha2_ClientMountStatus_To_v1alpha1_ClientMountStatus(a.(*v1alpha2.ClientMountStatus), b.(*ClientMountStatus), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*v1alpha2.ResourceErrorInfo)(nil), (*ResourceErrorInfo)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha2_ResourceErrorInfo_To_v1alpha1_ResourceErrorInfo(a.(*v1alpha2.ResourceErrorInfo), b.(*ResourceErrorInfo), scope) }); err != nil { @@ -633,6 +628,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*v1alpha2.StorageSpec)(nil), (*StorageSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha2_StorageSpec_To_v1alpha1_StorageSpec(a.(*v1alpha2.StorageSpec), b.(*StorageSpec), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*v1alpha2.SystemConfigurationSpec)(nil), (*SystemConfigurationSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha2_SystemConfigurationSpec_To_v1alpha1_SystemConfigurationSpec(a.(*v1alpha2.SystemConfigurationSpec), b.(*SystemConfigurationSpec), scope) }); err != nil { @@ -989,17 +989,13 @@ func Convert_v1alpha1_ClientMountStatus_To_v1alpha2_ClientMountStatus(in *Client func autoConvert_v1alpha2_ClientMountStatus_To_v1alpha1_ClientMountStatus(in *v1alpha2.ClientMountStatus, out *ClientMountStatus, s conversion.Scope) error { out.Mounts = *(*[]ClientMountInfoStatus)(unsafe.Pointer(&in.Mounts)) + // WARNING: in.AllReady requires manual conversion: does not exist in peer-type if err := Convert_v1alpha2_ResourceError_To_v1alpha1_ResourceError(&in.ResourceError, &out.ResourceError, s); err != nil { return err } return nil } -// Convert_v1alpha2_ClientMountStatus_To_v1alpha1_ClientMountStatus is an autogenerated conversion function. -func Convert_v1alpha2_ClientMountStatus_To_v1alpha1_ClientMountStatus(in *v1alpha2.ClientMountStatus, out *ClientMountStatus, s conversion.Scope) error { - return autoConvert_v1alpha2_ClientMountStatus_To_v1alpha1_ClientMountStatus(in, out, s) -} - func autoConvert_v1alpha1_ComputeBreakdown_To_v1alpha2_ComputeBreakdown(in *ComputeBreakdown, out *v1alpha2.ComputeBreakdown, s conversion.Scope) error { if err := Convert_v1alpha1_ComputeConstraints_To_v1alpha2_ComputeConstraints(&in.Constraints, &out.Constraints, s); err != nil { return err diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index e6249afb..86615b82 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -18,4 +18,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/dataworkflowservices/dws - newTag: 0.1.2 + newTag: 0.1.3