Revert "customize v1beta1 affinity group conversion to v1beta2"

This reverts commit 9cefd10.

Author: wanyufe

api/v1beta1/cloudstackaffinitygroup_conversion.go

@@ -17,10 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	"context"
-	conv "k8s.io/apimachinery/pkg/conversion"
 	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
@@ -33,44 +30,3 @@ func (dst *CloudStackAffinityGroup) ConvertFrom(srcRaw conversion.Hub) error { /
 	src := srcRaw.(*v1beta2.CloudStackAffinityGroup)
 	return Convert_v1beta2_CloudStackAffinityGroup_To_v1beta1_CloudStackAffinityGroup(src, dst, nil)
 }
-
-//nolint:golint,revive,stylecheck
-func Convert_v1beta1_CloudStackAffinityGroup_To_v1beta2_CloudStackAffinityGroup(in *CloudStackAffinityGroup, out *v1beta2.CloudStackAffinityGroup, s conv.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
-
-	csCluster := &v1beta2.CloudStackCluster{}
-	clusterName := in.ObjectMeta.Labels["cluster.x-k8s.io/cluster-name"]
-	namespace := in.ObjectMeta.Namespace
-	key := client.ObjectKey{Name: clusterName, Namespace: namespace}
-	if err := v1beta2.K8sClient.Get(context.TODO(), key, csCluster); err != nil {
-		return err
-	}
-
-	out.Spec = v1beta2.CloudStackAffinityGroupSpec{
-		Type:              in.Spec.Type,
-		Name:              in.Spec.Name,
-		ID:                in.Spec.ID,
-		FailureDomainName: csCluster.Spec.FailureDomains[0].Name,
-	}
-
-	out.Status = v1beta2.CloudStackAffinityGroupStatus{
-		Ready: in.Status.Ready,
-	}
-	return nil
-}
-
-//nolint:golint,revive,stylecheck
-func Convert_v1beta2_CloudStackAffinityGroup_To_v1beta1_CloudStackAffinityGroup(in *v1beta2.CloudStackAffinityGroup, out *CloudStackAffinityGroup, s conv.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
-
-	out.Spec = CloudStackAffinityGroupSpec{
-		Type: in.Spec.Type,
-		Name: in.Spec.Name,
-		ID:   in.Spec.ID,
-	}
-
-	out.Status = CloudStackAffinityGroupStatus{
-		Ready: in.Status.Ready,
-	}
-	return nil
-}

api/v1beta1/cloudstackaffinitygroup_types.go

@@ -24,7 +24,6 @@ const (
 	AffinityGroupFinalizer = "affinitygroup.infrastructure.cluster.x-k8s.io"
 )
 
-//+k8s:conversion-gen=false
 // CloudStackAffinityGroupSpec defines the desired state of CloudStackAffinityGroup
 type CloudStackAffinityGroupSpec struct {
 	// Mutually exclusive parameter with AffinityGroupIDs.
@@ -39,7 +38,6 @@ type CloudStackAffinityGroupSpec struct {
 	ID string `json:"id,omitempty"`
 }
 
-//+k8s:conversion-gen=false
 // CloudStackAffinityGroupStatus defines the observed state of CloudStackAffinityGroup
 type CloudStackAffinityGroupStatus struct {
 	// Reflects the readiness of the CS Affinity Group.
@@ -48,7 +46,7 @@ type CloudStackAffinityGroupStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+k8s:conversion-gen=false
+
 // CloudStackAffinityGroup is the Schema for the cloudstackaffinitygroups API
 type CloudStackAffinityGroup struct {
 	metav1.TypeMeta   `json:",inline"`

api/v1beta1/conversion_test.go

@@ -26,6 +26,8 @@ import (
 	capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
+
+
 var _ = Describe("Conversion", func() {
 	BeforeEach(func() { // Reset test vars to initial state.
 	})

api/v1beta1/zz_generated.conversion.go

@@ -21,10 +21,10 @@ patchesStrategicMerge:
 - patches/webhook_in_cloudstackmachines.yaml
 - patches/webhook_in_cloudstackmachinetemplates.yaml
 - patches/webhook_in_cloudstackisolatednetworks.yaml
-# - patches/webhook_in_cloudstackzones.yaml
+- patches/webhook_in_cloudstackzones.yaml
 - patches/webhook_in_cloudstackaffinitygroups.yaml
 - patches/webhook_in_cloudstackmachinestatecheckers.yaml
-# - patches/webhook_in_cloudstackfailuredomains.yaml
+- patches/webhook_in_cloudstackfailuredomains.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # patches here are for enabling the CA injection for each CRD