fix panic error when scope obj is nil (#1406)

Signed-off-by: Prajyot-Parab <[email protected]>
Co-authored-by: Prajyot-Parab <[email protected]>

Author: k8s-infra-cherrypick-robot

controllers/ibmpowervscluster_controller.go

@@ -88,10 +88,12 @@ func (r *IBMPowerVSClusterReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		ServiceEndpoint:   r.ServiceEndpoint,
 	})
 
-	// Always close the scope when exiting this function so we can persist any GCPMachine changes.
+	// Always close the scope when exiting this function so we can persist any IBMPowerVSCluster changes.
 	defer func() {
-		if err := clusterScope.Close(); err != nil && reterr == nil {
-			reterr = err
+		if clusterScope != nil {
+			if err := clusterScope.Close(); err != nil && reterr == nil {
+				reterr = err
+			}
 		}
 	}()
 

controllers/ibmpowervsimage_controller.go

@@ -79,10 +79,13 @@ func (r *IBMPowerVSImageReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	if err != nil {
 		return ctrl.Result{}, errors.Errorf("failed to create scope: %+v", err)
 	}
-	// Always close the scope when exiting this function so we can persist any IBM PowerVS Image changes.
+
+	// Always close the scope when exiting this function so we can persist any IBMPowerVSImage changes.
 	defer func() {
-		if err := imageScope.Close(); err != nil && reterr == nil {
-			reterr = err
+		if imageScope != nil {
+			if err := imageScope.Close(); err != nil && reterr == nil {
+				reterr = err
+			}
 		}
 	}()
 

controllers/ibmpowervsmachine_controller.go

@@ -137,11 +137,13 @@ func (r *IBMPowerVSMachineReconciler) Reconcile(ctx context.Context, req ctrl.Re
 	if err != nil {
 		return ctrl.Result{}, errors.Errorf("failed to create scope: %v", err)
 	}
-	// Always close the scope when exiting this function so we can persist any GCPMachine changes.
 
+	// Always close the scope when exiting this function so we can persist any IBMPowerVSMachine changes.
 	defer func() {
-		if err := machineScope.Close(); err != nil && reterr == nil {
-			reterr = err
+		if machineScope != nil {
+			if err := machineScope.Close(); err != nil && reterr == nil {
+				reterr = err
+			}
 		}
 	}()
 

controllers/ibmvpccluster_controller.go

@@ -89,10 +89,12 @@ func (r *IBMVPCClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		ServiceEndpoint: r.ServiceEndpoint,
 	})
 
-	// Always close the scope when exiting this function so we can persist any GCPMachine changes.
+	// Always close the scope when exiting this function so we can persist any IBMVPCCluster changes.
 	defer func() {
-		if err := clusterScope.Close(); err != nil && reterr == nil {
-			reterr = err
+		if clusterScope != nil {
+			if err := clusterScope.Close(); err != nil && reterr == nil {
+				reterr = err
+			}
 		}
 	}()
 

controllers/ibmvpcmachine_controller.go

@@ -114,11 +114,13 @@ func (r *IBMVPCMachineReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	if err != nil {
 		return ctrl.Result{}, errors.Errorf("failed to create scope: %+v", err)
 	}
-	// Always close the scope when exiting this function, so we can persist any IBMVPCMachine changes.
 
+	// Always close the scope when exiting this function, so we can persist any IBMVPCMachine changes.
 	defer func() {
-		if err := machineScope.Close(); err != nil && reterr == nil {
-			reterr = err
+		if machineScope != nil {
+			if err := machineScope.Close(); err != nil && reterr == nil {
+				reterr = err
+			}
 		}
 	}()