e2e: update info logs for deploy/undeploy

Update info logs in deploy/undeploy functions for appset, subscription and discoverd apps in deployers package to log clustername of the workload. Signed-off-by: Parikshith <[email protected]>
RamenDR · Feb 20, 2025 · 644efd2 · 644efd2
1 parent 0ba920e
commit 644efd2
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 16 deletions.
diff --git a/e2e/deployers/applicationset.go b/e2e/deployers/applicationset.go
@@ -5,6 +5,7 @@ package deployers
 
 import (
 	"github.com/ramendr/ramen/e2e/types"
+	"github.com/ramendr/ramen/e2e/util"
 )
 
 const (
@@ -19,8 +20,6 @@ func (a ApplicationSet) Deploy(ctx types.Context) error {
 	log := ctx.Logger()
 	managementNamespace := ctx.ManagementNamespace()
 
-	log.Infof("Deploying applicationset in namespace %q", managementNamespace)
-
 	err := CreateManagedClusterSetBinding(ctx, McsbName, managementNamespace)
 	if err != nil {
 		return err
@@ -41,7 +40,15 @@ func (a ApplicationSet) Deploy(ctx types.Context) error {
 		return err
 	}
 
-	return err
+	clusterName, err := util.GetCurrentCluster(util.Ctx.Hub.Client, managementNamespace, name)
+	if err != nil {
+		return err
+	}
+
+	log.Infof("Deployed applicationset app \"%s/%s\" on cluster %q",
+		ctx.AppNamespace(), ctx.Workload().GetAppName(), clusterName)
+
+	return nil
 }
 
 // Undeploy deletes an ApplicationSet from the hub cluster, deleting the workload from the managed clusters.
@@ -50,13 +57,19 @@ func (a ApplicationSet) Undeploy(ctx types.Context) error {
 	log := ctx.Logger()
 	managementNamespace := ctx.ManagementNamespace()
 
-	log.Infof("Undeploying applicationset in namespace %q", managementNamespace)
-
 	err := DeleteApplicationSet(ctx, a)
 	if err != nil {
 		return err
 	}
 
+	clusterName, err := util.GetCurrentCluster(util.Ctx.Hub.Client, managementNamespace, name)
+	if err != nil {
+		return err
+	}
+
+	log.Infof("Undeployed applicationset app \"%s/%s\" on cluster %q",
+		ctx.AppNamespace(), ctx.Workload().GetAppName(), clusterName)
+
 	err = DeleteConfigMap(ctx, name, managementNamespace)
 	if err != nil {
 		return err

diff --git a/e2e/deployers/discoveredapp.go b/e2e/deployers/discoveredapp.go
@@ -31,8 +31,6 @@ func (d DiscoveredApp) Deploy(ctx types.Context) error {
 	log := ctx.Logger()
 	appNamespace := ctx.AppNamespace()
 
-	log.Infof("Deploying workload in namespace %q", appNamespace)
-
 	// create namespace in both dr clusters
 	if err := util.CreateNamespaceAndAddAnnotation(appNamespace); err != nil {
 		return err
@@ -70,7 +68,8 @@ func (d DiscoveredApp) Deploy(ctx types.Context) error {
 		return err
 	}
 
-	log.Info("Workload deployed")
+	log.Infof("Deployed discovered app \"%s/%s\" on cluster %q",
+		appNamespace, ctx.Workload().GetAppName(), drpolicy.Spec.DRClusters[0])
 
 	return nil
 }
@@ -80,8 +79,6 @@ func (d DiscoveredApp) Undeploy(ctx types.Context) error {
 	log := ctx.Logger()
 	appNamespace := ctx.AppNamespace()
 
-	log.Infof("Undeploying workload in namespace %q", appNamespace)
-
 	drpolicy, err := util.GetDRPolicy(util.Ctx.Hub.Client, util.DefaultDRPolicyName)
 	if err != nil {
 		return err
@@ -113,7 +110,7 @@ func (d DiscoveredApp) Undeploy(ctx types.Context) error {
 		return err
 	}
 
-	log.Info("Workload undeployed")
+	log.Infof("Undeployed discovered app \"%s/%s\"", appNamespace, ctx.Workload().GetAppName())
 
 	return nil
 }

diff --git a/e2e/deployers/subscription.go b/e2e/deployers/subscription.go
@@ -35,8 +35,6 @@ func (s Subscription) Deploy(ctx types.Context) error {
 	log := ctx.Logger()
 	managementNamespace := ctx.ManagementNamespace()
 
-	log.Infof("Deploying subscription in namespace %q", managementNamespace)
-
 	// create subscription namespace
 	err := util.CreateNamespace(util.Ctx.Hub.Client, managementNamespace, log)
 	if err != nil {
@@ -58,7 +56,20 @@ func (s Subscription) Deploy(ctx types.Context) error {
 		return err
 	}
 
-	return waitSubscriptionPhase(ctx, managementNamespace, name, subscriptionv1.SubscriptionPropagated)
+	err = waitSubscriptionPhase(ctx, managementNamespace, name, subscriptionv1.SubscriptionPropagated)
+	if err != nil {
+		return err
+	}
+
+	clusterName, err := util.GetCurrentCluster(util.Ctx.Hub.Client, managementNamespace, name)
+	if err != nil {
+		return err
+	}
+
+	log.Infof("Deployed subscription app \"%s/%s\" on cluster %q",
+		ctx.AppNamespace(), ctx.Workload().GetAppName(), clusterName)
+
+	return nil
 }
 
 // Undeploy deletes a subscription from the hub cluster, deleting the workload from the managed clusters.
@@ -67,13 +78,19 @@ func (s Subscription) Undeploy(ctx types.Context) error {
 	log := ctx.Logger()
 	managementNamespace := ctx.ManagementNamespace()
 
-	log.Infof("Undeploying subscription in namespace %q", managementNamespace)
-
 	err := DeleteSubscription(ctx, s)
 	if err != nil {
 		return err
 	}
 
+	clusterName, err := util.GetCurrentCluster(util.Ctx.Hub.Client, managementNamespace, name)
+	if err != nil {
+		return err
+	}
+
+	log.Infof("Undeployed subscription app \"%s/%s\" on cluster %q",
+		ctx.AppNamespace(), ctx.Workload().GetAppName(), clusterName)
+
 	err = DeletePlacement(ctx, name, managementNamespace)
 	if err != nil {
 		return err