Skip to content

Commit 4731eae

Browse files
tylerslatonTyler Slaton
authored andcommitted
feat: update api version to be 0.12.0 in order to use new Not constraint (#2603)
Signed-off-by: Tyler Slaton <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 7a6de4804c92a309fa085a189a9fdf37ece2a731
1 parent 05d11b2 commit 4731eae

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

staging/operator-lifecycle-manager/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/onsi/gomega v1.15.0
2626
github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
2727
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
28-
github.com/operator-framework/api v0.10.8-0.20211210205029-40cb9fd4036a
28+
github.com/operator-framework/api v0.12.0
2929
github.com/operator-framework/operator-registry v1.17.5
3030
github.com/otiai10/copy v1.2.0
3131
github.com/pkg/errors v0.9.1

staging/operator-lifecycle-manager/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -927,8 +927,8 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ
927927
github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
928928
github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
929929
github.com/operator-framework/api v0.7.1/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
930-
github.com/operator-framework/api v0.10.8-0.20211210205029-40cb9fd4036a h1:tX+zUHdTkn7NfLt9Y8zjsfmSeZkE+sKQEZRqYkVdHYo=
931-
github.com/operator-framework/api v0.10.8-0.20211210205029-40cb9fd4036a/go.mod h1:FTiYGm11fZQ3cSX+EQHc/UWoGZAwkGfyeHU+wMJ8jmA=
930+
github.com/operator-framework/api v0.12.0 h1:aHxHk50/Y1J4Ogdk2J6tYofgX+GEqyBPCMyun+JFqV4=
931+
github.com/operator-framework/api v0.12.0/go.mod h1:FTiYGm11fZQ3cSX+EQHc/UWoGZAwkGfyeHU+wMJ8jmA=
932932
github.com/operator-framework/operator-registry v1.17.5 h1:LR8m1rFz5Gcyje8WK6iYt+gIhtzqo52zMRALdmTYHT0=
933933
github.com/operator-framework/operator-registry v1.17.5/go.mod h1:sRQIgDMZZdUcmHltzyCnM6RUoDF+WS8Arj1BQIARDS8=
934934
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=

staging/operator-lifecycle-manager/pkg/controller/registry/resolver/resolver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,8 +815,8 @@ func (pc *predicateConverter) convertConstraints(constraints ...constraints.Cons
815815
case constraint.Any != nil:
816816
subs, perr := pc.convertConstraints(constraint.Any.Constraints...)
817817
preds[i], err = cache.Or(subs...), perr
818-
case constraint.None != nil:
819-
subs, perr := pc.convertConstraints(constraint.None.Constraints...)
818+
case constraint.Not != nil:
819+
subs, perr := pc.convertConstraints(constraint.Not.Constraints...)
820820
preds[i], err = cache.Not(subs...), perr
821821
case constraint.Cel != nil:
822822
preds[i], err = cache.CreateCelPredicate(pc.celEnv, constraint.Cel.Rule, constraint.Message)

staging/operator-lifecycle-manager/pkg/controller/registry/resolver/resolver_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ func TestSolveOperators_OLMConstraint_CompoundAny(t *testing.T) {
953953
}
954954
}
955955

956-
func TestSolveOperators_OLMConstraint_CompoundNone(t *testing.T) {
956+
func TestSolveOperators_OLMConstraint_CompoundNot(t *testing.T) {
957957
namespace := "olm"
958958
csName := "community"
959959
catalog := cache.SourceKey{Name: csName, Namespace: namespace}
@@ -965,10 +965,10 @@ func TestSolveOperators_OLMConstraint_CompoundNone(t *testing.T) {
965965
properties: []*api.Property{
966966
{
967967
Type: constraints.OLMConstraintType,
968-
Value: `{"message": "compound none constraint",
968+
Value: `{"message": "compound not constraint",
969969
"all": {"constraints": [
970970
{"gvk": {"group": "g0", "version": "v0", "kind": "k0"}},
971-
{"none": {"constraints": [
971+
{"not": {"constraints": [
972972
{"gvk": {"group": "g1", "version": "v1", "kind": "k1"}},
973973
{"gvk": {"group": "g2", "version": "v2", "kind": "k2"}}
974974
]}}

vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/resolver.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)