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 456c309

Browse files
committedMar 12, 2020
feat(opm): add unprivileged registry add
Add the ability to pull and unpack bundle images without using to an external tool or daemon. Also, introduce a new set of bundle image oriented interfaces to decouple image interaction from shelling out to external tools.
1 parent f848752 commit 456c309

File tree

963 files changed

+134480
-1774
lines changed

Some content is hidden

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

963 files changed

+134480
-1774
lines changed
 

‎cmd/opm/registry/add.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ 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]")
30+
rootCmd.Flags().StringP("container-tool", "c", "podman", "tool to interact with container images (save, build, etc.). One of: [docker, podman, unprivileged]")
3131

3232
return rootCmd
3333
}
@@ -53,9 +53,9 @@ func addFunc(cmd *cobra.Command, args []string) error {
5353
}
5454

5555
request := registry.AddToRegistryRequest{
56-
Bundles: bundleImages,
56+
Bundles: bundleImages,
5757
InputDatabase: fromFilename,
58-
Permissive: permissive,
58+
Permissive: permissive,
5959
ContainerTool: containerTool,
6060
}
6161

‎go.mod

+10-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ go 1.13
44

55
require (
66
github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6
7+
github.com/containerd/containerd v1.3.2
8+
github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c // indirect
9+
github.com/deislabs/oras v0.8.1
710
github.com/docker/distribution v2.7.1+incompatible
11+
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
812
github.com/ghodss/yaml v1.0.0
13+
github.com/gogo/googleapis v1.3.2 // indirect
914
github.com/golang-migrate/migrate/v4 v4.6.2
1015
github.com/golang/mock v1.3.1
1116
github.com/golang/protobuf v1.3.2
@@ -14,20 +19,23 @@ require (
1419
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
1520
github.com/onsi/ginkgo v1.10.1
1621
github.com/onsi/gomega v1.7.0
22+
github.com/opencontainers/image-spec v1.0.1
1723
github.com/operator-framework/api v0.1.1
1824
github.com/otiai10/copy v1.0.2
19-
github.com/pkg/errors v0.8.1
25+
github.com/pkg/errors v0.9.1
2026
github.com/sirupsen/logrus v1.4.2
2127
github.com/spf13/cobra v0.0.5
2228
github.com/stretchr/testify v1.4.0
29+
go.etcd.io/bbolt v1.3.3
2330
golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
2431
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
25-
google.golang.org/grpc v1.24.0
32+
google.golang.org/grpc v1.27.0
2633
gopkg.in/yaml.v2 v2.2.8
2734
k8s.io/api v0.17.3
2835
k8s.io/apiextensions-apiserver v0.17.3
2936
k8s.io/apimachinery v0.17.3
3037
k8s.io/client-go v0.17.3
3138
k8s.io/klog v1.0.0
3239
k8s.io/kubectl v0.17.3
40+
rsc.io/letsencrypt v0.0.3 // indirect
3341
)

0 commit comments

Comments
 (0)