diff --git a/e2e/deployers/applicationset.go b/e2e/deployers/applicationset.go index 26167a33c..93d338b46 100644 --- a/e2e/deployers/applicationset.go +++ b/e2e/deployers/applicationset.go @@ -21,7 +21,7 @@ func (a ApplicationSet) Deploy(ctx types.Context) error { log.Infof("Deploying applicationset in namespace %q", managementNamespace) - err := CreateManagedClusterSetBinding(McsbName, managementNamespace) + err := CreateManagedClusterSetBinding(ctx, McsbName, managementNamespace) if err != nil { return err } diff --git a/e2e/deployers/crud.go b/e2e/deployers/crud.go index 352d9d5e2..dc2132d5f 100644 --- a/e2e/deployers/crud.go +++ b/e2e/deployers/crud.go @@ -35,7 +35,8 @@ const ( fMode = 0o600 ) -func CreateManagedClusterSetBinding(name, namespace string) error { +func CreateManagedClusterSetBinding(ctx types.Context, name, namespace string) error { + log := ctx.Logger() labels := make(map[string]string) labels[AppLabelKey] = namespace mcsb := &ocmv1b2.ManagedClusterSetBinding{ @@ -54,8 +55,12 @@ func CreateManagedClusterSetBinding(name, namespace string) error { if !errors.IsAlreadyExists(err) { return err } + + log.Debugf("ManagedClusterSetBinding \"%s/%s\" already exist", namespace, name) } + log.Debugf("Created ManagedClusterSetBinding \"%s/%s\"", namespace, name) + return nil } @@ -74,9 +79,11 @@ func DeleteManagedClusterSetBinding(ctx types.Context, name, namespace string) e return err } - log.Infof("ManagedClusterSetBinding %q not found", name) + log.Debugf("ManagedClusterSetBinding \"%s/%s\" not found", namespace, name) } + log.Debugf("Deleted ManagedClusterSetBinding \"%s/%s\"", namespace, name) + return nil } @@ -105,9 +112,11 @@ func CreatePlacement(ctx types.Context, name, namespace string) error { return err } - log.Info("Placement already Exists") + log.Debugf("Placement \"%s/%s\" already Exists", namespace, name) } + log.Debugf("Created placement \"%s/%s\"", namespace, name) + return nil } @@ -126,9 +135,11 @@ func DeletePlacement(ctx types.Context, name, namespace string) error { return err } - log.Info("Placement not found") + log.Debugf("Placement \"%s/%s\" not found", namespace, name) } + log.Debugf("Deleted placement \"%s/%s\"", namespace, name) + return nil } diff --git a/e2e/deployers/subscription.go b/e2e/deployers/subscription.go index 47d30e511..b2fec2597 100644 --- a/e2e/deployers/subscription.go +++ b/e2e/deployers/subscription.go @@ -43,7 +43,7 @@ func (s Subscription) Deploy(ctx types.Context) error { return err } - err = CreateManagedClusterSetBinding(McsbName, managementNamespace) + err = CreateManagedClusterSetBinding(ctx, McsbName, managementNamespace) if err != nil { return err } diff --git a/e2e/dractions/crud.go b/e2e/dractions/crud.go index ae1e22e54..54575953e 100644 --- a/e2e/dractions/crud.go +++ b/e2e/dractions/crud.go @@ -135,9 +135,11 @@ func createPlacementManagedByRamen(ctx types.Context, name, namespace string) er return err } - log.Info("Placement already Exists") + log.Debugf("Placement \"%s/%s\" already Exists", namespace, name) } + log.Debugf("Created placement \"%s/%s\"", namespace, name) + return nil } diff --git a/e2e/dractions/discovered.go b/e2e/dractions/discovered.go index 6c5e0eb74..519c93abd 100644 --- a/e2e/dractions/discovered.go +++ b/e2e/dractions/discovered.go @@ -25,7 +25,7 @@ func EnableProtectionDiscoveredApps(ctx types.Context) error { drpcName := name // create mcsb default in ramen-ops ns - if err := deployers.CreateManagedClusterSetBinding(deployers.McsbName, managementNamespace); err != nil { + if err := deployers.CreateManagedClusterSetBinding(ctx, deployers.McsbName, managementNamespace); err != nil { return err }