Merge pull request #3112 from chrischdi/pr-vm-operator-fix-nilpointer…

…-assertion 🐛 vmoperator: fix nil pointer when reconciling VM
kubernetes-sigs · Jul 18, 2024 · fc181b6 · fc181b6
2 parents d553844 + e5058c6
commit fc181b6
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pkg/services/vmoperator/vmopmachine.go b/pkg/services/vmoperator/vmopmachine.go
@@ -417,11 +417,13 @@ func (v *VmopMachineService) reconcileVMOperatorVM(ctx context.Context, supervis
 			vmOperatorVM.Spec.StorageClass = supervisorMachineCtx.VSphereMachine.Spec.StorageClass
 		}
 		vmOperatorVM.Spec.PowerState = vmoprv1.VirtualMachinePowerStateOn
-		if vmOperatorVM.Spec.Reserved == nil && supervisorMachineCtx.VSphereCluster.Status.ResourcePolicyName != "" {
-			vmOperatorVM.Spec.Reserved = &vmoprv1.VirtualMachineReservedSpec{}
-		}
-		if vmOperatorVM.Spec.Reserved.ResourcePolicyName == "" {
-			vmOperatorVM.Spec.Reserved.ResourcePolicyName = supervisorMachineCtx.VSphereCluster.Status.ResourcePolicyName
+		if supervisorMachineCtx.VSphereCluster.Status.ResourcePolicyName != "" {
+			if vmOperatorVM.Spec.Reserved == nil {
+				vmOperatorVM.Spec.Reserved = &vmoprv1.VirtualMachineReservedSpec{}
+			}
+			if vmOperatorVM.Spec.Reserved.ResourcePolicyName == "" {
+				vmOperatorVM.Spec.Reserved.ResourcePolicyName = supervisorMachineCtx.VSphereCluster.Status.ResourcePolicyName
+			}
 		}
 		if vmOperatorVM.Spec.Bootstrap == nil {
 			vmOperatorVM.Spec.Bootstrap = &vmoprv1.VirtualMachineBootstrapSpec{}