Fix OADP 526 (#704)

* fix OADP 526 * add ignore err comments
openshift · May 24, 2022 · e500ddf · e500ddf
1 parent c791b37
commit e500ddf
Show file tree

Hide file tree

Showing 6 changed files with 1,935 additions and 137 deletions.
diff --git a/controllers/restic.go b/controllers/restic.go
@@ -171,8 +171,12 @@ func (r *DPAReconciler) buildResticDaemonset(dpa *oadpv1alpha1.DataProtectionApp
 		return nil, fmt.Errorf("ds cannot be nil")
 	}
 
+	// get resource requirements for restic ds
+	// ignoring err here as it is checked in validator.go
+	resticResourceReqs, _ := r.getResticResourceReqs(dpa)
+
 	installDs := install.DaemonSet(ds.Namespace,
-		install.WithResources(r.getResticResourceReqs(dpa)),
+		install.WithResources(resticResourceReqs),
 		install.WithImage(getVeleroImage(dpa)),
 		install.WithAnnotations(dpa.Spec.PodAnnotations),
 		install.WithSecret(false))