Merge pull request #449 from red-hat-storage/sync_us--main

Syncing latest changes from upstream main for ramen

config/dr-cluster/rbac/role.yaml

@@ -52,6 +52,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - apiextensions.k8s.io
   resources:

config/rbac/role.yaml

@@ -128,6 +128,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - cluster.open-cluster-management.io
   resources:

docs/e2e.md

@@ -56,7 +56,7 @@ To run all the tests:
 
 ### Run specific E2E tests
 
-The `-run` option is commonly used when debugging a failing test, developing
+The `-test.run` option is commonly used when debugging a failing test, developing
 a new test, or working on a new deployer or workload. It allows to selectively
 execute specific tests by matching full test names using regular expressions,
 making it easier to focus on specific scenarios.
@@ -69,7 +69,7 @@ available tests.
 Example:
 
 ```sh
-./run.sh -run TestSuites/Exhaustive/subscr-deploy-rbd-busybox
+./run.sh -test.run TestSuites/Exhaustive/subscr-deploy-rbd-busybox
 ```
 
 This command runs the specific test for subscription based RBD busybox application.
@@ -79,7 +79,7 @@ This command runs the specific test for subscription based RBD busybox applicati
 Example:
 
 ```sh
-./run.sh -run //appset
+./run.sh -test.run //appset
 ```
 
 This command runs all tests related to ApplicationSet, covering both RBD and
@@ -90,7 +90,7 @@ CephFS PVC based applications. Useful when focusing on a specific deployer.
 Example:
 
 ```sh
-./run.sh -run //rbd
+./run.sh -test.run //rbd
 ```
 
 This command runs all tests related to RBD PVCs across all deployers.

e2e/config.yaml.sample

@@ -1,12 +1,8 @@
----
-# Configuration file for RamenDR E2E testing on Regional DR.
-
-# Name of the channel used for the Channel CR. This channel is used by
-# OCM to pull the application from the specified Git repository.
-channelname: "ramen-gitops"
+# Configuration for RamenDR End to End testing.
 
+---
 # Namespace where the channel CR will be created.
-channelnamespace: "ramen-samples"
+channelnamespace: "e2e-gitops"
 
 # Git repository URL containing application manifests to be deployed on
 # the clusters.

e2e/dractions/actions.go

@@ -112,43 +112,83 @@ func DisableProtection(ctx types.Context) error {
 }
 
 func Failover(ctx types.Context) error {
-	d := ctx.Deployer()
-	if d.IsDiscovered() {
-		return FailoverDiscoveredApps(ctx)
-	}
-
 	managementNamespace := ctx.ManagementNamespace()
 	log := ctx.Logger()
+	name := ctx.Name()
+
+	drpcName := name
+	client := util.Ctx.Hub.Client
+	drPolicyName := util.DefaultDRPolicyName
 
-	log.Infof("Failing over workload in namespace %q", managementNamespace)
+	currentCluster, err := getCurrentCluster(client, managementNamespace, name)
+	if err != nil {
+		return err
+	}
 
-	return failoverRelocate(ctx, ramen.ActionFailover, ramen.FailedOver)
+	drpolicy, err := util.GetDRPolicy(client, drPolicyName)
+	if err != nil {
+		return err
+	}
+
+	targetCluster, err := getTargetCluster(client, managementNamespace, drpcName, drpolicy)
+	if err != nil {
+		return err
+	}
+
+	log.Infof("Failing over workload from cluster %q to cluster %q", currentCluster, targetCluster)
+
+	return failoverRelocate(ctx, ramen.ActionFailover, ramen.FailedOver, currentCluster, targetCluster)
 }
 
 // Determine DRPC
 // Check Placement
 // Relocate to Primary in DRPolicy as the PrimaryCluster
 // Update DRPC
 func Relocate(ctx types.Context) error {
-	d := ctx.Deployer()
-	if d.IsDiscovered() {
-		return RelocateDiscoveredApps(ctx)
-	}
-
 	managementNamespace := ctx.ManagementNamespace()
 	log := ctx.Logger()
+	name := ctx.Name()
 
-	log.Infof("Relocating workload in namespace %q", managementNamespace)
+	drpcName := name
+	client := util.Ctx.Hub.Client
+	drPolicyName := util.DefaultDRPolicyName
 
-	return failoverRelocate(ctx, ramen.ActionRelocate, ramen.Relocated)
+	currentCluster, err := getCurrentCluster(client, managementNamespace, name)
+	if err != nil {
+		return err
+	}
+
+	drpolicy, err := util.GetDRPolicy(client, drPolicyName)
+	if err != nil {
+		return err
+	}
+
+	targetCluster, err := getTargetCluster(client, managementNamespace, drpcName, drpolicy)
+	if err != nil {
+		return err
+	}
+
+	log.Infof("Relocating workload from cluster %q to cluster %q", currentCluster, targetCluster)
+
+	return failoverRelocate(ctx, ramen.ActionRelocate, ramen.Relocated, currentCluster, targetCluster)
 }
 
-func failoverRelocate(ctx types.Context, action ramen.DRAction, state ramen.DRState) error {
+func failoverRelocate(ctx types.Context,
+	action ramen.DRAction,
+	state ramen.DRState,
+	currentCluster string,
+	targetCluster string,
+) error {
+	d := ctx.Deployer()
+	if d.IsDiscovered() {
+		return failoverRelocateDiscoveredApps(ctx, action, state, currentCluster, targetCluster)
+	}
+
 	drpcName := ctx.Name()
 	managementNamespace := ctx.ManagementNamespace()
 	client := util.Ctx.Hub.Client
 
-	if err := waitAndUpdateDRPC(ctx, client, managementNamespace, drpcName, action); err != nil {
+	if err := waitAndUpdateDRPC(ctx, client, managementNamespace, drpcName, action, targetCluster); err != nil {
 		return err
 	}
 
@@ -164,6 +204,7 @@ func waitAndUpdateDRPC(
 	client client.Client,
 	namespace, drpcName string,
 	action ramen.DRAction,
+	targetCluster string,
 ) error {
 	log := ctx.Logger()
 
@@ -172,18 +213,6 @@ func waitAndUpdateDRPC(
 		return err
 	}
 
-	drPolicyName := util.DefaultDRPolicyName
-
-	drpolicy, err := util.GetDRPolicy(client, drPolicyName)
-	if err != nil {
-		return err
-	}
-
-	targetCluster, err := getTargetCluster(client, namespace, drpcName, drpolicy)
-	if err != nil {
-		return err
-	}
-
 	log.Info("Updating drpc " + strings.ToLower(string(action)) + " to " + targetCluster)
 
 	return retry.RetryOnConflict(retry.DefaultBackoff, func() error {

e2e/dractions/discovered.go

@@ -88,26 +88,14 @@ func DisableProtectionDiscoveredApps(ctx types.Context) error {
 	return deployers.DeleteManagedClusterSetBinding(ctx, deployers.McsbName, managementNamespace)
 }
 
-func FailoverDiscoveredApps(ctx types.Context) error {
-	log := ctx.Logger()
-	managementNamespace := ctx.ManagementNamespace()
-
-	log.Infof("Failing over workload in namespace %q", managementNamespace)
-
-	return failoverRelocateDiscoveredApps(ctx, ramen.ActionFailover, ramen.FailedOver)
-}
-
-func RelocateDiscoveredApps(ctx types.Context) error {
-	log := ctx.Logger()
-	managementNamespace := ctx.ManagementNamespace()
-
-	log.Infof("Relocating workload in namespace %q", managementNamespace)
-
-	return failoverRelocateDiscoveredApps(ctx, ramen.ActionRelocate, ramen.Relocated)
-}
-
 // nolint:funlen,cyclop
-func failoverRelocateDiscoveredApps(ctx types.Context, action ramen.DRAction, state ramen.DRState) error {
+func failoverRelocateDiscoveredApps(
+	ctx types.Context,
+	action ramen.DRAction,
+	state ramen.DRState,
+	currentCluster string,
+	targetCluster string,
+) error {
 	name := ctx.Name()
 	log := ctx.Logger()
 	managementNamespace := ctx.ManagementNamespace()
@@ -116,24 +104,14 @@ func failoverRelocateDiscoveredApps(ctx types.Context, action ramen.DRAction, st
 	drpcName := name
 	client := util.Ctx.Hub.Client
 
-	currentCluster, err := getCurrentCluster(client, managementNamespace, name)
-	if err != nil {
-		return err
-	}
-
 	drPolicyName := util.DefaultDRPolicyName
 
 	drpolicy, err := util.GetDRPolicy(client, drPolicyName)
 	if err != nil {
 		return err
 	}
 
-	targetCluster, err := getTargetCluster(client, managementNamespace, drpcName, drpolicy)
-	if err != nil {
-		return err
-	}
-
-	if err := waitAndUpdateDRPC(ctx, client, managementNamespace, drpcName, action); err != nil {
+	if err := waitAndUpdateDRPC(ctx, client, managementNamespace, drpcName, action, targetCluster); err != nil {
 		return err
 	}
 

e2e/util/channel.go

@@ -48,9 +48,9 @@ func createChannel() error {
 			return err
 		}
 
-		Ctx.Log.Infof("Channel %q already exists", GetChannelName())
+		Ctx.Log.Debugf("Channel \"%s/%s\" already exists", GetChannelNamespace(), GetChannelName())
 	} else {
-		Ctx.Log.Infof("Created channel %q", GetChannelName())
+		Ctx.Log.Infof("Created channel \"%s/%s\"", GetChannelNamespace(), GetChannelName())
 	}
 
 	return nil
@@ -70,9 +70,9 @@ func deleteChannel() error {
 			return err
 		}
 
-		Ctx.Log.Infof("Channel %q not found", GetChannelName())
+		Ctx.Log.Debugf("Channel \"%s/%s\" not found", GetChannelNamespace(), GetChannelName())
 	} else {
-		Ctx.Log.Infof("Channel %q is deleted", GetChannelName())
+		Ctx.Log.Infof("Deleted channel \"%s/%s\"", GetChannelNamespace(), GetChannelName())
 	}
 
 	return nil

e2e/util/config.go

@@ -5,14 +5,15 @@ package util
 
 import (
 	"fmt"
+	"regexp"
+	"strings"
 
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 )
 
 const (
-	defaultChannelName      = "ramen-gitops"
-	defaultChannelNamespace = "ramen-samples"
+	defaultChannelNamespace = "e2e-gitops"
 	defaultGitURL           = "https://github.com/RamenDR/ocm-ramen-samples.git"
 )
 
@@ -23,27 +24,28 @@ type PVCSpec struct {
 	UnsupportedDeployers []string
 }
 type TestConfig struct {
-	ChannelName      string
+	// User configurable values.
 	ChannelNamespace string
 	GitURL           string
 	Clusters         map[string]struct {
 		KubeconfigPath string
 	}
 	PVCSpecs []PVCSpec
+
+	// Generated values
+	channelName string
 }
 
-var config = &TestConfig{}
+var (
+	resourceNameForbiddenCharacters *regexp.Regexp
+	config                          = &TestConfig{}
+)
 
 //nolint:cyclop
 func ReadConfig(log *zap.SugaredLogger, configFile string) error {
-	viper.SetDefault("ChannelName", defaultChannelName)
 	viper.SetDefault("ChannelNamespace", defaultChannelNamespace)
 	viper.SetDefault("GitURL", defaultGitURL)
 
-	if err := viper.BindEnv("ChannelName", "ChannelName"); err != nil {
-		return (err)
-	}
-
 	if err := viper.BindEnv("ChannelNamespace", "ChannelNamespace"); err != nil {
 		return (err)
 	}
@@ -84,11 +86,13 @@ func ReadConfig(log *zap.SugaredLogger, configFile string) error {
 		return fmt.Errorf("failed to find pvcs in configuration")
 	}
 
+	config.channelName = resourceName(config.GitURL)
+
 	return nil
 }
 
 func GetChannelName() string {
-	return config.ChannelName
+	return config.channelName
 }
 
 func GetChannelNamespace() string {
@@ -102,3 +106,15 @@ func GetGitURL() string {
 func GetPVCSpecs() []PVCSpec {
 	return config.PVCSpecs
 }
+
+// resourceName convert a URL to conventional k8s resource name:
+// "https://github.com/foo/bar.git" -> "https-github-com-foo-bar-git"
+// https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#dns-subdomain-names
+func resourceName(url string) string {
+	return strings.ToLower(resourceNameForbiddenCharacters.ReplaceAllString(url, "-"))
+}
+
+func init() {
+	// Matches one of more forbidden characters, so we can replace them with single replacement character.
+	resourceNameForbiddenCharacters = regexp.MustCompile(`[^\w]+`)
+}