Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 111fcf6

Browse files
committedMar 17, 2020
feat(opm): remove container-tool option on registry add
Remove the container-tool option on opm registry add in favor of exclusively pulling bundle images with the unprivileged implementation.
1 parent 259f74f commit 111fcf6

File tree

287 files changed

+47128
-10880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+47128
-10880
lines changed
 

‎cmd/opm/registry/add.go

-7
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ func newRegistryAddCmd() *cobra.Command {
2727
rootCmd.Flags().StringP("database", "d", "bundles.db", "relative path to database file")
2828
rootCmd.Flags().StringSliceP("bundle-images", "b", []string{}, "comma separated list of links to bundle image")
2929
rootCmd.Flags().Bool("permissive", false, "allow registry load errors")
30-
rootCmd.Flags().StringP("container-tool", "c", "podman", "tool to interact with container images (save, build, etc.). One of: [docker, podman, unprivileged]")
3130

3231
return rootCmd
3332
}
@@ -47,16 +46,10 @@ func addFunc(cmd *cobra.Command, args []string) error {
4746
return err
4847
}
4948

50-
containerTool, err := cmd.Flags().GetString("container-tool")
51-
if err != nil {
52-
return err
53-
}
54-
5549
request := registry.AddToRegistryRequest{
5650
Bundles: bundleImages,
5751
InputDatabase: fromFilename,
5852
Permissive: permissive,
59-
ContainerTool: containerTool,
6053
}
6154

6255
logger := logrus.WithFields(logrus.Fields{"bundles": bundleImages})

‎go.mod

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ require (
1010
github.com/docker/distribution v2.7.1+incompatible
1111
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
1212
github.com/ghodss/yaml v1.0.0
13-
github.com/gogo/googleapis v1.3.2 // indirect
1413
github.com/golang-migrate/migrate/v4 v4.6.2
1514
github.com/golang/mock v1.3.1
1615
github.com/golang/protobuf v1.3.2
@@ -22,11 +21,13 @@ require (
2221
github.com/opencontainers/image-spec v1.0.1
2322
github.com/operator-framework/api v0.1.1
2423
github.com/otiai10/copy v1.0.2
24+
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
2525
github.com/pkg/errors v0.9.1
2626
github.com/sirupsen/logrus v1.4.2
2727
github.com/spf13/cobra v0.0.5
2828
github.com/stretchr/testify v1.4.0
2929
go.etcd.io/bbolt v1.3.3
30+
golang.org/x/mod v0.2.0
3031
golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
3132
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
3233
google.golang.org/grpc v1.27.0
@@ -37,5 +38,6 @@ require (
3738
k8s.io/client-go v0.17.3
3839
k8s.io/klog v1.0.0
3940
k8s.io/kubectl v0.17.3
40-
rsc.io/letsencrypt v0.0.3 // indirect
4141
)
42+
43+
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d

0 commit comments

Comments
 (0)
Please sign in to comment.