Code for extension install and delete

Signed-off-by: Lalatendu Mohanty <[email protected]>

Author: LalatenduMohanty

Makefile

@@ -60,6 +60,10 @@ gen-demo:
 lint: $(GOLANGCI_LINT)
 	$(GOLANGCI_LINT) --timeout 3m run
 
+.PHONY: lint-fix
+lint-fix: $(GOLANGCI_LINT) #HELP Run golangci linter.
+	$(GOLANGCI_LINT) run --fix --timeout 3m
+
 .PHONY: release
 RELEASE_ARGS?=release --clean --snapshot
 release: $(GORELEASER)

internal/cmd/internal/olmv1/extension_delete_cmd.go

@@ -0,0 +1,37 @@
+package olmv1
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
+	"github.com/operator-framework/kubectl-operator/internal/cmd/internal/log"
+	v1action "github.com/operator-framework/kubectl-operator/internal/pkg/v1/action"
+	"github.com/operator-framework/kubectl-operator/pkg/action"
+)
+
+func NewExtensionDeleteCmd(cfg *action.Configuration) *cobra.Command {
+	e := v1action.NewExtensionDelete(cfg)
+	e.Logf = log.Printf
+
+	cmd := &cobra.Command{
+		Use:   "extension <extension-name>",
+		Short: "Delete an extension",
+		Long: `Warning: Permanently deletes the named cluster extension object.
+		If the extension contains CRDs, the CRDs will be deleted, which
+		 cascades to the deletion of all operands.`,
+		Args: cobra.ExactArgs(1),
+		Run: func(cmd *cobra.Command, args []string) {
+			e.ExtensionName = args[0]
+			if err := e.Run(cmd.Context()); err != nil {
+				log.Fatalf("delete extension: %v", err)
+			}
+			log.Printf("deleted extension %q", e.ExtensionName)
+		},
+	}
+	bindExtensionDeleteFlags(cmd.Flags(), e)
+	return cmd
+}
+
+func bindExtensionDeleteFlags(fs *pflag.FlagSet, e *v1action.ExtensionDeletion) {
+	fs.BoolVarP(&e.DeleteAll, "all", "a", false, "delete all extensions")
+}

internal/cmd/internal/olmv1/extension_install.go

@@ -1,7 +1,10 @@
 package olmv1
 
 import (
+	"time"
+
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 
 	"github.com/operator-framework/kubectl-operator/internal/cmd/internal/log"
 	v1action "github.com/operator-framework/kubectl-operator/internal/pkg/v1/action"
@@ -13,18 +16,31 @@ func NewExtensionInstallCmd(cfg *action.Configuration) *cobra.Command {
 	i.Logf = log.Printf
 
 	cmd := &cobra.Command{
-		Use:   "install <extension>",
+		Use:   "extension <extension_name>",
 		Short: "Install an extension",
 		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			i.Package = args[0]
+			i.ExtensionName = args[0]
 			_, err := i.Run(cmd.Context())
 			if err != nil {
 				log.Fatalf("failed to install extension: %v", err)
 			}
-			log.Printf("extension %q created", i.Package)
+			log.Printf("extension %q created", i.ExtensionName)
 		},
 	}
+	bindOperatorInstallFlags(cmd.Flags(), i)
 
 	return cmd
 }
+
+func bindOperatorInstallFlags(fs *pflag.FlagSet, i *v1action.ExtensionInstall) {
+	fs.StringVarP(&i.Namespace.Name, "namespace", "n", "", "namespace to install the operator in")
+	fs.ArgsLenAtDash()
+	fs.StringVarP(&i.PackageName, "package-name", "p", "", "package name of the operator to install")
+	fs.StringSliceVarP(&i.Channels, "channels", "c", []string{}, "channels which would be to used for getting updates")
+	fs.StringVarP(&i.Version, "version", "v", "", "version (or version range) from which to resolve bundles")
+	fs.StringVarP(&i.ServiceAccount, "service-account", "s", "default", "service account name to use for the extension installation")
+	fs.StringToStringVarP(&i.CatalogSelector.MatchLabels, "labels", "l", map[string]string{}, "labels that will be used to select catalog")
+	fs.BoolVarP(&i.UnsafeCreateClusterRoleBinding, "unsafe-create-cluster-role-binding", "u", false, "create a cluster role binding for the operator's service account")
+	fs.DurationVarP(&i.CleanupTimeout, "cleanup-timeout", "d", time.Minute, "the amount of time to wait before cancelling cleanup after a failed creation attempt")
+}

internal/cmd/internal/olmv1/extension_uninstall.go

@@ -36,7 +36,10 @@ func newOlmV1Cmd(cfg *action.Configuration) *cobra.Command {
 		Short: "Delete a resource",
 		Long:  "Delete a resource",
 	}
-	deleteCmd.AddCommand(olmv1.NewCatalogDeleteCmd(cfg))
+	deleteCmd.AddCommand(
+		olmv1.NewCatalogDeleteCmd(cfg),
+		olmv1.NewExtensionDeleteCmd(cfg),
+	)
 
 	updateCmd := &cobra.Command{
 		Use:   "update",
@@ -47,9 +50,15 @@ func newOlmV1Cmd(cfg *action.Configuration) *cobra.Command {
 		olmv1.NewExtensionUpdateCmd(cfg),
 	)
 
+	installCmd := &cobra.Command{
+		Use:   "install",
+		Short: "Install a resource",
+		Long:  "Install a resource",
+	}
+	installCmd.AddCommand(olmv1.NewExtensionInstallCmd(cfg))
+
 	cmd.AddCommand(
-		olmv1.NewExtensionInstallCmd(cfg),
-		olmv1.NewExtensionUninstallCmd(cfg),
+		installCmd,
 		getCmd,
 		createCmd,
 		deleteCmd,

internal/cmd/olmv1.go

@@ -13,28 +13,27 @@ import (
 	"github.com/operator-framework/kubectl-operator/pkg/action"
 )
 
-type ExtensionUninstall struct {
-	config *action.Configuration
-
-	Package string
-
-	Logf func(string, ...interface{})
+type ExtensionDeletion struct {
+	config        *action.Configuration
+	ExtensionName string
+	DeleteAll     bool
+	Logf          func(string, ...interface{})
 }
 
-func NewExtensionUninstall(cfg *action.Configuration) *ExtensionUninstall {
-	return &ExtensionUninstall{
+func NewExtensionDelete(cfg *action.Configuration) *ExtensionDeletion {
+	return &ExtensionDeletion{
 		config: cfg,
 		Logf:   func(string, ...interface{}) {},
 	}
 }
 
-func (u *ExtensionUninstall) Run(ctx context.Context) error {
-	opKey := types.NamespacedName{Name: u.Package}
+func (u *ExtensionDeletion) Run(ctx context.Context) error {
+	opKey := types.NamespacedName{Name: u.ExtensionName}
 	op := &olmv1.ClusterExtension{}
 	op.SetName(opKey.Name)
-	op.SetGroupVersionKind(olmv1.GroupVersion.WithKind("Extension"))
-
+	op.SetGroupVersionKind(olmv1.GroupVersion.WithKind("ClusterExtension"))
 	lowerKind := strings.ToLower(op.GetObjectKind().GroupVersionKind().Kind)
+	//Lala:Fixme: return error if extension does not exist
 	if err := u.config.Client.Delete(ctx, op); err != nil && !apierrors.IsNotFound(err) {
 		return fmt.Errorf("delete %s %q: %v", lowerKind, op.GetName(), err)
 	}