Merge pull request operator-framework#213 from njhale/daemonless

feat(opm): add unprivileged registry add

Author: openshift-merge-robot

.gitignore

@@ -454,5 +454,10 @@ bin
 # Ignore vscode
 .vscode
 
-# Igore apprclient meta
+# Ignore apprclient meta
 pkg/apprclient/openapi/git_push.sh
+
+# Never ignore testdata
+!pkg/**/testdata/**
+!test/**testdata/**
+

cmd/opm/registry/add.go

@@ -1,10 +1,10 @@
 package registry
 
 import (
-	"github.com/operator-framework/operator-registry/pkg/lib/registry"
-
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+
+	"github.com/operator-framework/operator-registry/pkg/lib/registry"
 )
 
 func newRegistryAddCmd() *cobra.Command {
@@ -27,36 +27,39 @@ func newRegistryAddCmd() *cobra.Command {
 	rootCmd.Flags().StringP("database", "d", "bundles.db", "relative path to database file")
 	rootCmd.Flags().StringSliceP("bundle-images", "b", []string{}, "comma separated list of links to bundle image")
 	rootCmd.Flags().Bool("permissive", false, "allow registry load errors")
-	rootCmd.Flags().StringP("container-tool", "c", "podman", "tool to interact with container images (save, build, etc.). One of: [docker, podman]")
+	rootCmd.Flags().Bool("skip-tls", false, "skip TLS certificate verification for container image registries while pulling bundles")
+
+	rootCmd.Flags().StringP("container-tool", "c", "", "")
+	if err := rootCmd.Flags().MarkDeprecated("container-tool", "ignored in favor of standalone image manipulation"); err != nil {
+		logrus.Panic(err.Error())
+	}
 
 	return rootCmd
 }
 
 func addFunc(cmd *cobra.Command, args []string) error {
-	bundleImages, err := cmd.Flags().GetStringSlice("bundle-images")
+	permissive, err := cmd.Flags().GetBool("permissive")
 	if err != nil {
 		return err
 	}
-
-	fromFilename, err := cmd.Flags().GetString("database")
+	skipTLS, err := cmd.Flags().GetBool("skip-tls")
 	if err != nil {
 		return err
 	}
-	permissive, err := cmd.Flags().GetBool("permissive")
+	fromFilename, err := cmd.Flags().GetString("database")
 	if err != nil {
 		return err
 	}
-
-	containerTool, err := cmd.Flags().GetString("container-tool")
+	bundleImages, err := cmd.Flags().GetStringSlice("bundle-images")
 	if err != nil {
 		return err
 	}
 
 	request := registry.AddToRegistryRequest{
-		Bundles:       bundleImages,
-		InputDatabase: fromFilename,
 		Permissive:    permissive,
-		ContainerTool: containerTool,
+		SkipTLS:       skipTLS,
+		InputDatabase: fromFilename,
+		Bundles:       bundleImages,
 	}
 
 	logger := logrus.WithFields(logrus.Fields{"bundles": bundleImages})