podman: don't try to delete without volumes

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
tnqn · Mar 4, 2022 · 80f2185 · 80f2185
1 parent 575a480
commit 80f2185
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pkg/cluster/internal/providers/podman/provider.go b/pkg/cluster/internal/providers/podman/provider.go
@@ -165,6 +165,9 @@ func (p *provider) DeleteNodes(n []nodes.Node) error {
 		}
 		nodeVolumes = append(nodeVolumes, volumes...)
 	}
+	if len(nodeVolumes) == 0 {
+		return nil
+	}
 	return deleteVolumes(nodeVolumes)
 }
 

diff --git a/pkg/cluster/internal/providers/podman/util.go b/pkg/cluster/internal/providers/podman/util.go
@@ -100,6 +100,10 @@ func getVolumes(label string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
+	if string(output) == "" {
+		// no volumes
+		return nil, nil
+	}
 	// Trim away the last `\n`.
 	trimmedOutput := strings.TrimSuffix(string(output), "\n")
 	// Get names of all volumes by splitting via `\n`.