e2e: make disable and undeploy actions idempotent

This change ensures that undeploy and disable actions handle
missing placement resources gracefully when calling
GetCurrentCluster, making them idempotent.

Signed-off-by: Parikshith <[email protected]>

Author: parikshithb

e2e/deployers/appset.go

@@ -7,6 +7,7 @@ import (
 	"github.com/ramendr/ramen/e2e/config"
 	"github.com/ramendr/ramen/e2e/types"
 	"github.com/ramendr/ramen/e2e/util"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
 type ApplicationSet struct{}
@@ -58,11 +59,16 @@ func (a ApplicationSet) Undeploy(ctx types.Context) error {
 
 	clusterName, err := util.GetCurrentCluster(util.Ctx.Hub, managementNamespace, name)
 	if err != nil {
-		return err
-	}
+		if !k8serrors.IsNotFound(err) {
+			return err
+		}
 
-	log.Infof("Undeploying applicationset app \"%s/%s\" in cluster %q",
-		ctx.AppNamespace(), ctx.Workload().GetAppName(), clusterName)
+		log.Debugf("Could not retrieve the cluster name: %s", err)
+		log.Infof("Undeploying applicationset app \"%s/%s\"", ctx.AppNamespace(), ctx.Workload().GetAppName())
+	} else {
+		log.Infof("Undeploying applicationset app \"%s/%s\" in cluster %q",
+			ctx.AppNamespace(), ctx.Workload().GetAppName(), clusterName)
+	}
 
 	err = DeleteApplicationSet(ctx, a)
 	if err != nil {

e2e/deployers/subscr.go

@@ -7,6 +7,7 @@ import (
 	"github.com/ramendr/ramen/e2e/config"
 	"github.com/ramendr/ramen/e2e/types"
 	"github.com/ramendr/ramen/e2e/util"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	subscriptionv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1"
 )
 
@@ -80,12 +81,17 @@ func (s Subscription) Undeploy(ctx types.Context) error {
 
 	clusterName, err := util.GetCurrentCluster(util.Ctx.Hub, managementNamespace, name)
 	if err != nil {
-		return err
+		if !k8serrors.IsNotFound(err) {
+			return err
+		}
+
+		log.Debugf("Could not retrieve the cluster name: %s", err)
+		log.Infof("Undeploying subscription app \"%s/%s\"", ctx.AppNamespace(), ctx.Workload().GetAppName())
+	} else {
+		log.Infof("Undeploying subscription app \"%s/%s\" in cluster %q",
+			ctx.AppNamespace(), ctx.Workload().GetAppName(), clusterName)
 	}
 
-	log.Infof("Undeploying subscription app \"%s/%s\" in cluster %q",
-		ctx.AppNamespace(), ctx.Workload().GetAppName(), clusterName)
-
 	err = DeleteSubscription(ctx, s)
 	if err != nil {
 		return err

e2e/dractions/actions.go

@@ -8,6 +8,7 @@ import (
 	"github.com/ramendr/ramen/e2e/config"
 	"github.com/ramendr/ramen/e2e/types"
 	"github.com/ramendr/ramen/e2e/util"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/util/retry"
 )
 
@@ -108,11 +109,16 @@ func DisableProtection(ctx types.Context) error {
 
 	clusterName, err := util.GetCurrentCluster(util.Ctx.Hub, managementNamespace, placementName)
 	if err != nil {
-		return err
-	}
+		if !k8serrors.IsNotFound(err) {
+			return err
+		}
 
-	log.Infof("Unprotecting workload \"%s/%s\" in cluster %q",
-		appNamespace, ctx.Workload().GetAppName(), clusterName)
+		log.Debugf("Could not retrieve the cluster name: %s", err)
+		log.Infof("Unprotecting workload \"%s/%s\"", appNamespace, ctx.Workload().GetAppName())
+	} else {
+		log.Infof("Unprotecting workload \"%s/%s\" in cluster %q",
+			appNamespace, ctx.Workload().GetAppName(), clusterName)
+	}
 
 	drpcName := name
 

e2e/dractions/disapp.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ramendr/ramen/e2e/deployers"
 	"github.com/ramendr/ramen/e2e/types"
 	"github.com/ramendr/ramen/e2e/util"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
 func EnableProtectionDiscoveredApps(ctx types.Context) error {
@@ -73,11 +74,16 @@ func DisableProtectionDiscoveredApps(ctx types.Context) error {
 
 	clusterName, err := util.GetCurrentCluster(util.Ctx.Hub, managementNamespace, placementName)
 	if err != nil {
-		return err
-	}
+		if !k8serrors.IsNotFound(err) {
+			return err
+		}
 
-	log.Infof("Unprotecting workload \"%s/%s\" in cluster %q",
-		appNamespace, ctx.Workload().GetAppName(), clusterName)
+		log.Debugf("Could not retrieve the cluster name: %s", err)
+		log.Infof("Unprotecting workload \"%s/%s\"", appNamespace, ctx.Workload().GetAppName())
+	} else {
+		log.Infof("Unprotecting workload \"%s/%s\" in cluster %q",
+			appNamespace, ctx.Workload().GetAppName(), clusterName)
+	}
 
 	if err := deleteDRPC(ctx, util.Ctx.Hub, managementNamespace, drpcName); err != nil {
 		return err