Skip to content

Commit cd9498a

Browse files
authored
Merge branch '3099-add-subscription-status' into deprecation_sub
2 parents 0aa3ac6 + 03d2a03 commit cd9498a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ require (
5959
)
6060

6161
replace (
62-
github.com/operator-framework/api => github.com/dtfranz/api v0.0.0-20231109073835-cdc1720a9152
62+
github.com/operator-framework/api => github.com/operator-framework/api v0.19.1-0.20231109165736-6b3567d593e4
6363
github.com/operator-framework/operator-registry => github.com/grokspawn/operator-registry v1.26.6-0.20231108225233-1c9bbc6d340a
6464
google.golang.org/grpc => google.golang.org/grpc v1.40.0
6565
)

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,8 @@ github.com/openshift/api v0.0.0-20221021112143-4226c2167e40 h1:PxjGCA72RtsdHWToZ
608608
github.com/openshift/api v0.0.0-20221021112143-4226c2167e40/go.mod h1:aQ6LDasvHMvHZXqLHnX2GRmnfTWCF/iIwz8EMTTIE9A=
609609
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c h1:CV76yFOTXmq9VciBR3Bve5ZWzSxdft7gaMVB3kS0rwg=
610610
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c/go.mod h1:lFMO8mLHXWFzSdYvGNo8ivF9SfF6zInA8ZGw4phRnUE=
611+
github.com/operator-framework/api v0.19.1-0.20231109165736-6b3567d593e4 h1:hbg7SPVsjWYibfHqrFb4+SXxBIgLqoBgCAbuh6vpQTE=
612+
github.com/operator-framework/api v0.19.1-0.20231109165736-6b3567d593e4/go.mod h1:SCCslqke6AVOJ5JM+NqNE1CHuAgJLScsL66pnPaSMXs=
611613
github.com/otiai10/copy v1.12.0 h1:cLMgSQnXBs1eehF0Wy/FAGsgDTDmAqFR7rQylBb1nDY=
612614
github.com/otiai10/copy v1.12.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww=
613615
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=

vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ github.com/openshift/client-go/config/informers/externalversions/config/v1alpha1
650650
github.com/openshift/client-go/config/informers/externalversions/internalinterfaces
651651
github.com/openshift/client-go/config/listers/config/v1
652652
github.com/openshift/client-go/config/listers/config/v1alpha1
653-
# github.com/operator-framework/api v0.19.0 => github.com/dtfranz/api v0.0.0-20231109073835-cdc1720a9152
653+
# github.com/operator-framework/api v0.19.0 => github.com/operator-framework/api v0.19.1-0.20231109165736-6b3567d593e4
654654
## explicit; go 1.19
655655
github.com/operator-framework/api/crds
656656
github.com/operator-framework/api/pkg/constraints
@@ -2207,7 +2207,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
22072207
# sigs.k8s.io/yaml v1.3.0
22082208
## explicit; go 1.12
22092209
sigs.k8s.io/yaml
2210-
# github.com/operator-framework/api => github.com/dtfranz/api v0.0.0-20231109073835-cdc1720a9152
2210+
# github.com/operator-framework/api => github.com/operator-framework/api v0.19.1-0.20231109165736-6b3567d593e4
22112211
# github.com/operator-framework/operator-registry => github.com/grokspawn/operator-registry v1.26.6-0.20231108225233-1c9bbc6d340a
22122212
# google.golang.org/grpc => google.golang.org/grpc v1.40.0
22132213
# github.com/openshift/api => github.com/openshift/api v0.0.0-20221021112143-4226c2167e40

0 commit comments

Comments
 (0)