Skip to content

Commit

Permalink
Merge pull request #198 from Bowenislandsong/resolvingCycDependency
Browse files Browse the repository at this point in the history
Removing olm dependency
  • Loading branch information
openshift-merge-robot committed Feb 27, 2020
2 parents 3da1da2 + 3643985 commit 4357be1
Show file tree
Hide file tree
Showing 35 changed files with 1,656 additions and 1,410 deletions.
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ require (
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
github.com/onsi/ginkgo v1.10.1
github.com/onsi/gomega v1.7.0
github.com/operator-framework/api v0.0.0-20200120235816-80fd2f1a09c9
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20191115003340-16619cd27fa5
github.com/operator-framework/api v0.1.0
github.com/otiai10/copy v1.0.1
github.com/pkg/errors v0.8.1
github.com/sirupsen/logrus v1.4.2
Expand Down
312 changes: 2 additions & 310 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/lib/bundle/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"path/filepath"
"strings"

v1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
v "github.com/operator-framework/api/pkg/validation"
v1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
"github.com/operator-framework/operator-registry/pkg/containertools"
"github.com/operator-framework/operator-registry/pkg/registry"

Expand Down
Loading

0 comments on commit 4357be1

Please sign in to comment.