DiskOffering is optional and thus should be a ptr

Author: hrak

api/v1beta1/zz_generated.conversion.go

@@ -53,7 +53,7 @@ type CloudStackMachineSpec struct {
 
 	// CloudStack disk offering to use.
 	// +optional
-	DiskOffering CloudStackResourceDiskOffering `json:"diskOffering,omitempty"`
+	DiskOffering *CloudStackResourceDiskOffering `json:"diskOffering,omitempty"`
 
 	// CloudStack ssh key to use.
 	// +optional

api/v1beta2/zz_generated.conversion.go

@@ -43,7 +43,7 @@ var _ = Describe("CloudStackMachineTemplate webhook", func() {
 		})
 
 		It("Should accept a CloudStackMachineTemplate when missing the VM Disk Offering attribute", func() {
-			dummies.CSMachineTemplate1.Spec.Template.Spec.DiskOffering = infrav1.CloudStackResourceDiskOffering{
+			dummies.CSMachineTemplate1.Spec.Template.Spec.DiskOffering = &infrav1.CloudStackResourceDiskOffering{
 				CloudStackResourceIdentifier: infrav1.CloudStackResourceIdentifier{Name: "", ID: ""},
 			}
 			Expect(k8sClient.Create(ctx, dummies.CSMachineTemplate1)).Should(Succeed())
@@ -74,7 +74,7 @@ var _ = Describe("CloudStackMachineTemplate webhook", func() {
 		})
 
 		It("should reject VM disk offering updates to the CloudStackMachineTemplate", func() {
-			dummies.CSMachineTemplate1.Spec.Template.Spec.DiskOffering = infrav1.CloudStackResourceDiskOffering{
+			dummies.CSMachineTemplate1.Spec.Template.Spec.DiskOffering = &infrav1.CloudStackResourceDiskOffering{
 				CloudStackResourceIdentifier: infrav1.CloudStackResourceIdentifier{Name: "DiskOffering2"}}
 			Ω(k8sClient.Update(ctx, dummies.CSMachineTemplate1)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "diskOffering")))

api/v1beta3/cloudstackmachine_types.go

@@ -515,7 +515,7 @@ var _ = Describe("Instance", func() {
 				dummies.CSMachine1.Spec.Template.ID = ""
 				dummies.CSMachine1.Spec.Offering.Name = "offering"
 				dummies.CSMachine1.Spec.Template.Name = "template"
-				dummies.CSMachine1.Spec.DiskOffering = infrav1.CloudStackResourceDiskOffering{}
+				dummies.CSMachine1.Spec.DiskOffering = &infrav1.CloudStackResourceDiskOffering{}
 
 				sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return(&cloudstack.ServiceOffering{
 					Id:        offeringFakeID,

api/v1beta3/cloudstackmachinetemplate_webhook_test.go

@@ -82,7 +82,7 @@ var ( // Declare exported dummy vars.
 	EndPointHost            string
 	EndPointPort            int32
 	CSConf                  *simpleyaml.Yaml
-	DiskOffering            infrav1.CloudStackResourceDiskOffering
+	DiskOffering            *infrav1.CloudStackResourceDiskOffering
 	BootstrapSecret         *corev1.Secret
 	BootstrapSecretName     string
 	CSMachineOwner          *fakes.CloudStackMachineOwner
@@ -118,7 +118,7 @@ func SetDummyVars() {
 }
 
 func SetDiskOfferingVars() {
-	DiskOffering = infrav1.CloudStackResourceDiskOffering{CloudStackResourceIdentifier: infrav1.CloudStackResourceIdentifier{Name: "Small"},
+	DiskOffering = &infrav1.CloudStackResourceDiskOffering{CloudStackResourceIdentifier: infrav1.CloudStackResourceIdentifier{Name: "Small"},
 		MountPath:  "/data",
 		Device:     "/dev/vdb",
 		Filesystem: "ext4",
@@ -232,7 +232,7 @@ func SetDummyCSMachineVars() {
 			Offering: infrav1.CloudStackResourceIdentifier{
 				Name: GetYamlVal("CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING"),
 			},
-			DiskOffering: infrav1.CloudStackResourceDiskOffering{
+			DiskOffering: &infrav1.CloudStackResourceDiskOffering{
 				CloudStackResourceIdentifier: infrav1.CloudStackResourceIdentifier{
 					Name: "DiskOffering",
 				},