Merge pull request #212 from openshift-bot/synchronize-upstream

NO-ISSUE: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: 610fff9d801885aff21e25ad9a99066274a4bfed
+expectedMergeBase: 45f86cbcb2ffb3121d3708d6e33732427a339460
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

docs/index.md

@@ -37,3 +37,12 @@ For more details on the evolution of OLM and the roadmap for v1, explore the fol
 
 - [Multi-Tenancy Challenges, Lessons Learned, and Design Shifts](project/olmv1_design_decisions.md)
 - [OLM v1 Roadmap](project/olmv1_roadmap.md)
+
+## Can I Migrate from OLMv0 to OLMv1?
+
+There is currently no concrete migration strategy due to the [conceptual differences between OLMv0 and OLMv1](project/olmv1_design_decisions.md).
+OLMv1, as of writing, supports a subset of the existing content supported by OLMv0.
+For more information regarding the current limitations of OLMv1, see [limitations](project/olmv1_limitations.md).
+
+If your current usage of OLMv0 is compatible with the limitations and expectations of OLMv1, you may be able to manually
+transition to using OLMv1 following the standard workflows we have documented.

go.mod

@@ -249,4 +249,4 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
 
-replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241210193825-501e68b2d094
+replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241212132220-31acec5f2bd4

go.sum

@@ -533,8 +533,8 @@ github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE
 github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11 h1:eTNDkNRNV5lZvUbVM9Nop0lBcljSnA8rZX6yQPZ0ZnU=
 github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11/go.mod h1:EmVJt97N+pfWFsli/ipXTBZqSG5F5KGQhm3c3IsGq1o=
-github.com/openshift/operator-framework-catalogd v0.0.0-20241210193825-501e68b2d094 h1:0nwVMSQ7FOHTrOTNT6JnkTYD9qsPIstQHorCKVMgEBg=
-github.com/openshift/operator-framework-catalogd v0.0.0-20241210193825-501e68b2d094/go.mod h1:ERq4C2ksfkf3wu3XmtGP2fIkBSqS6LfaHhtcSEcU7Ww=
+github.com/openshift/operator-framework-catalogd v0.0.0-20241212132220-31acec5f2bd4 h1:ErjJ04t5nVaMK6GO0otYqH31qH25z2Vb3yxN7/QHddQ=
+github.com/openshift/operator-framework-catalogd v0.0.0-20241212132220-31acec5f2bd4/go.mod h1:ERq4C2ksfkf3wu3XmtGP2fIkBSqS6LfaHhtcSEcU7Ww=
 github.com/operator-framework/api v0.27.0 h1:OrVaGKZJvbZo58HTv2guz7aURkhVKYhFqZ/6VpifiXI=
 github.com/operator-framework/api v0.27.0/go.mod h1:lg2Xx+S8NQWGYlEOvFwQvH46E5EK5IrAIL7HWfAhciM=
 github.com/operator-framework/helm-operator-plugins v0.7.0 h1:YmtIWFc9BaNaDc5mk/dkG0P2BqPZOqpDvjWih5Fczuk=

vendor/modules.txt

@@ -780,7 +780,7 @@ github.com/operator-framework/api/pkg/validation
 github.com/operator-framework/api/pkg/validation/errors
 github.com/operator-framework/api/pkg/validation/interfaces
 github.com/operator-framework/api/pkg/validation/internal
-# github.com/operator-framework/catalogd v1.0.0 => github.com/openshift/operator-framework-catalogd v0.0.0-20241210193825-501e68b2d094
+# github.com/operator-framework/catalogd v1.0.0 => github.com/openshift/operator-framework-catalogd v0.0.0-20241212132220-31acec5f2bd4
 ## explicit; go 1.22.5
 github.com/operator-framework/catalogd/api/v1
 # github.com/operator-framework/helm-operator-plugins v0.7.0
@@ -2060,4 +2060,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
 sigs.k8s.io/yaml/goyaml.v3
-# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241210193825-501e68b2d094
+# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241212132220-31acec5f2bd4