list-available: show channel and latest version, optional package name arg; other minor fixes

Author: joelanford

internal/cmd/operator_list_available.go

@@ -46,10 +46,12 @@ func newOperatorListAvailableCmd(cfg *action.Configuration) *cobra.Command {
 			})
 
 			tw := tabwriter.NewWriter(os.Stdout, 3, 4, 2, ' ', 0)
-			_, _ = fmt.Fprintf(tw, "NAME\tCATALOG\tAGE\n")
+			_, _ = fmt.Fprintf(tw, "NAME\tCATALOG\tCHANNEL\tLATEST CSV\tAGE\n")
 			for _, op := range operators {
 				age := time.Now().Sub(op.CreationTimestamp.Time)
-				_, _ = fmt.Fprintf(tw, "%s\t%s\t%s\n", op.Name, op.Status.CatalogSourceDisplayName, duration.HumanDuration(age))
+				for _, ch := range op.Status.Channels {
+					_, _ = fmt.Fprintf(tw, "%s\t%s\t%s\t%s\t%s\n", op.Name, op.Status.CatalogSourceDisplayName, ch.Name, ch.CurrentCSV, duration.HumanDuration(age))
+				}
 			}
 			_ = tw.Flush()
 		},

internal/pkg/action/operator_install.go

@@ -78,7 +78,7 @@ func (i *OperatorInstall) Run(ctx context.Context) (*v1alpha1.ClusterServiceVers
 			}
 			log.Printf("operatorgroup %q created", og.Name)
 		} else {
-			return nil, fmt.Errorf("namespace %q has no existing operator group", i.config.Namespace)
+			return nil, fmt.Errorf("namespace %q has no existing operator group; use --create-operator-group to create one automatically", i.config.Namespace)
 		}
 	} else if err := i.validateOperatorGroup(*og, supported); err != nil {
 		return nil, err
@@ -302,9 +302,3 @@ func (i *OperatorInstall) getCSV(ctx context.Context, ip *v1alpha1.InstallPlan)
 	}
 	return csv, nil
 }
-
-func (i *OperatorInstall) cleanup(ctx context.Context, sub *v1alpha1.Subscription) {
-	if err := i.config.Client.Delete(ctx, sub); err != nil {
-		log.Printf("delete subscription %q: %v", sub.Name, err)
-	}
-}

internal/pkg/action/operator_list_available.go

@@ -26,11 +26,27 @@ func NewOperatorListAvailable(cfg *Configuration) *OperatorListAvailable {
 
 func (l *OperatorListAvailable) Run(ctx context.Context) ([]v1.PackageManifest, error) {
 	if l.Package != "" {
-		return nil, fmt.Errorf("listing all versions of a package is not currently supported")
+		pm, err := l.getPackageManifestByName(ctx, l.Package)
+		if err != nil {
+			return nil, err
+		}
+		return []v1.PackageManifest{*pm}, nil
 	}
 	return l.getAllPackageManifests(ctx)
 }
 
+func (l *OperatorListAvailable) getPackageManifestByName(ctx context.Context, packageName string) (*v1.PackageManifest, error) {
+	pm := v1.PackageManifest{}
+	pmKey := types.NamespacedName{
+		Namespace: l.config.Namespace,
+		Name:      packageName,
+	}
+	if err := l.config.Client.Get(ctx, pmKey, &pm); err != nil {
+		return nil, err
+	}
+	return &pm, nil
+}
+
 func (l *OperatorListAvailable) getAllPackageManifests(ctx context.Context) ([]v1.PackageManifest, error) {
 	labelSelector := client.MatchingLabels{}
 	if l.Catalog.Name != "" {

internal/pkg/action/operator_uninstall.go

@@ -56,13 +56,15 @@ func (u *OperatorUninstall) Run(ctx context.Context) error {
 	}
 	log.Printf("subscription %q deleted", sub.Name)
 
-	if sub.Status.CurrentCSV != sub.Status.InstalledCSV {
+	if sub.Status.CurrentCSV != "" && sub.Status.CurrentCSV != sub.Status.InstalledCSV {
 		if err := u.deleteCSVandCRDs(ctx, sub.Status.CurrentCSV, true); err != nil {
 			return err
 		}
 	}
-	if err := u.deleteCSVandCRDs(ctx, sub.Status.InstalledCSV, false); err != nil {
-		return err
+	if sub.Status.InstalledCSV != "" {
+		if err := u.deleteCSVandCRDs(ctx, sub.Status.InstalledCSV, false); err != nil {
+			return err
+		}
 	}
 
 	if u.DeleteOperatorGroup {

internal/pkg/action/operator_upgrade.go

@@ -10,8 +10,6 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/joelanford/kubectl-operator/internal/pkg/log"
 )
 
 type OperatorUpgrade struct {
@@ -127,9 +125,3 @@ func (u *OperatorUpgrade) getCSV(ctx context.Context, ip *v1alpha1.InstallPlan)
 	}
 	return csv, nil
 }
-
-func (u *OperatorUpgrade) cleanup(ctx context.Context, sub *v1alpha1.Subscription) {
-	if err := u.config.Client.Delete(ctx, sub); err != nil {
-		log.Printf("delete subscription %q: %v", sub.Name, err)
-	}
-}