Merge pull request #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})

docs/design/opm-tooling.md

@@ -128,10 +128,30 @@ which can be pushed to appregistry.
 
 **Note**: the appregistry format is being deprecated in favor of the new index image and image bundle format.
 
-### Container Tooling
+### External Container Tooling
 
-Of note, many of these commands require some form of shelling to common container tooling (in the general case at least to pull the bundle image and extract the contents to update the registry). By default, the container tool that `opm` shells to is [podman](https://podman.io/). However, we also support overriding this via the `--container-tool` flag in all of these commands:
+Of note, many of these commands require some form of shelling to common container tooling. By default, the container tool that `opm` shells to is [podman](https://podman.io/). However, we also support overriding this via the `--container-tool`.
 
-`opm registry add -b "quay.io/operator-framework/operator-bundle-prometheus:0.14.0" -d "test-registry.db" --container-tool docker`
+_Ex._
 
-This will run `opm registry add` via the docker runtime.
+`opm index add --bundles quay.io/operator-framework/operator-bundle-prometheus:0.14.0 --tag quay.io/operator-framework/monitoring-index:1.0.0 --container-tool docker`
+
+These commands require shelling to an external tool:
+
+- `opm index add`
+- `opm index rm`
+- `opm index export`
+
+### Self-Contained Container Tooling
+
+There are a few commands that use self-contained container tooling. These commands do not require shelling to an external tool:
+
+- `opm registry add`
+
+#### Configuration
+
+By default, the self-contained tooling uses the standard [Docker config](https://docs.docker.com/engine/reference/commandline/cli/#configuration-files) in the `~/.docker` directory. This can be changed by setting the `DOCKER_CONFIG` environment variable.
+
+#### Authentication
+
+Authentication options [can be added](https://docs.docker.com/engine/reference/commandline/login/#credentials-store) to the standard Docker config. The self-contained tooling should also be able to use the system credential store out-of-the-box.

go.mod

@@ -3,27 +3,50 @@ module github.com/operator-framework/operator-registry
 go 1.13
 
 require (
+	github.com/Microsoft/hcsshim v0.8.7 // indirect
 	github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6
 	github.com/blang/semver v3.5.0+incompatible
+	github.com/containerd/containerd v1.3.2
+	github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c // indirect
+	github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492
 	github.com/docker/distribution v2.7.1+incompatible
+	github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce
+	github.com/docker/docker-credential-helpers v0.6.3 // indirect
+	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
+	github.com/docker/go-metrics v0.0.1 // indirect
+	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
 	github.com/ghodss/yaml v1.0.0
+	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/golang-migrate/migrate/v4 v4.6.2
 	github.com/golang/mock v1.3.1
 	github.com/golang/protobuf v1.3.2
+	github.com/google/go-cmp v0.4.0 // indirect
+	github.com/gorilla/mux v1.7.4 // indirect
 	github.com/grpc-ecosystem/grpc-health-probe v0.2.1-0.20181220223928-2bf0a5b182db
+	github.com/imdario/mergo v0.3.8 // indirect
 	github.com/mattn/go-sqlite3 v1.10.0
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
-	github.com/onsi/ginkgo v1.10.1
-	github.com/onsi/gomega v1.7.0
+	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/onsi/ginkgo v1.12.0
+	github.com/onsi/gomega v1.9.0
+	github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
+	github.com/opencontainers/runc v1.0.0-rc9 // indirect
+	github.com/opencontainers/runtime-spec v0.1.2-0.20190618234442-a950415649c7 // indirect
 	github.com/operator-framework/api v0.1.1
 	github.com/otiai10/copy v1.0.2
-	github.com/pkg/errors v0.8.1
+	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
+	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/cobra v0.0.5
-	github.com/stretchr/testify v1.4.0
+	github.com/spf13/cobra v0.0.6
+	github.com/stretchr/testify v1.5.1
+	go.etcd.io/bbolt v1.3.4
+	golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 // indirect
+	golang.org/x/mod v0.2.0
 	golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
 	google.golang.org/grpc v1.24.0
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v2 v2.2.8
 	k8s.io/api v0.17.3
 	k8s.io/apiextensions-apiserver v0.17.3
@@ -32,3 +55,5 @@ require (
 	k8s.io/klog v1.0.0
 	k8s.io/kubectl v0.17.3
 )
+
+replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d