mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clusterDelete: no error if no cluster was found (fixes #379)

Browse Source
This commit is contained in:
iwilltry42 2020-10-19 23:29:18 +02:00
parent 425b9b709e
commit a385241c77
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/cluster/clusterDelete.go
View File

@ -113,11 +113,14 @@ func parseDeleteClusterCmd(cmd *cobra.Command, args []string) []*k3d.Cluster {
} }
for _, name := range clusternames { for _, name := range clusternames {
cluster, err := cluster.ClusterGet(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: name}) c, err := cluster.ClusterGet(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: name})
if err != nil { if err != nil {
if err == cluster.ClusterGetNoNodesFoundError {
continue
}
log.Fatalln(err) log.Fatalln(err)
} }
clusters = append(clusters, cluster) clusters = append(clusters, c)
} }
return clusters return clusters

5
pkg/cluster/cluster.go
View File

@ -24,6 +24,7 @@ package cluster
import ( import (
"bytes" "bytes"
"context" "context"
"errors"
"fmt" "fmt"
"sort" "sort"
"strconv" "strconv"
@ -488,6 +489,8 @@ func populateClusterFieldsFromLabels(cluster *k3d.Cluster) error {
return nil return nil
} }
var ClusterGetNoNodesFoundError = errors.New("No nodes found for given cluster")
// ClusterGet returns an existing cluster with all fields and node lists populated // ClusterGet returns an existing cluster with all fields and node lists populated
func ClusterGet(ctx context.Context, runtime k3drt.Runtime, cluster *k3d.Cluster) (*k3d.Cluster, error) { func ClusterGet(ctx context.Context, runtime k3drt.Runtime, cluster *k3d.Cluster) (*k3d.Cluster, error) {
// get nodes that belong to the selected cluster // get nodes that belong to the selected cluster
@ -497,7 +500,7 @@ func ClusterGet(ctx context.Context, runtime k3drt.Runtime, cluster *k3d.Cluster
} }
if len(nodes) == 0 { if len(nodes) == 0 {
return nil, fmt.Errorf("No nodes found for cluster '%s'", cluster.Name) return nil, ClusterGetNoNodesFoundError
} }
// append nodes // append nodes