add selector logic to pgo delete cluster

Author: Jeff McCormick

client/cmd/cluster.go

@@ -331,12 +331,41 @@ func getClusterParams(name string) *tpr.PgCluster {
 }
 
 func deleteCluster(args []string) {
+
 	// Fetch a list of our cluster TPRs
 	clusterList := tpr.PgClusterList{}
-	err := Tprclient.Get().Resource(tpr.CLUSTER_RESOURCE).Do().Into(&clusterList)
-	if err != nil {
-		log.Error("error getting cluster list" + err.Error())
-		return
+
+	if Selector != "" {
+		//use the selector instead of an argument list to filter on
+
+		myselector, err := labels.Parse(Selector)
+		if err != nil {
+			log.Error("could not parse selector flag")
+			return
+		}
+
+		//get the clusters list
+		err = Tprclient.Get().
+			Resource(tpr.CLUSTER_RESOURCE).
+			Namespace(Namespace).
+			LabelsSelectorParam(myselector).
+			Do().
+			Into(&clusterList)
+		if err != nil {
+			log.Error("error getting cluster list" + err.Error())
+			return
+		}
+
+		if len(clusterList.Items) == 0 {
+			log.Debug("no clusters found")
+		} else {
+			newargs := make([]string, 0)
+			for _, cluster := range clusterList.Items {
+				newargs = append(newargs, cluster.Spec.Name)
+			}
+			args = newargs
+		}
+
 	}
 
 	//to remove a cluster, you just have to remove
@@ -347,10 +376,10 @@ func deleteCluster(args []string) {
 		for _, cluster := range clusterList.Items {
 			if arg == "all" || arg == cluster.Spec.Name {
 				clusterFound = true
-				err = Tprclient.Delete().
+				err := Tprclient.Delete().
 					Resource(tpr.CLUSTER_RESOURCE).
 					Namespace(Namespace).
-					Name(cluster.Spec.Name).
+					Name(arg).
 					Do().
 					Error()
 				if err != nil {

client/cmd/delete.go

@@ -66,6 +66,8 @@ func init() {
 	RootCmd.AddCommand(deleteCmd)
 	deleteCmd.AddCommand(deletePolicyCmd)
 	deleteCmd.AddCommand(deleteClusterCmd)
+	deleteClusterCmd.Flags().StringVarP(&Selector, "selector", "s", "", "The selector to use for cluster filtering ")
+
 	deleteCmd.AddCommand(deleteBackupCmd)
 	deleteCmd.AddCommand(deleteUpgradeCmd)
 
@@ -105,8 +107,8 @@ var deleteClusterCmd = &cobra.Command{
 	Long: `delete a crunchy cluster. For example:
 	pgo delete cluster mycluster`,
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) == 0 {
-			log.Error("a cluster name is required for this command")
+		if len(args) == 0 && Selector == "" {
+			log.Error("a cluster name or selector is required for this command")
 		} else {
 			deleteCluster(args)
 		}