Skip to content

Commit da26481

Browse files
author
Jeff McCormick
committed
fix pgo delete to work with both selector or args list
1 parent 12be863 commit da26481

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

client/cmd/cluster.go

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -332,40 +332,43 @@ func getClusterParams(name string) *tpr.PgCluster {
332332

333333
func deleteCluster(args []string) {
334334

335+
var err error
336+
335337
// Fetch a list of our cluster TPRs
336338
clusterList := tpr.PgClusterList{}
339+
myselector := labels.Everything()
337340

338341
if Selector != "" {
339342
//use the selector instead of an argument list to filter on
340-
341-
myselector, err := labels.Parse(Selector)
343+
myselector, err = labels.Parse(Selector)
342344
if err != nil {
343345
log.Error("could not parse selector flag")
344346
return
345347
}
348+
}
346349

347-
//get the clusters list
348-
err = Tprclient.Get().
349-
Resource(tpr.CLUSTER_RESOURCE).
350-
Namespace(Namespace).
351-
LabelsSelectorParam(myselector).
352-
Do().
353-
Into(&clusterList)
354-
if err != nil {
355-
log.Error("error getting cluster list" + err.Error())
356-
return
357-
}
350+
//get the clusters list
351+
err = Tprclient.Get().
352+
Resource(tpr.CLUSTER_RESOURCE).
353+
Namespace(Namespace).
354+
LabelsSelectorParam(myselector).
355+
Do().
356+
Into(&clusterList)
357+
if err != nil {
358+
log.Error("error getting cluster list" + err.Error())
359+
return
360+
}
358361

359-
if len(clusterList.Items) == 0 {
360-
log.Debug("no clusters found")
361-
} else {
362+
if len(clusterList.Items) == 0 {
363+
log.Debug("no clusters found")
364+
} else {
365+
if Selector != "" {
362366
newargs := make([]string, 0)
363367
for _, cluster := range clusterList.Items {
364368
newargs = append(newargs, cluster.Spec.Name)
365369
}
366370
args = newargs
367371
}
368-
369372
}
370373

371374
//to remove a cluster, you just have to remove

0 commit comments

Comments
 (0)