Remove extra object meta from cloudstack machine template

Author: vignesh-goutham

Makefile

@@ -298,6 +298,9 @@ run-e2e-smoke:
 	./hack/ensure-cloud-config-yaml.sh
 	JOB="\"CAPC E2E SMOKE TEST\"" $(MAKE) run-e2e
 
+run-e2e-smoke:
+	JOB="\"CAPC E2E SMOKE TEST\"" $(MAKE) run-e2e
+
 ##@ Cleanup
 ## --------------------------------------
 ## Cleanup

api/v1beta1/cloudstackaffinitygroup_conversion.go

@@ -17,16 +17,16 @@ limitations under the License.
 package v1beta1
 
 import (
-	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
+	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
 func (src *CloudStackAffinityGroup) ConvertTo(dstRaw conversion.Hub) error { // nolint
-	dst := dstRaw.(*v1beta2.CloudStackAffinityGroup)
-	return Convert_v1beta1_CloudStackAffinityGroup_To_v1beta2_CloudStackAffinityGroup(src, dst, nil)
+	dst := dstRaw.(*v1beta3.CloudStackAffinityGroup)
+	return Convert_v1beta1_CloudStackAffinityGroup_To_v1beta3_CloudStackAffinityGroup(src, dst, nil)
 }
 
 func (dst *CloudStackAffinityGroup) ConvertFrom(srcRaw conversion.Hub) error { // nolint
-	src := srcRaw.(*v1beta2.CloudStackAffinityGroup)
-	return Convert_v1beta2_CloudStackAffinityGroup_To_v1beta1_CloudStackAffinityGroup(src, dst, nil)
+	src := srcRaw.(*v1beta3.CloudStackAffinityGroup)
+	return Convert_v1beta3_CloudStackAffinityGroup_To_v1beta1_CloudStackAffinityGroup(src, dst, nil)
 }

api/v1beta1/zz_generated.conversion.go

@@ -89,6 +89,7 @@ type CloudStackMachineSpec struct {
 	// cloud-init has built-in support for gzip-compressed user data, ignition does not
 	//
 	// +optional
+	// +k8s:conversion-gen=false
 	UncompressedUserData *bool `json:"uncompressedUserData,omitempty"`
 }
 
@@ -139,10 +140,12 @@ type CloudStackMachineStatus struct {
 
 	// Status indicates the status of the provider resource.
 	// +optional
+	// +k8s:conversion-gen=false
 	Status *string `json:"status,omitempty"`
 
 	// Reason indicates the reason of status failure
 	// +optional
+	// +k8s:conversion-gen=false
 	Reason *string `json:"reason,omitempty"`
 }
 

api/v1beta2/cloudstackmachine_types.go

@@ -37,7 +37,6 @@ type CloudStackAffinityGroupSpec struct {
 
 	// FailureDomainName -- the name of the FailureDomain the machine is placed in.
 	// +optional
-	// +k8s:conversion-gen=false
 	FailureDomainName string `json:"failureDomainName,omitempty"`
 }
 

api/v1beta3/cloudstackaffinitygroup_types.go

@@ -37,7 +37,6 @@ type CloudStackIsolatedNetworkSpec struct {
 	// The kubernetes control plane endpoint.
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
 
-	//+k8s:conversion-gen=false
 	// FailureDomainName -- the FailureDomain the network is placed in.
 	FailureDomainName string `json:"failureDomainName"`
 }

api/v1beta3/cloudstackisolatednetwork_types.go

@@ -82,7 +82,6 @@ type CloudStackMachineSpec struct {
 
 	// FailureDomainName -- the name of the FailureDomain the machine is placed in.
 	// +optional
-	// +k8s:conversion-gen=false
 	FailureDomainName string `json:"failureDomainName,omitempty"`
 
 	// UncompressedUserData specifies whether the user data is gzip-compressed.

api/v1beta3/cloudstackmachine_types.go

@@ -18,18 +18,9 @@ package v1beta3
 
 import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-type CloudStackMachineTemplateResource struct {
-	// Standard object's metadata.
-	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
-	// +optional
-	// +nullable
-	ObjectMeta metav1.ObjectMeta     `json:"metadata,omitempty"`
-	Spec       CloudStackMachineSpec `json:"spec"`
-}
-
 // CloudStackMachineTemplateSpec defines the desired state of CloudStackMachineTemplate
 type CloudStackMachineTemplateSpec struct {
-	Spec CloudStackMachineTemplateResource `json:"template"`
+	Template CloudStackMachineSpec `json:"template"`
 }
 
 //+kubebuilder:object:root=true

api/v1beta3/cloudstackmachinetemplate_types.go

@@ -57,8 +57,8 @@ func (r *CloudStackMachineTemplate) ValidateCreate() error {
 
 	var errorList field.ErrorList
 
-	// CloudStackMachineTemplateSpec.CloudStackMachineTemplateResource.CloudStackMachineSpec
-	spec := r.Spec.Spec.Spec
+	// CloudStackMachineTemplateSpec.CloudStackMachineSpec
+	spec := r.Spec.Template
 
 	affinity := strings.ToLower(spec.Affinity)
 	if !(affinity == "" || affinity == "no" || affinity == "pro" || affinity == "anti") {
@@ -86,8 +86,8 @@ func (r *CloudStackMachineTemplate) ValidateUpdate(old runtime.Object) error {
 	}
 
 	// CloudStackMachineTemplateSpec.CloudStackMachineTemplateResource.CloudStackMachineSpec
-	spec := r.Spec.Spec.Spec
-	oldSpec := oldMachineTemplate.Spec.Spec.Spec
+	spec := r.Spec.Template
+	oldSpec := oldMachineTemplate.Spec.Template
 
 	errorList := field.ErrorList(nil)
 	errorList = webhookutil.EnsureEqualStrings(spec.Offering.ID, oldSpec.Offering.ID, "offering", errorList)