Skip to content

Commit 6e35daf

Browse files
Merge pull request #97705 from michaelryanpeter/ocpbugs-60614-restore-olmv1-cli-only-admon
OCPBUGS#60614: OLMv1 Restore OLMv1 CLI only admonition
2 parents 7459243 + ece9a99 commit 6e35daf

File tree

6 files changed

+33
-2
lines changed

6 files changed

+33
-2
lines changed

extensions/catalogs/catalog-content-resolution.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ If you do not specify any catalog selection criteria, {olmv1-first} selects an e
1919
During resolution, bundles that are not deprecated are preferred over deprecated bundles by default.
2020

2121
include::modules/olmv1-catalog-selection-by-name.adoc[leveloffset=1]
22+
2223
include::modules/olmv1-catalog-selection-by-labels-or-expressions.adoc[leveloffset=1]
24+
2325
include::modules/olmv1-catalog-exclusion-by-labels-or-expressions.adoc[leveloffset=1]
26+
2427
include::modules/olmv1-catalog-selection-by-priority.adoc[leveloffset=1]
28+
2529
include::modules/olmv1-troubleshooting-catalog-selection-errors.adoc[leveloffset=1]

extensions/catalogs/creating-catalogs.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,20 @@ toc::[]
99
Catalog maintainers can create new catalogs in the file-based catalog format for use with {olmv1-first} on {product-title}.
1010

1111
include::modules/olm-creating-fb-catalog-image.adoc[leveloffset=+1]
12+
1213
[role="_additional-resources"]
1314
.Additional resources
1415

1516
* xref:../../cli_reference/opm/cli-opm-ref.adoc#cli-opm-ref[`opm` CLI reference]
1617
1718
include::modules/olm-filtering-fbc.adoc[leveloffset=+1]
19+
1820
ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
1921
[role="_additional-resources"]
2022
.Additional resources
2123
2224
* xref:../../operators/understanding/olm-packaging-format.adoc#olm-deprecations-schema_olm-packaging-format[Packaging format -> Schemas -> olm.deprecations schema]
2325
* xref:../../disconnected/mirroring/installing-mirroring-disconnected.adoc#updating-mirror-registry-content[Mirroring images for a disconnected installation using the oc-mirror plugin -> Keeping your mirror registry content updated]
2426
* xref:../../disconnected/using-olm.adoc#olm-creating-catalog-from-index_olm-restricted-networks[Adding a catalog source to a cluster]
27+
2528
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]

extensions/ce/managing-ce.adoc

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,50 @@ After a catalog has been added to your cluster, you have access to the versions,
1010

1111
You can use custom resources (CRs) to manage extensions declaratively from the CLI.
1212

13+
include::snippets/olmv1-cli-only.adoc[]
14+
1315
include::modules/olmv1-supported-extensions.adoc[leveloffset=+1]
1416

1517
[role="_additional-resources"]
1618
.Additional resources
19+
1720
* xref:../../operators/understanding/olm/olm-operatorconditions.adoc#olm-operatorconditions[Operator conditions]
1821
1922
include::modules/olmv1-finding-operators-to-install.adoc[leveloffset=+1]
23+
2024
include::modules/olmv1-catalog-queries.adoc[leveloffset=+2]
25+
2126
include::modules/olmv1-cluster-extension-permissions.adoc[leveloffset=+1]
27+
2228
include::modules/olmv1-creating-a-namespace.adoc[leveloffset=+2]
29+
2330
include::modules/olmv1-creating-a-service-account.adoc[leveloffset=+2]
31+
2432
include::modules/olmv1-downloading-bundle-manifests.adoc[leveloffset=+2]
33+
2534
include::modules/olmv1-required-rbac-to-install-and-manage-extension-resources.adoc[leveloffset=+2]
35+
2636
include::modules/olmv1-creating-a-cluster-role.adoc[leveloffset=+2]
37+
2738
include::modules/olmv1-example-pipelines-operator-cluster-role.adoc[leveloffset=+2]
39+
2840
include::modules/olmv1-creating-a-cluster-role-binding.adoc[leveloffset=+2]
41+
2942
include::modules/olmv1-installing-an-operator.adoc[leveloffset=+1]
43+
3044
include::modules/olmv1-installing-an-operator-in-a-specific-namespace.adoc[leveloffset=+1]
3145

3246
[role="_additional-resources"]
3347
.Additional resources
48+
3449
* xref:../../extensions/ce/managing-ce.adoc#olmv1-supported-extensions_managing-ce[Supported extensions]
50+
3551
* xref:../../authentication/using-rbac.adoc#rbac-projects-namespaces_using-rbac[Projects and namespaces]
52+
3653
* xref:../../extensions/ce/managing-ce.adoc#olmv1-creating-a-service-account_managing-ce[Creating a service account]
54+
3755
* xref:../../extensions/ce/update-paths.adoc#olmv1-about-target-versions_update-paths[Example custom resources (CRs) that specify a target version]
56+
3857
* xref:../../extensions/ce/update-paths.adoc#olmv1-version-range-support_update-paths[Support for version ranges]
3958
4059
include::modules/olmv1-troubleshooting-rbac-errors-with-preflight-check.adoc[leveloffset=+1]
@@ -43,6 +62,7 @@ include::modules/olmv1-updating-an-operator.adoc[leveloffset=+1]
4362

4463
[role="_additional-resources"]
4564
.Additional resources
65+
4666
* xref:../../extensions/ce/update-paths.adoc#update-paths[Update paths]
4767
4868
include::modules/olmv1-deleting-an-operator.adoc[leveloffset=+1]

extensions/index.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Extensions enable cluster administrators to extend capabilities for users on the
1010

1111
{olm-first} has been included with {product-title} 4 since its initial release. {product-title} {product-version} includes components for a next-generation iteration of {olm} as a Generally Available (GA) feature, known during this phase as _{olmv1}_. This updated framework evolves many of the concepts that have been part of previous versions of {olm} and adds new capabilities.
1212

13+
include::snippets/olmv1-cli-only.adoc[]
14+
1315
[id="olmv1-highlights_{context}"]
1416
== Highlights
1517

modules/olmv1-installing-an-operator.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
You can install an extension from a catalog by creating a custom resource (CR) and applying it to the cluster. {olmv1-first} supports installing cluster extensions, including {olmv0} Operators in the `registry+v1` bundle format, that are scoped to the cluster. For more information, see _Supported extensions_.
1111

12+
include::snippets/olmv1-cli-only.adoc[]
13+
1214
.Prerequisites
1315

1416
* You have created a service account and assigned enough role-based access controls (RBAC) to install, update, and manage the extension that you want to install. For more information, see "Cluster extension permissions".

snippets/olmv1-cli-only.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Text snippet included in the following modules:
22
//
3-
// * operators/olm_v1/olmv1-installing-an-operator-from-a-catalog.adoc
4-
3+
// * extensions/ce/managing-ce.adoc
4+
// * extensions/index.adoc
55

66
:_mod-docs-content-type: SNIPPET
77

0 commit comments

Comments
 (0)