default operator install approval to 'Manual'; auto-approve initial install

Author: joelanford

internal/cmd/operator_list_available.go

@@ -21,8 +21,12 @@ func newOperatorListAvailableCmd(cfg *action.Configuration) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "list-available",
 		Short: "List operators available to be installed",
-		Args:  cobra.ExactArgs(0),
+		Args:  cobra.MaximumNArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
+			if len(args) == 1 {
+				l.Package = args[0]
+			}
+
 			operators, err := l.Run(cmd.Context())
 			if err != nil {
 				log.Fatal(err)

internal/pkg/action/operator_install.go

@@ -2,7 +2,6 @@ package action
 
 import (
 	"context"
-	"flag"
 	"fmt"
 	"time"
 
@@ -25,7 +24,7 @@ type OperatorInstall struct {
 
 	Package             string
 	Channel             string
-	Approve             string
+	Approval            subscription.ApprovalValue
 	InstallMode         operator.InstallMode
 	InstallTimeout      time.Duration
 	CleanupTimeout      time.Duration
@@ -40,12 +39,11 @@ func NewOperatorInstall(cfg *Configuration) *OperatorInstall {
 
 func (i *OperatorInstall) BindFlags(fs *pflag.FlagSet) {
 	fs.StringVarP(&i.Channel, "channel", "c", "", "subscription channel")
-	fs.StringVarP(&i.Approve, "approval", "a", "", "approval (Automatic or Manual)")
+	fs.VarP(&i.Approval, "approval", "a", fmt.Sprintf("approval (%s or %s)", v1alpha1.ApprovalManual, v1alpha1.ApprovalAutomatic))
+	fs.VarP(&i.InstallMode, "install-mode", "i", "install mode")
 	fs.DurationVarP(&i.InstallTimeout, "timeout", "t", time.Minute, "the amount of time to wait before cancelling the install")
 	fs.DurationVar(&i.CleanupTimeout, "cleanup-timeout", time.Minute, "the amount to time to wait before cancelling cleanup")
 	fs.BoolVar(&i.CreateOperatorGroup, "create-operator-group", false, "create operator group if necessary")
-	imVal := pflag.PFlagFromGoFlag(&flag.Flag{Value: &i.InstallMode}).Value
-	fs.VarP(imVal, "install-mode", "i", "install mode")
 }
 
 func (i *OperatorInstall) Run(ctx context.Context) (*v1alpha1.ClusterServiceVersion, error) {
@@ -85,9 +83,7 @@ func (i *OperatorInstall) Run(ctx context.Context) (*v1alpha1.ClusterServiceVers
 	}
 
 	opts := []subscription.Option{}
-	if i.Approve != "" {
-		opts = append(opts, subscription.InstallPlanApproval(v1alpha1.Approval(i.Approve)))
-	}
+	opts = append(opts, subscription.InstallPlanApproval(i.Approval.Approval))
 
 	subKey := types.NamespacedName{
 		Namespace: i.config.Namespace,
@@ -103,6 +99,34 @@ func (i *OperatorInstall) Run(ctx context.Context) (*v1alpha1.ClusterServiceVers
 	}
 	log.Printf("subscription %q created", sub.Name)
 
+	// We need to approve the initial install plan
+	if i.Approval.Approval == v1alpha1.ApprovalManual {
+		if err := wait.PollImmediateUntil(time.Millisecond*250, func() (bool, error) {
+			if err := i.config.Client.Get(ctx, subKey, sub); err != nil {
+				return false, err
+			}
+			if sub.Status.InstallPlanRef != nil {
+				return true, nil
+			}
+			return false, nil
+		}, ctx.Done()); err != nil {
+			return nil, fmt.Errorf("waiting for subscription install plan to exist: %v", err)
+		}
+
+		ip := v1alpha1.InstallPlan{}
+		ipKey := types.NamespacedName{
+			Namespace: sub.Status.InstallPlanRef.Namespace,
+			Name:      sub.Status.InstallPlanRef.Name,
+		}
+		if err := i.config.Client.Get(ctx, ipKey, &ip); err != nil {
+			return nil, fmt.Errorf("get install plan: %v", err)
+		}
+		ip.Spec.Approved = true
+		if err := i.config.Client.Update(ctx, &ip); err != nil {
+			return nil, fmt.Errorf("approve install plan: %v", err)
+		}
+	}
+
 	if err := wait.PollImmediateUntil(time.Millisecond*250, func() (bool, error) {
 		if err := i.config.Client.Get(ctx, subKey, sub); err != nil {
 			return false, err
@@ -112,7 +136,7 @@ func (i *OperatorInstall) Run(ctx context.Context) (*v1alpha1.ClusterServiceVers
 		}
 		return false, nil
 	}, ctx.Done()); err != nil {
-		return nil, fmt.Errorf("waiting for state \"AtLatestKnown\": %v", err)
+		return nil, fmt.Errorf("waiting for subscription state \"AtLatestKnown\": %v", err)
 	}
 
 	csvKey := types.NamespacedName{

internal/pkg/action/operator_list_available.go

@@ -15,6 +15,7 @@ type OperatorListAvailable struct {
 	config *Configuration
 
 	Catalog NamespacedName
+	Package string
 }
 
 func NewOperatorListAvailable(cfg *Configuration) *OperatorListAvailable {
@@ -24,15 +25,22 @@ func NewOperatorListAvailable(cfg *Configuration) *OperatorListAvailable {
 }
 
 func (l *OperatorListAvailable) Run(ctx context.Context) ([]v1.PackageManifest, error) {
-	pms := v1.PackageManifestList{}
+	if l.Package != "" {
+		return nil, fmt.Errorf("listing all versions of a package is not currently supported")
+	}
+	return l.getAllPackageManifests(ctx)
+}
 
+func (l *OperatorListAvailable) getAllPackageManifests(ctx context.Context) ([]v1.PackageManifest, error) {
 	labelSelector := client.MatchingLabels{}
 	if l.Catalog.Name != "" {
 		labelSelector["catalog"] = l.Catalog.Name
 	}
 	if l.Catalog.Namespace != "" {
 		labelSelector["catalog-namespace"] = l.Catalog.Namespace
 	}
+
+	pms := v1.PackageManifestList{}
 	if err := l.config.Client.List(ctx, &pms, labelSelector); err != nil {
 		return nil, err
 	}

internal/pkg/subscription/subscription.go

@@ -1,6 +1,8 @@
 package subscription
 
 import (
+	"fmt"
+
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -32,3 +34,29 @@ func Build(key types.NamespacedName, channel string, source types.NamespacedName
 	}
 	return s
 }
+
+const defaultApproval = v1alpha1.ApprovalManual
+
+type ApprovalValue struct {
+	v1alpha1.Approval
+}
+
+func (a *ApprovalValue) Set(str string) error {
+	switch v := v1alpha1.Approval(str); v {
+	case v1alpha1.ApprovalAutomatic, v1alpha1.ApprovalManual:
+		a.Approval = v
+		return nil
+	}
+	return fmt.Errorf("invalid approval value %q", str)
+}
+
+func (a *ApprovalValue) String() string {
+	if a.Approval == "" {
+		a.Approval = defaultApproval
+	}
+	return string(a.Approval)
+}
+
+func (a ApprovalValue) Type() string {
+	return "ApprovalValue"
+}