Merge pull request #9958 from jmguzik/limit-prune-filters-for-volumes

Volumes prune endpoint should use only prune filters
This commit is contained in:
OpenShift Merge Robot
2021-04-07 18:55:23 -04:00
committed by GitHub
4 changed files with 37 additions and 3 deletions

View File

@ -266,7 +266,7 @@ func PruneVolumes(w http.ResponseWriter, r *http.Request) {
}
f := (url.Values)(*filterMap)
filterFuncs, err := filters.GenerateVolumeFilters(f)
filterFuncs, err := filters.GeneratePruneVolumeFilters(f)
if err != nil {
utils.Error(w, "Something when wrong.", http.StatusInternalServerError, errors.Wrapf(err, "failed to parse filters for %s", f.Encode()))
return

View File

@ -150,7 +150,7 @@ func pruneVolumesHelper(r *http.Request) ([]*reports.PruneReport, error) {
}
f := (url.Values)(*filterMap)
filterFuncs, err := filters.GenerateVolumeFilters(f)
filterFuncs, err := filters.GeneratePruneVolumeFilters(f)
if err != nil {
return nil, err
}