Merge pull request #429 from raghavendra-talur/rtalur-backport-997-2

BUG DFBUGS-997: Backport fixes for check hooks
red-hat-storage · Dec 26, 2024 · 1fd8bf8 · 1fd8bf8
2 parents 811d6d4 + b6b9ca5
commit 1fd8bf8
Show file tree

Hide file tree

Showing 23 changed files with 439 additions and 103 deletions.
diff --git a/e2e/dractions/actions.go b/e2e/dractions/actions.go
@@ -64,6 +64,7 @@ func EnableProtection(w workloads.Workload, d deployers.Deployer) error {
 		if placement.Annotations == nil {
 			placement.Annotations = make(map[string]string)
 		}
+
 		placement.Annotations[OcmSchedulingDisable] = "true"
 
 		return updatePlacement(util.Ctx.Hub.CtrlClient, placement)

diff --git a/internal/controller/cel/cel_drclusters_test.go b/internal/controller/cel/cel_drclusters_test.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cel_test
 
 import (

diff --git a/internal/controller/cel/cel_drplacementcontrol_test.go b/internal/controller/cel/cel_drplacementcontrol_test.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cel_test
 
 import (

diff --git a/internal/controller/cel/cel_drpolicy_test.go b/internal/controller/cel/cel_drpolicy_test.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cel_test
 
 import (

diff --git a/internal/controller/cephfscg/cephfscg_suite_test.go b/internal/controller/cephfscg/cephfscg_suite_test.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cephfscg_test
 
 import (

diff --git a/internal/controller/cephfscg/cghandler.go b/internal/controller/cephfscg/cghandler.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cephfscg
 
 import (

diff --git a/internal/controller/cephfscg/cghandler_test.go b/internal/controller/cephfscg/cghandler_test.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cephfscg_test
 
 import (

diff --git a/internal/controller/cephfscg/replicationgroupdestination.go b/internal/controller/cephfscg/replicationgroupdestination.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cephfscg
 
 import (

diff --git a/internal/controller/cephfscg/replicationgroupdestination_test.go b/internal/controller/cephfscg/replicationgroupdestination_test.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cephfscg_test
 
 import (

diff --git a/internal/controller/cephfscg/replicationgroupsource.go b/internal/controller/cephfscg/replicationgroupsource.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cephfscg
 
 import (

diff --git a/internal/controller/cephfscg/replicationgroupsource_test.go b/internal/controller/cephfscg/replicationgroupsource_test.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cephfscg_test
 
 import (

diff --git a/internal/controller/cephfscg/utils.go b/internal/controller/cephfscg/utils.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cephfscg
 
 import (

diff --git a/internal/controller/cephfscg/volumegroupsourcehandler.go b/internal/controller/cephfscg/volumegroupsourcehandler.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cephfscg
 
 import (

diff --git a/internal/controller/cephfscg/volumegroupsourcehandler_test.go b/internal/controller/cephfscg/volumegroupsourcehandler_test.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package cephfscg_test
 
 import (
@@ -211,13 +214,15 @@ func CreateRS(rsName string) {
 func UpdateRS(rsName string) {
 	retryErr := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
 		rs := &volsyncv1alpha1.ReplicationSource{}
+
 		err := k8sClient.Get(context.TODO(), types.NamespacedName{
 			Name:      rsName,
 			Namespace: "default",
 		}, rs)
 		if err != nil {
 			return err
 		}
+
 		rs.Status = &volsyncv1alpha1.ReplicationSourceStatus{
 			LastManualSync: manualString,
 		}
@@ -249,13 +254,15 @@ func GenerateReplicationGroupSource(
 func UpdateVGS(rgs *v1alpha1.ReplicationGroupSource, vsName, pvcName string) {
 	retryErr := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
 		volumeGroupSnapshot := &vgsv1alphfa1.VolumeGroupSnapshot{}
+
 		err := k8sClient.Get(context.TODO(), types.NamespacedName{
 			Name:      fmt.Sprintf(cephfscg.VolumeGroupSnapshotNameFormat, rgs.Name),
 			Namespace: rgs.Namespace,
 		}, volumeGroupSnapshot)
 		if err != nil {
 			return err
 		}
+
 		ready := true
 		volumeGroupSnapshot.Status = &vgsv1alphfa1.VolumeGroupSnapshotStatus{
 			ReadyToUse: &ready,

diff --git a/internal/controller/drplacementcontrol_controller.go b/internal/controller/drplacementcontrol_controller.go
@@ -1128,7 +1128,6 @@ func getVRGsFromManagedClusters(
 	vrgs := map[string]*rmn.VolumeReplicationGroup{}
 
 	annotations := make(map[string]string)
-
 	annotations[DRPCNameAnnotation] = drpc.Name
 	annotations[DRPCNamespaceAnnotation] = drpc.Namespace
 
@@ -1144,6 +1143,7 @@ func getVRGsFromManagedClusters(
 			// Only NotFound error is accepted
 			if errors.IsNotFound(err) {
 				log.Info(fmt.Sprintf("VRG not found on %q", drCluster.Name))
+
 				numClustersQueriedSuccessfully++
 
 				continue

diff --git a/internal/controller/util/cephfs_cg.go b/internal/controller/util/cephfs_cg.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package util
 
 import (

diff --git a/internal/controller/util/cephfs_cg_test.go b/internal/controller/util/cephfs_cg_test.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
 package util_test
 
 import (