Skip to content

Commit 0ef191a

Browse files
Merge pull request #79883 from michaelryanpeter/OCPBUGS-35942-remove-OLMv1-Dependency-resolution-assembly
OCPBUGS#35942: Remove OLMv1 dependency resolution topics
2 parents 2aea580 + 9c11be9 commit 0ef191a

8 files changed

+8
-18
lines changed

_topic_maps/_topic_map.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,8 +2015,6 @@ Topics:
20152015
File: olmv1-operator-controller
20162016
- Name: RukPak
20172017
File: olmv1-rukpak
2018-
- Name: Dependency resolution
2019-
File: olmv1-dependency
20202018
- Name: Catalogd
20212019
File: olmv1-catalogd
20222020
- Name: Installing an Operator from a catalog

modules/olmv1-dependency-concepts.adoc renamed to _unused_topics/olmv1-dependency-concepts.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ Additionally, the user wants to pin the version of A to `v0.1.0`.
7070

7171
.Output
7272
* Resolution set:
73-
** Unable to resolve because A `v0.1.0` requires C `v0.1.0`, which conflicts with B `latest` requiring C `v0.2.0`
73+
** Unable to resolve because A `v0.1.0` requires C `v0.1.0`, which conflicts with B `latest` requiring C `v0.2.0`

modules/olmv1-finding-operators-to-install.adoc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ $ curl -L http://localhost:8080/catalogs/redhat-operators/all.json \
4343

4444
. Run one of the following commands to return a list of Operators and extensions in a catalog.
4545
+
46-
[IMPORTANT]
47-
====
48-
Currently, {olmv1-first} supports extensions that do not use webhooks and are configured to use the `AllNamespaces` install mode. Extensions that use webhooks or that target a single or specified set of namespaces cannot be installed.
49-
====
46+
include:snippets/olmv1-tp-extension-support.adoc[]
5047
+
5148
* Get a list of all the Operators and extensions from the local catalog file by running the following command:
5249
+

modules/olmv1-version-range-support.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
In {olmv1-first}, you can specify a version range by using a comparison string in an Operator or extension's custom resource (CR). If you specify a version range in the CR, {olmv1} installs or updates to the latest version of the Operator that can be resolved within the version range.
1111

1212
.Resolved version workflow
13-
* The resolved version is the latest version of the Operator that satisfies the dependencies and constraints of the Operator and the environment.
13+
* The resolved version is the latest version of the Operator that satisfies the constraints of the Operator and the environment.
1414
* An Operator update within the specified range is automatically installed if it is resolved successfully.
1515
* An update is not installed if it is outside of the specified range or if it cannot be resolved successfully.
16-
17-
For more information about dependency and constraint resolution in {olmv1}, see "Dependency resolution in {olmv1}".

operators/olm_v1/olmv1-installing-an-operator-from-a-catalog.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@ Support for semantic versioning (semver) upgrade constraints was introduced in {
110110
* xref:../../operators/understanding/olm/olm-workflow.adoc#olm-upgrades_olm-workflow[{olmv0-caps} upgrade semantics]
111111

112112
include::modules/olmv1-version-range-support.adoc[leveloffset=+2]
113-
114-
[role="_additional-resources"]
115-
.Additional resources
116-
* xref:../../operators/olm_v1/arch/olmv1-dependency.adoc#olmv1-dependency[Dependency resolution in OLM 1.0]
117-
118113
include::modules/olmv1-version-range-comparisons.adoc[leveloffset=+2]
119114
include::modules/olmv1-about-target-versions.adoc[leveloffset=+2]
120115
include::modules/olmv1-forcing-an-update-or-rollback.adoc[leveloffset=+2]

snippets/olmv1-multi-catalog-admon.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
====
99
If you try to install an Operator or extension that does not have unique name, the installation might fail or lead to an unpredictable result. This occurs for the following reasons:
1010
11-
* If mulitple catalogs are installed on a cluster, {olmv1} does not include a mechanism to specify a catalog when you install an Operator or extension.
12-
* Dependency resolution in {olmv1-first} requires that all of the Operators and extensions that are available to install on a cluster use a unique name for their bundles and packages.
11+
* If mulitple catalogs are installed on a cluster, {olmv1-first} does not include a mechanism to specify a catalog when you install an Operator or extension.
12+
* {olmv1} requires that all of the Operators and extensions that are available to install on a cluster use a unique name for their bundles and packages.
1313
====

snippets/olmv1-tp-extension-support.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88

99
[IMPORTANT]
1010
====
11+
{olmv1} does not support dependency resolution. If an extension declares dependencies for other APIs or packages, the dependencies must be present on the cluster before you attempt to install the extension.
12+
1113
Currently, {olmv1} supports the installation of extensions that meet the following criteria:
1214
1315
* The extension must use the `AllNamespaces` install mode.
1416
* The extension must not use webhooks.
1517
1618
Cluster extensions that use webhooks or that target a single or specified set of namespaces cannot be installed.
17-
====
19+
====

0 commit comments

Comments
 (0)