Skip to content

Commit fc37004

Browse files
committed
vendor estroz/api
Signed-off-by: Eric Stroczynski <[email protected]>
1 parent 2bb79e0 commit fc37004

File tree

188 files changed

+46199
-306
lines changed

Some content is hidden

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

188 files changed

+46199
-306
lines changed

go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ replace (
6262
// controller runtime
6363
github.com/openshift/api => github.com/openshift/api v0.0.0-20200331152225-585af27e34fd // release-4.5
6464
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5
65+
// TODO(estro): remove when https://github.com/operator-framework/api/pull/203 gets merged
66+
github.com/operator-framework/api => github.com/estroz/api v0.0.0-20211210023316-b07544801ce1
6567
// Patch for a race condition involving metadata-only
6668
// informers until it can be resolved upstream:
6769
sigs.k8s.io/controller-runtime v0.10.0 => github.com/benluddy/controller-runtime v0.9.3-0.20210720171926-9bcb99bd9bd3

go.sum

+5-24
Large diffs are not rendered by default.

pkg/controller/registry/resolver/constraints/constraint_test.go

-274
This file was deleted.

pkg/controller/registry/resolver/resolver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
"github.com/sirupsen/logrus"
1212
utilerrors "k8s.io/apimachinery/pkg/util/errors"
1313

14+
"github.com/operator-framework/api/pkg/constraints"
1415
"github.com/operator-framework/api/pkg/operators/v1alpha1"
1516
v1alpha1listers "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
1617
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/cache"
17-
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/constraints"
1818
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/projection"
1919
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/solver"
2020
"github.com/operator-framework/operator-registry/pkg/api"

pkg/controller/registry/resolver/resolver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1717
"k8s.io/apimachinery/pkg/labels"
1818

19+
"github.com/operator-framework/api/pkg/constraints"
1920
opver "github.com/operator-framework/api/pkg/lib/version"
2021
"github.com/operator-framework/api/pkg/operators/v1alpha1"
2122
listersv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
2223
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/cache"
23-
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/constraints"
2424
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/solver"
2525
"github.com/operator-framework/operator-registry/pkg/api"
2626
opregistry "github.com/operator-framework/operator-registry/pkg/registry"

vendor/github.com/antlr/antlr4/runtime/Go/antlr/LICENSE

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)