Skip to content

[oadp-1.0] Fix OADP 526 #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 27, 2022
Merged

[oadp-1.0] Fix OADP 526 #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff9b33e
fix OADP 526
shubham-pampattiwar May 19, 2022
66b36e3
add ignore err comments
shubham-pampattiwar May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion controllers/restic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Loading