Skip to content

Commit

Permalink
Use per test logger for more clear logs
Browse files Browse the repository at this point in the history 
Signed-off-by: Nir Soffer <nsoffer@redhat.com>
  • Loading branch information
@nirs
nirs committed Oct 30, 2024
1 parent 866f6ed commit 3b6e253
Show file tree
Hide file tree
Showing 12 changed files with 161 additions and 136 deletions.
22 changes: 12 additions & 10 deletions e2e/deployers/applicationset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,26 @@ type ApplicationSet struct{}
func (a ApplicationSet) Deploy(w workloads.Workload) error {
name := GetCombinedName(a, w)
namespace := util.ArgocdNamespace
log := util.Ctx.Log.WithName(name)

util.Ctx.Log.Info("enter Deploy " + name)
log.Info("Deploying workload")

err := CreateManagedClusterSetBinding(McsbName, namespace)
if err != nil {
return err
}

err = CreatePlacement(name, namespace)
err = CreatePlacement(name, namespace, log)
if err != nil {
return err
}

err = CreatePlacementDecisionConfigMap(name, namespace)
err = CreatePlacementDecisionConfigMap(name, namespace, log)
if err != nil {
return err
}

err = CreateApplicationSet(a, w)
err = CreateApplicationSet(a, w, log)
if err != nil {
return err
}
Expand All @@ -42,33 +43,34 @@ func (a ApplicationSet) Deploy(w workloads.Workload) error {
func (a ApplicationSet) Undeploy(w workloads.Workload) error {
name := GetCombinedName(a, w)
namespace := util.ArgocdNamespace
log := util.Ctx.Log.WithName(name)

util.Ctx.Log.Info("enter Undeploy " + name)
log.Info("Undeploying workload")

err := DeleteApplicationSet(a, w)
err := DeleteApplicationSet(a, w, log)
if err != nil {
return err
}

err = DeleteConfigMap(name, namespace)
err = DeleteConfigMap(name, namespace, log)
if err != nil {
return err
}

err = DeletePlacement(name, namespace)
err = DeletePlacement(name, namespace, log)
if err != nil {
return err
}

// multiple appsets could use the same mcsb in argocd ns.
// so delete mcsb if only 1 appset is in argocd ns
lastAppset, err := isLastAppsetInArgocdNs(namespace)
lastAppset, err := isLastAppsetInArgocdNs(namespace, log)
if err != nil {
return err
}

if lastAppset {
err = DeleteManagedClusterSetBinding(McsbName, namespace)
err = DeleteManagedClusterSetBinding(McsbName, namespace, log)
if err != nil {
return err
}
Expand Down
47 changes: 24 additions & 23 deletions e2e/deployers/crud.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"os/exec"
"strings"

"github.com/go-logr/logr"
"github.com/ramendr/ramen/e2e/util"
"github.com/ramendr/ramen/e2e/workloads"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -58,7 +59,7 @@ func CreateManagedClusterSetBinding(name, namespace string) error {
return nil
}

func DeleteManagedClusterSetBinding(name, namespace string) error {
func DeleteManagedClusterSetBinding(name, namespace string, log logr.Logger) error {
mcsb := &ocmv1b2.ManagedClusterSetBinding{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Expand All @@ -72,13 +73,13 @@ func DeleteManagedClusterSetBinding(name, namespace string) error {
return err
}

util.Ctx.Log.Info("managedClusterSetBinding " + name + " not found")
log.Info("ManagedClusterSetBinding " + name + " not found")
}

return nil
}

func CreatePlacement(name, namespace string) error {
func CreatePlacement(name, namespace string, log logr.Logger) error {
labels := make(map[string]string)
labels[AppLabelKey] = name
clusterSet := []string{ClusterSetName}
Expand All @@ -102,13 +103,13 @@ func CreatePlacement(name, namespace string) error {
return err
}

util.Ctx.Log.Info("placement " + placement.Name + " already Exists")
log.Info("Placement already Exists")
}

return nil
}

func DeletePlacement(name, namespace string) error {
func DeletePlacement(name, namespace string, log logr.Logger) error {
placement := &ocmv1b1.Placement{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Expand All @@ -122,13 +123,13 @@ func DeletePlacement(name, namespace string) error {
return err
}

util.Ctx.Log.Info("placement " + name + " not found")
log.Info("Placement not found")
}

return nil
}

func CreateSubscription(s Subscription, w workloads.Workload) error {
func CreateSubscription(s Subscription, w workloads.Workload, log logr.Logger) error {
name := GetCombinedName(s, w)
namespace := name

Expand Down Expand Up @@ -173,18 +174,18 @@ func CreateSubscription(s Subscription, w workloads.Workload) error {
err := util.Ctx.Hub.CtrlClient.Create(context.Background(), subscription)
if err != nil {
if !errors.IsAlreadyExists(err) {
util.Ctx.Log.Info(fmt.Sprintf("create subscription with error: %v", err))
log.Info(fmt.Sprintf("create subscription with error: %v", err))

return err
}

util.Ctx.Log.Info("subscription " + subscription.Name + " already Exists")
log.Info("Subscription already Exists")
}

return nil
}

func DeleteSubscription(s Subscription, w workloads.Workload) error {
func DeleteSubscription(s Subscription, w workloads.Workload, log logr.Logger) error {
name := GetCombinedName(s, w)
namespace := name

Expand All @@ -201,7 +202,7 @@ func DeleteSubscription(s Subscription, w workloads.Workload) error {
return err
}

util.Ctx.Log.Info("subscription " + name + " not found")
log.Info("Subscription not found")
}

return nil
Expand Down Expand Up @@ -237,7 +238,7 @@ func getSubscription(client client.Client, namespace, name string) (*subscriptio
return subscription, nil
}

func CreatePlacementDecisionConfigMap(cmName string, cmNamespace string) error {
func CreatePlacementDecisionConfigMap(cmName string, cmNamespace string, log logr.Logger) error {
object := metav1.ObjectMeta{Name: cmName, Namespace: cmNamespace}

data := map[string]string{
Expand All @@ -255,13 +256,13 @@ func CreatePlacementDecisionConfigMap(cmName string, cmNamespace string) error {
return fmt.Errorf("could not create configMap " + cmName)
}

util.Ctx.Log.Info("configMap " + cmName + " already Exists")
log.Info("ConfigMap " + cmName + " already Exists")
}

return nil
}

func DeleteConfigMap(cmName string, cmNamespace string) error {
func DeleteConfigMap(cmName string, cmNamespace string, log logr.Logger) error {
object := metav1.ObjectMeta{Name: cmName, Namespace: cmNamespace}

configMap := &corev1.ConfigMap{
Expand All @@ -274,14 +275,14 @@ func DeleteConfigMap(cmName string, cmNamespace string) error {
return fmt.Errorf("could not delete configMap " + cmName)
}

util.Ctx.Log.Info("configMap " + cmName + " not found")
log.Info("ConfigMap " + cmName + " not found")
}

return nil
}

// nolint:funlen
func CreateApplicationSet(a ApplicationSet, w workloads.Workload) error {
func CreateApplicationSet(a ApplicationSet, w workloads.Workload, log logr.Logger) error {
var requeueSeconds int64 = 180

name := GetCombinedName(a, w)
Expand Down Expand Up @@ -353,13 +354,13 @@ func CreateApplicationSet(a ApplicationSet, w workloads.Workload) error {
return err
}

util.Ctx.Log.Info("applicationset " + appset.Name + " already Exists")
log.Info("Applicationset already Exists")
}

return nil
}

func DeleteApplicationSet(a ApplicationSet, w workloads.Workload) error {
func DeleteApplicationSet(a ApplicationSet, w workloads.Workload, log logr.Logger) error {
name := GetCombinedName(a, w)
namespace := util.ArgocdNamespace

Expand All @@ -376,28 +377,28 @@ func DeleteApplicationSet(a ApplicationSet, w workloads.Workload) error {
return err
}

util.Ctx.Log.Info("applicationset " + appset.Name + " not found")
log.Info("Applicationset not found")
}

return nil
}

// check if only the last appset is in the argocd namespace
func isLastAppsetInArgocdNs(namespace string) (bool, error) {
func isLastAppsetInArgocdNs(namespace string, log logr.Logger) (bool, error) {
appsetList := &argocdv1alpha1hack.ApplicationSetList{}

err := util.Ctx.Hub.CtrlClient.List(
context.Background(), appsetList, client.InNamespace(namespace))
if err != nil {
util.Ctx.Log.Info("error in getting application sets")
log.Info("Failed to get application sets")

return false, err
}

return len(appsetList.Items) == 1, nil
}

func DeleteDiscoveredApps(w workloads.Workload, namespace, cluster string) error {
func DeleteDiscoveredApps(w workloads.Workload, namespace, cluster string, log logr.Logger) error {
tempDir, err := os.MkdirTemp("", "ramen-")
if err != nil {
return err
Expand All @@ -415,7 +416,7 @@ func DeleteDiscoveredApps(w workloads.Workload, namespace, cluster string) error

// Run the command and capture the output
if out, err := cmd.Output(); err != nil {
util.Ctx.Log.Info(string(out))
log.Info(string(out))

return err
}
Expand Down
30 changes: 16 additions & 14 deletions e2e/deployers/discoveredapps.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ func (d DiscoveredApps) GetName() string {
func (d DiscoveredApps) Deploy(w workloads.Workload) error {
name := GetCombinedName(d, w)
namespace := name
log := util.Ctx.Log.WithName(name)

util.Ctx.Log.Info("enter Deploy " + name)
log.Info("Deploying workload")

// create namespace in both dr clusters
if err := util.CreateNamespaceAndAddAnnotation(namespace); err != nil {
Expand Down Expand Up @@ -50,58 +51,59 @@ func (d DiscoveredApps) Deploy(w workloads.Workload) error {

// Run the command and capture the output
if out, err := cmd.Output(); err != nil {
util.Ctx.Log.Info(string(out))
log.Info(string(out))

return err
}

if err = WaitWorkloadHealth(util.Ctx.C1.CtrlClient, namespace, w); err != nil {
if err = WaitWorkloadHealth(util.Ctx.C1.CtrlClient, namespace, w, log); err != nil {
return err
}

util.Ctx.Log.Info(name + " is deployed")
log.Info("Workload deployed")

return nil
}

func (d DiscoveredApps) Undeploy(w workloads.Workload) error {
name := GetCombinedName(d, w)
namespace := name // this namespace is in dr clusters
log := util.Ctx.Log.WithName(name)

util.Ctx.Log.Info("enter Undeploy " + name)
log.Info("Undeploying workload")

drpolicy, err := util.GetDRPolicy(util.Ctx.Hub.CtrlClient, util.DefaultDRPolicyName)
if err != nil {
return err
}

util.Ctx.Log.Info("starts to delete discovered apps on " + drpolicy.Spec.DRClusters[0])
log.Info("Deleting discovered apps on " + drpolicy.Spec.DRClusters[0])

// delete app on both clusters
if err := DeleteDiscoveredApps(w, namespace, drpolicy.Spec.DRClusters[0]); err != nil {
if err := DeleteDiscoveredApps(w, namespace, drpolicy.Spec.DRClusters[0], log); err != nil {
return err
}

util.Ctx.Log.Info("starts to delete discovered apps on " + drpolicy.Spec.DRClusters[1])
log.Info("Deletting discovered apps on " + drpolicy.Spec.DRClusters[1])

if err := DeleteDiscoveredApps(w, namespace, drpolicy.Spec.DRClusters[1]); err != nil {
if err := DeleteDiscoveredApps(w, namespace, drpolicy.Spec.DRClusters[1], log); err != nil {
return err
}

util.Ctx.Log.Info("starts to delete namespace " + namespace + " on " + drpolicy.Spec.DRClusters[0])
log.Info("Deleting namespace " + namespace + " on " + drpolicy.Spec.DRClusters[0])

// delete namespace on both clusters
if err := util.DeleteNamespace(util.Ctx.C1.CtrlClient, namespace); err != nil {
if err := util.DeleteNamespace(util.Ctx.C1.CtrlClient, namespace, log); err != nil {
return err
}

util.Ctx.Log.Info("starts to delete namespace " + namespace + " on " + drpolicy.Spec.DRClusters[1])
log.Info("Deleting namespace " + namespace + " on " + drpolicy.Spec.DRClusters[1])

if err := util.DeleteNamespace(util.Ctx.C2.CtrlClient, namespace); err != nil {
if err := util.DeleteNamespace(util.Ctx.C2.CtrlClient, namespace, log); err != nil {
return err
}

util.Ctx.Log.Info(name + " is undeployed")
log.Info("Workload undeployed")

return nil
}
Expand Down
Loading

0 comments on commit 3b6e253

Please sign in to comment.