Skip to content

Commit f666f9d

Browse files
ecordellnjhale
authored andcommittedApr 2, 2020
feat(deamonless): add buildah-based deamonless image puller
this still requires some refactoring and does not implement Unpack
1 parent d05586a commit f666f9d

File tree

41 files changed

+1242
-51
lines changed

Some content is hidden

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

41 files changed

+1242
-51
lines changed
 

‎cmd/opm/registry/add.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,28 @@ func newRegistryAddCmd() *cobra.Command {
3838
}
3939

4040
func addFunc(cmd *cobra.Command, args []string) error {
41-
bundleImages, err := cmd.Flags().GetStringSlice("bundle-images")
41+
permissive, err := cmd.Flags().GetBool("permissive")
4242
if err != nil {
4343
return err
4444
}
45-
fromFilename, err := cmd.Flags().GetString("database")
45+
skipTLS, err := cmd.Flags().GetBool("skip-tls")
4646
if err != nil {
4747
return err
4848
}
49-
permissive, err := cmd.Flags().GetBool("permissive")
49+
fromFilename, err := cmd.Flags().GetString("database")
5050
if err != nil {
5151
return err
5252
}
53-
skipTLS, err := cmd.Flags().GetBool("skip-tls")
53+
bundleImages, err := cmd.Flags().GetStringSlice("bundle-images")
5454
if err != nil {
5555
return err
5656
}
5757

5858
request := registry.AddToRegistryRequest{
59-
Bundles: bundleImages,
60-
InputDatabase: fromFilename,
6159
Permissive: permissive,
6260
SkipTLS: skipTLS,
61+
InputDatabase: fromFilename,
62+
Bundles: bundleImages,
6363
}
6464

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

‎go.mod

+7-11
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,40 @@ module github.com/operator-framework/operator-registry
33
go 1.13
44

55
require (
6-
github.com/Microsoft/hcsshim v0.8.7 // indirect
76
github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6
87
github.com/blang/semver v3.5.0+incompatible
98
github.com/containerd/containerd v1.3.2
109
github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c // indirect
10+
github.com/containers/buildah v1.14.3
1111
github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492
1212
github.com/docker/distribution v2.7.1+incompatible
1313
github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce
14-
github.com/docker/docker-credential-helpers v0.6.3 // indirect
1514
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
1615
github.com/ghodss/yaml v1.0.0
1716
github.com/gogo/protobuf v1.3.1 // indirect
1817
github.com/golang-migrate/migrate/v4 v4.6.2
1918
github.com/golang/mock v1.3.1
2019
github.com/golang/protobuf v1.3.2
21-
github.com/google/go-cmp v0.4.0 // indirect
2220
github.com/grpc-ecosystem/grpc-health-probe v0.2.1-0.20181220223928-2bf0a5b182db
2321
github.com/mattn/go-sqlite3 v1.10.0
2422
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
2523
github.com/morikuni/aec v1.0.0 // indirect
26-
github.com/onsi/ginkgo v1.10.1
27-
github.com/onsi/gomega v1.7.0
28-
github.com/opencontainers/image-spec v1.0.1
29-
github.com/opencontainers/runc v0.1.1 // indirect
24+
github.com/onsi/ginkgo v1.12.0
25+
github.com/onsi/gomega v1.9.0
26+
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
3027
github.com/operator-framework/api v0.1.1
3128
github.com/otiai10/copy v1.0.2
3229
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
3330
github.com/pkg/errors v0.9.1
3431
github.com/sirupsen/logrus v1.4.2
35-
github.com/spf13/cobra v0.0.5
36-
github.com/stretchr/testify v1.4.0
32+
github.com/spf13/cobra v0.0.6
33+
github.com/stretchr/testify v1.5.1
3734
go.etcd.io/bbolt v1.3.3
38-
golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d // indirect
3935
golang.org/x/mod v0.2.0
4036
golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
4137
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
4238
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
43-
google.golang.org/grpc v1.23.1
39+
google.golang.org/grpc v1.24.0
4440
gopkg.in/yaml.v2 v2.2.8
4541
k8s.io/api v0.17.3
4642
k8s.io/apiextensions-apiserver v0.17.3

0 commit comments

Comments
 (0)