catalog_add: use explicit name for catalog source

Author: joelanford

internal/cmd/catalog_add.go

@@ -16,9 +16,9 @@ func newCatalogAddCmd(cfg *action.Configuration) *cobra.Command {
 	a := action.NewAddCatalog(cfg)
 
 	cmd := &cobra.Command{
-		Use:   "add <index_image>",
+		Use:   "add <name> <index_image>",
 		Short: "Add an operator catalog",
-		Args:  cobra.ExactArgs(1),
+		Args:  cobra.ExactArgs(2),
 		PreRun: func(cmd *cobra.Command, args []string) {
 			regLogger := logrus.New()
 			regLogger.SetOutput(ioutil.Discard)
@@ -30,7 +30,8 @@ func newCatalogAddCmd(cfg *action.Configuration) *cobra.Command {
 			ctx, cancel := context.WithTimeout(cmd.Context(), a.AddTimeout)
 			defer cancel()
 
-			a.IndexImage = args[0]
+			a.CatalogSourceName = args[0]
+			a.IndexImage = args[1]
 
 			cs, err := a.Run(ctx)
 			if err != nil {

internal/pkg/action/catalog_add.go

@@ -11,7 +11,6 @@ import (
 	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"sigs.k8s.io/cluster-api/util/container"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/joelanford/kubectl-operator/internal/pkg/catalog"
@@ -21,11 +20,12 @@ import (
 type AddCatalog struct {
 	config *Configuration
 
-	IndexImage     string
-	DisplayName    string
-	Publisher      string
-	AddTimeout     time.Duration
-	CleanupTimeout time.Duration
+	CatalogSourceName string
+	IndexImage        string
+	DisplayName       string
+	Publisher         string
+	AddTimeout        time.Duration
+	CleanupTimeout    time.Duration
 
 	RegistryOptions []containerdregistry.RegistryOption
 
@@ -58,13 +58,9 @@ func (a *AddCatalog) Run(ctx context.Context) (*v1alpha1.CatalogSource, error) {
 		}
 	}()
 
-	imageRef, err := container.ImageFromString(a.IndexImage)
-	if err != nil {
-		return nil, err
-	}
 	csKey := types.NamespacedName{
 		Namespace: a.config.Namespace,
-		Name:      imageRef.Name,
+		Name:      a.CatalogSourceName,
 	}
 
 	labels, err := a.labelsFor(ctx, a.IndexImage)