e2e

Author: kaovilai

tests/e2e/dpa_deployment_suite_test.go

@@ -8,6 +8,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/google/go-cmp/cmp"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	oadpv1alpha1 "github.com/openshift/oadp-operator/api/v1alpha1"
@@ -558,6 +559,11 @@ var _ = Describe("Configuration testing for DPA Custom Resource", func() {
 				Eventually(dpaCR.GetNoErr().Status.Conditions[0].Message, timeoutMultiplier*time.Minute*3, time.Second*5).Should(Equal(expectedErr.Error()))
 				return
 			}
+			// Capture logs right after DPA is reconciled for diffing after one minute.
+			Eventually(dpaCR.GetNoErr().Status.Conditions[0].Type, timeoutMultiplier*time.Minute*3, time.Second*5).Should(Equal("Reconciled"))
+			timeReconciled := time.Now()
+			adpLogsAtReconciled, err := GetOpenShiftADPLogs(dpaCR.Namespace)
+			Expect(err).NotTo(HaveOccurred())
 			log.Printf("Waiting for velero pod to be running")
 			Eventually(AreVeleroPodsRunning(namespace), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
 			dpa, err := dpaCR.Get()
@@ -629,6 +635,15 @@ var _ = Describe("Configuration testing for DPA Custom Resource", func() {
 				log.Printf("Waiting for registry pods to be running")
 				Eventually(AreRegistryDeploymentsAvailable(namespace), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
 			}
+			// wait at least 1 minute after reconciled
+			Eventually(func() bool {
+				//has it been at least 1 minute since reconciled?
+				return time.Now().After(timeReconciled.Add(time.Minute))
+			}, timeoutMultiplier*time.Minute*1, time.Second*5).Should(BeTrue())
+			adpLogsAfterOneMinute, err := GetOpenShiftADPLogs(dpaCR.Namespace)
+			Expect(err).NotTo(HaveOccurred())
+			// We expect adp logs to be the same after 1 minute
+			Expect(cmp.Diff(adpLogsAtReconciled, adpLogsAfterOneMinute)).To(Equal(""))
 
 		}, genericTests,
 	)

tests/e2e/lib/dpa_helpers.go

@@ -1,12 +1,10 @@
 package lib
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"log"
 	"reflect"
 	"strings"
@@ -249,38 +247,13 @@ func AreVeleroPodsRunning(namespace string) wait.ConditionFunc {
 	}
 }
 
+func GetOpenShiftADPLogs(namespace string) (string, error) {
+	return GetPodWithPrefixContainerLogs(namespace, "openshift-adp-controller-manager-", "manager")
+}
+
 // Returns logs from velero container on velero pod
-func getVeleroContainerLogs(namespace string) (string, error) {
-	podList, err := GetVeleroPods(namespace)
-	if err != nil {
-		return "", err
-	}
-	clientset, err := setUpClient()
-	if err != nil {
-		return "", err
-	}
-	var logs string
-	for _, podInfo := range (*podList).Items {
-		if !strings.HasPrefix(podInfo.ObjectMeta.Name, "velero-") {
-			continue
-		}
-		podLogOpts := corev1.PodLogOptions{
-			Container: "velero",
-		}
-		req := clientset.CoreV1().Pods(podInfo.Namespace).GetLogs(podInfo.Name, &podLogOpts)
-		podLogs, err := req.Stream(context.TODO())
-		if err != nil {
-			return "", err
-		}
-		defer podLogs.Close()
-		buf := new(bytes.Buffer)
-		_, err = io.Copy(buf, podLogs)
-		if err != nil {
-			return "", err
-		}
-		logs = buf.String()
-	}
-	return logs, nil
+func GetVeleroContainerLogs(namespace string) (string, error) {
+	return GetPodWithPrefixContainerLogs(namespace, "velero-", "velero")
 }
 
 func GetVeleroContainerFailureLogs(namespace string) []string {
@@ -318,7 +291,7 @@ func (v *DpaCustomResource) IsDeleted() wait.ConditionFunc {
 	}
 }
 
-//check if bsl matches the spec
+// check if bsl matches the spec
 func DoesBSLExist(namespace string, bsl velero.BackupStorageLocationSpec, spec *oadpv1alpha1.DataProtectionApplicationSpec) wait.ConditionFunc {
 	return func() (bool, error) {
 		if len(spec.BackupLocations) == 0 {
@@ -335,7 +308,7 @@ func DoesBSLExist(namespace string, bsl velero.BackupStorageLocationSpec, spec *
 	}
 }
 
-//check if vsl matches the spec
+// check if vsl matches the spec
 func DoesVSLExist(namespace string, vslspec velero.VolumeSnapshotLocationSpec, spec *oadpv1alpha1.DataProtectionApplicationSpec) wait.ConditionFunc {
 	return func() (bool, error) {
 
@@ -352,7 +325,7 @@ func DoesVSLExist(namespace string, vslspec velero.VolumeSnapshotLocationSpec, s
 	}
 }
 
-//check velero tolerations
+// check velero tolerations
 func VerifyVeleroTolerations(namespace string, t []corev1.Toleration) wait.ConditionFunc {
 	return func() (bool, error) {
 		clientset, err := setUpClient()

tests/e2e/lib/kube_helpers.go

@@ -1,8 +1,12 @@
 package lib
 
 import (
+	"bytes"
 	"context"
+	"fmt"
+	"io"
 	"log"
+	"strings"
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -208,3 +212,47 @@ func isCredentialsSecretDeleted(namespace string, credSecretRef string) wait.Con
 		return false, err
 	}
 }
+
+func GetPodWithPrefixContainerLogs(namespace string, podPrefix string, container string) (string, error) {
+	clientset, err := setUpClient()
+	if err != nil {
+		return "", err
+	}
+	podList, err := clientset.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		return "", err
+	}
+	for _, pod := range podList.Items {
+		if strings.HasPrefix(pod.Name, podPrefix) {
+			logs, err := GetPodContainerLogs(namespace, pod.Name, container)
+			if err != nil {
+				return "", err
+			}
+			return logs, nil
+		}
+	}
+	return "", fmt.Errorf("No pod found with prefix %s", podPrefix)
+}
+
+func GetPodContainerLogs(namespace, podname, container string) (string, error) {
+	clientset, err := setUpClient()
+	if err != nil {
+		return "", err
+	}
+	req := clientset.CoreV1().Pods(namespace).GetLogs(podname, &corev1.PodLogOptions{
+		Container: container,
+	})
+	podLogs, err := req.Stream(context.Background())
+	if err != nil {
+		return "", err
+	}
+	defer podLogs.Close()
+
+	buf := new(bytes.Buffer)
+	_, err = io.Copy(buf, podLogs)
+	if err != nil {
+		return "", err
+	}
+	str := buf.String()
+	return str, nil
+}