OADP-521 1.0 cp: set controller reference after modifying objectmeta (#699)

* set controller reference after modifying objectmeta

* add e2e dpa deletion test

Signed-off-by: Tiger Kaovilai <[email protected]>

Author: kaovilai

controllers/restic.go

@@ -119,10 +119,10 @@ func (r *DPAReconciler) ReconcileResticDaemonset(log logr.Logger) (bool, error)
 			}
 		}
 
-		if err := controllerutil.SetControllerReference(&dpa, ds, r.Scheme); err != nil {
+		if _, err := r.buildResticDaemonset(&dpa, ds); err != nil {
 			return err
 		}
-		if _, err := r.buildResticDaemonset(&dpa, ds); err != nil {
+		if err := controllerutil.SetControllerReference(&dpa, ds, r.Scheme); err != nil {
 			return err
 		}
 		return nil

controllers/velero.go

@@ -272,13 +272,14 @@ func (r *DPAReconciler) ReconcileVeleroDeployment(log logr.Logger) (bool, error)
 			}
 		}
 
-		// Setting controller owner reference on the velero deployment
-		err := controllerutil.SetControllerReference(&dpa, veleroDeployment, r.Scheme)
+		// update the Deployment template
+		err := r.buildVeleroDeployment(veleroDeployment, &dpa)
 		if err != nil {
 			return err
 		}
-		// update the Deployment template
-		return r.buildVeleroDeployment(veleroDeployment, &dpa)
+
+		// Setting controller owner reference on the velero deployment
+		return controllerutil.SetControllerReference(&dpa, veleroDeployment, r.Scheme)
 	})
 
 	if err != nil {

tests/e2e/dpa_deployment_suite_test.go

@@ -632,4 +632,36 @@ var _ = Describe("Configuration testing for DPA Custom Resource", func() {
 
 		}, genericTests,
 	)
+	
+	type deletionCase struct {
+		WantError bool
+	}
+	DescribeTable("DPA Deletion test", 
+		func(installCase deletionCase) {
+			log.Printf("Building dpa")
+			err := dpaCR.Build(RESTIC)
+			Expect(err).NotTo(HaveOccurred())
+			log.Printf("Creating dpa")
+			err = dpaCR.CreateOrUpdate(&dpaCR.CustomResource.Spec)
+			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())
+			if dpaCR.CustomResource.BackupImages() {
+				log.Printf("Waiting for registry pods to be running")
+				Eventually(AreRegistryDeploymentsAvailable(namespace), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
+			}
+			log.Printf("Deleting dpa")
+			err = dpaCR.Delete()
+			if installCase.WantError {
+				Expect(err).To(HaveOccurred())
+			} else {
+				Expect(err).NotTo(HaveOccurred())
+				log.Printf("Checking no velero pods are running")
+				Eventually(AreVeleroPodsRunning(namespace), timeoutMultiplier*time.Minute*3, time.Second*5).ShouldNot(BeTrue())
+				log.Printf("Checking no registry deployment available")
+				Eventually(AreRegistryDeploymentsNotAvailable(namespace), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
+			}
+		},
+		Entry("Should succeed", deletionCase{WantError: false}),
+    )
 })

tests/e2e/lib/registry_helpers.go

@@ -14,15 +14,8 @@ import (
 func AreRegistryDeploymentsAvailable(namespace string) wait.ConditionFunc {
 	log.Printf("Checking for available registry deployments")
 	return func() (bool, error) {
-		client, err := setUpClient()
-		if err != nil {
-			return false, err
-		}
-		registryListOptions := metav1.ListOptions{
-			LabelSelector: "app.kubernetes.io/component=Registry",
-		}
 		// get pods in the oadp-operator-e2e namespace with label selector
-		deploymentList, err := client.AppsV1().Deployments(namespace).List(context.TODO(), registryListOptions)
+		deploymentList, err := GetRegistryDeploymentList(namespace)
 		if err != nil {
 			return false, nil
 		}
@@ -40,3 +33,39 @@ func AreRegistryDeploymentsAvailable(namespace string) wait.ConditionFunc {
 		return true, nil
 	}
 }
+
+func GetRegistryDeploymentList(namespace string) (*appsv1.DeploymentList, error) {
+	client, err := setUpClient()
+	if err != nil {
+		return nil, err
+	}
+	registryListOptions := metav1.ListOptions{
+		LabelSelector: "app.kubernetes.io/component=Registry",
+	}
+	// get pods in the oadp-operator-e2e namespace with label selector
+	deploymentList, err := client.AppsV1().Deployments(namespace).List(context.TODO(), registryListOptions)
+	if err != nil {
+		return nil, err
+	}
+	return deploymentList, nil
+}
+
+func AreRegistryDeploymentsNotAvailable(namespace string) wait.ConditionFunc {
+	log.Printf("Checking for unavailable registry deployments")
+	return func() (bool, error) {
+		// get pods in the oadp-operator-e2e namespace with label selector
+		deploymentList, err := GetRegistryDeploymentList(namespace)
+		if err != nil {
+			return false, err
+		}
+		// loop until deployment status is 'Running' or timeout
+		for _, deploymentInfo := range deploymentList.Items {
+			for _, conditions := range deploymentInfo.Status.Conditions {
+				if conditions.Type == appsv1.DeploymentAvailable && conditions.Status == corev1.ConditionTrue {
+					return false, fmt.Errorf("registry deployment is still available.\nconditions: %v", deploymentInfo.Status.Conditions)
+				}
+			}
+		}
+		return true, nil
+	}
+}