Merge pull request #242 from openshift-cherrypick-robot/cherry-pick-2…

…41-to-release-4.18 DFBUGS-939: [release-4.18] Initialize Mirroring spec to avoid nil pointer exception
red-hat-storage · Nov 28, 2024 · f334667 · f334667
2 parents 17353b7 + 54579d1
commit f334667
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/addons/agent_mirrorpeer_controller.go b/addons/agent_mirrorpeer_controller.go
@@ -374,6 +374,9 @@ func (r *MirrorPeerReconciler) toggleMirroring(ctx context.Context, storageClust
 
 	// Determine if mirroring should be enabled or disabled
 	if enabled {
+		if sc.Spec.Mirroring == nil {
+			sc.Spec.Mirroring = &ocsv1.MirroringSpec{}
+		}
 		oppPeers := getOppositePeerRefs(mp, r.SpokeClusterName)
 		if hasRequiredSecret(sc.Spec.Mirroring.PeerSecretNames, oppPeers) {
 			sc.Spec.Mirroring.Enabled = true
@@ -382,7 +385,7 @@ func (r *MirrorPeerReconciler) toggleMirroring(ctx context.Context, storageClust
 			return fmt.Errorf("StorageCluster %q does not have required PeerSecrets", storageClusterName)
 		}
 	} else {
-		sc.Spec.Mirroring.Enabled = false
+		sc.Spec.Mirroring = nil
 		r.Logger.Info("Mirroring disabled on StorageCluster", "storageClusterName", storageClusterName)
 	}
 

diff --git a/addons/agent_mirrorpeer_controller_test.go b/addons/agent_mirrorpeer_controller_test.go
@@ -246,7 +246,7 @@ func TestDisableMirroring(t *testing.T) {
 			t.Error("failed to get storage cluster", err)
 		}
 
-		if sc.Spec.Mirroring.Enabled {
+		if sc.Spec.Mirroring != nil {
 			t.Error("failed to disable mirroring")
 		}
 	}

diff --git a/addons/rook_secret_handler.go b/addons/rook_secret_handler.go
@@ -197,6 +197,9 @@ func updateStorageCluster(secretName, storageClusterName, storageClusterNamespac
 	}
 
 	// Update secret name
+	if sc.Spec.Mirroring == nil {
+		sc.Spec.Mirroring = &ocsv1.MirroringSpec{}
+	}
 	if !utils.ContainsString(sc.Spec.Mirroring.PeerSecretNames, secretName) {
 		sc.Spec.Mirroring.PeerSecretNames = append(sc.Spec.Mirroring.PeerSecretNames, secretName)
 		err := spokeClient.Update(ctx, sc)