From b34645cf0f49f1947f920064bde73d2d22d37745 Mon Sep 17 00:00:00 2001 From: dfitzmau Date: Wed, 5 Mar 2025 12:55:46 +0000 Subject: [PATCH] OCPBUGS-499969: Removed 4.10 and 4.11 references from MetalLB docs --- .../aws-sts/oadp-aws-sts.adoc | 2 +- .../oadp-rosa-backing-up-applications.adoc | 2 +- modules/installing-oadp-aws-sts.adoc | 2 +- modules/installing-oadp-rosa-sts.adoc | 2 +- .../nw-metalLB-basic-upgrade-operator.adoc | 75 +++++++++--- .../nw-metallb-installing-operator-cli.adoc | 2 +- ...lb-operators-from-a-cluster-using-cli.adoc | 56 --------- ...tors-from-a-cluster-using-web-console.adoc | 31 ----- ...installing-from-operatorhub-using-cli.adoc | 12 +- ...ng-from-operatorhub-using-web-console.adoc | 2 +- .../olm-updating-metallb-operatorgroup.adoc | 113 ------------------ .../metallb/metallb-upgrading-operator.adoc | 29 +---- .../distr-tracing-tempo-installing.adoc | 2 +- observability/otel/otel-installing.adoc | 2 +- .../olm-adding-operators-to-cluster.adoc | 8 +- 15 files changed, 81 insertions(+), 259 deletions(-) delete mode 100644 modules/olm-deleting-metallb-operators-from-a-cluster-using-cli.adoc delete mode 100644 modules/olm-deleting-metallb-operators-from-a-cluster-using-web-console.adoc delete mode 100644 modules/olm-updating-metallb-operatorgroup.adoc diff --git a/backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc b/backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc index ea570e2bdb2c..a0e2301ed98e 100644 --- a/backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc +++ b/backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc @@ -32,7 +32,7 @@ include::modules/installing-oadp-aws-sts.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-from-operatorhub-using-web-console_olm-installing-operators-in-namespace[Installing from OperatorHub using the web console] +* xref:../../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-from-operatorhub-using-web-console_olm-installing-operators-in-namespace[Installing from OperatorHub by using the web console] * xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#backing-up-applications[Backing up applications] [id="oadp-aws-sts-backing-up-and-cleaning"] diff --git a/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc b/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc index c14470b45362..3167bc388f7e 100644 --- a/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc +++ b/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc @@ -32,7 +32,7 @@ include::modules/installing-oadp-rosa-sts.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-from-operatorhub-using-web-console_olm-installing-operators-in-namespace[Installing from OperatorHub using the web console]. +* xref:../../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-from-operatorhub-using-web-console_olm-installing-operators-in-namespace[Installing from OperatorHub by using the web console]. * xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#backing-up-applications[Backing up applications] [id="oadp-rosa-backing-up-and-cleaning"] diff --git a/modules/installing-oadp-aws-sts.adoc b/modules/installing-oadp-aws-sts.adoc index 4617d39e67e9..de362a29d11e 100644 --- a/modules/installing-oadp-aws-sts.adoc +++ b/modules/installing-oadp-aws-sts.adoc @@ -56,7 +56,7 @@ $ oc -n openshift-adp create secret generic cloud-credentials \ ==== In {product-title} versions 4.14 and later, the OADP Operator supports a new standardized {sts-short} workflow through the Operator Lifecycle Manager (OLM) and Cloud Credentials Operator (CCO). In this workflow, you do not need to create the above -secret, you only need to supply the role ARN during the installation of OLM-managed operators using the {product-title} web console, for more information see _Installing from OperatorHub using the web console_. +secret, you only need to supply the role ARN during the installation of OLM-managed operators using the {product-title} web console, for more information see _Installing from OperatorHub by using the web console_. The preceding secret is created automatically by CCO. ==== diff --git a/modules/installing-oadp-rosa-sts.adoc b/modules/installing-oadp-rosa-sts.adoc index 584177a0b6a9..e517853a3cb4 100644 --- a/modules/installing-oadp-rosa-sts.adoc +++ b/modules/installing-oadp-rosa-sts.adoc @@ -69,7 +69,7 @@ $ oc -n openshift-adp create secret generic cloud-credentials \ ==== In {product-title} versions 4.14 and later, the OADP Operator supports a new standardized {sts-short} workflow through the Operator Lifecycle Manager (OLM) and Cloud Credentials Operator (CCO). In this workflow, you do not need to create the above -secret, you only need to supply the role ARN during the installation of OLM-managed operators using the {product-title} web console, for more information see _Installing from OperatorHub using the web console_. +secret, you only need to supply the role ARN during the installation of OLM-managed operators using the {product-title} web console, for more information see _Installing from OperatorHub by using the web console_. The preceding secret is created automatically by CCO. ==== diff --git a/modules/nw-metalLB-basic-upgrade-operator.adoc b/modules/nw-metalLB-basic-upgrade-operator.adoc index 740172a3e071..8c0870bade23 100644 --- a/modules/nw-metalLB-basic-upgrade-operator.adoc +++ b/modules/nw-metalLB-basic-upgrade-operator.adoc @@ -3,61 +3,100 @@ // * networking/metallb/metallb-upgrading-operator.adoc :_mod-docs-content-type: PROCEDURE - [id="upgrading-metallb-operator_{context}"] -= Upgrading the MetalLB Operator += Manually upgrading the MetalLB Operator +To manually control upgrading the MetalLB Operator, you must edit the `Subscription` custom resource (CR) that subscribes the namespace to `metallb-system`. A `Subscription` CR is created as part of the Operator installation and the CR has the `installPlanApproval` parameter set to `Automatic` by default. .Prerequisites +* You updated your cluster to the latest z-stream release. +* You used OperatorHub to install the MetalLB Operator. * Access the cluster as a user with the `cluster-admin` role. .Procedure -. Verify that the `metallb-system` namespace still exists: +. Get the YAML definition of the `metallb-operator` subscription in the `metallb-system` namespace by entering the following command: + [source,terminal] ---- -$ oc get namespaces | grep metallb-system +$ oc -n metallb-system get subscription metallb-operator -o yaml ---- + +. Edit the `Subscription` CR by setting the `installPlanApproval` parameter to `Manual`: + -.Example output -[source,terminal] +[source,yaml] ---- -metallb-system Active 31m +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: metallb-operator + namespace: metallb-system +# ... +spec: + channel: stable + installPlanApproval: Manual + name: metallb-operator + source: redhat-operators + sourceNamespace: openshift-marketplace +# ... ---- -. Verify the `metallb` custom resource still exists: +. Find the latest {product-title} {product-version} version of the MetalLB Operator by entering the following command: + [source,terminal] ---- -$ oc get metallb -n metallb-system +$ oc -n metallb-system get csv ---- + .Example output +[source,terminal,subs="attributes+"] +---- +NAME DISPLAY VERSION REPLACES PHASE +metallb-operator.v{product-version}.0 MetalLB Operator {product-version}.0 Succeeded +---- + +. Check the install plan that exists in the namespace by entering the following command. ++ [source,terminal] ---- -NAME AGE -metallb 33m +$ oc -n metallb-system get installplan +---- ++ +.Example output that shows install-tsz2g as a manual install plan +[source,terminal,subs="attributes+"] +---- +NAME CSV APPROVAL APPROVED +install-shpmd metallb-operator.v{product-version}.0-202502261233 Automatic true +install-tsz2g metallb-operator.v{product-version}.0-202503102139 Manual false ---- -. Follow the guidance in "Installing from OperatorHub using the CLI" to install the latest {product-version} version of the MetalLB Operator. +. Edit the install plan that exists in the namespace by entering the following command. Ensure that you replace `` with the name of the install plan, such as `install-tsz2g`. ++ +[source,terminal] +---- +$ oc edit installplan -n metallb-system +---- ++ +.. With the install plan open in your editor, set the `spec.approval` parameter to `Manual` and set the `spec.approved` parameter to `true`. + [NOTE] ==== -When installing the latest {product-version} version of the MetalLB Operator, you must install the Operator to the same namespace it was previously installed to. +After you edit the install plan, the upgrade operation starts. If you enter the `oc -n metallb-system get csv` command during the upgrade operation, the output might show the `Replacing` or the `Pending` status. ==== -. Verify the upgraded version of the Operator is now the {product-version} version. +.Verification + +. Verify the upgrade was successful by entering the following command: + [source,terminal] ---- -$ oc get csv -n metallb-system +$ oc -n metallb-system get csv ---- + .Example output -[source,terminal,subs="attributes+"] +[source,terminal] ---- -NAME DISPLAY VERSION REPLACES PHASE -metallb-operator.{product-version}.0-202207051316 MetalLB Operator {product-version}.0-202207051316 Succeeded +NAME DISPLAY VERSION REPLACE PHASE +metallb-operator.v.0-202503102139 MetalLB Operator {product-version}.0-202503102139 metallb-operator.v{product-version}.0-202502261233 Succeeded ---- diff --git a/modules/nw-metallb-installing-operator-cli.adoc b/modules/nw-metallb-installing-operator-cli.adoc index c4e5e1a4dc45..ba41ec8b837b 100644 --- a/modules/nw-metallb-installing-operator-cli.adoc +++ b/modules/nw-metallb-installing-operator-cli.adoc @@ -4,7 +4,7 @@ :_mod-docs-content-type: PROCEDURE [id="nw-metallb-installing-operator-cli_{context}"] -= Installing from OperatorHub using the CLI += Installing from OperatorHub by using the CLI Instead of using the {product-title} web console, you can install an Operator from OperatorHub using the CLI. You can use the OpenShift CLI (`oc`) to install the MetalLB Operator. diff --git a/modules/olm-deleting-metallb-operators-from-a-cluster-using-cli.adoc b/modules/olm-deleting-metallb-operators-from-a-cluster-using-cli.adoc deleted file mode 100644 index 33ccf4148e75..000000000000 --- a/modules/olm-deleting-metallb-operators-from-a-cluster-using-cli.adoc +++ /dev/null @@ -1,56 +0,0 @@ -// Module included in the following assemblies: -// -// * operators/metallb/metallb-upgrading-operator.adoc - -:_mod-docs-content-type: PROCEDURE -[id="olm-deleting-metallb-operator-from-a-cluster-using-cli_{context}"] -= Deleting MetalLB Operator from a cluster using the CLI - -Cluster administrators can delete installed Operators from a selected namespace by using the CLI. - -.Prerequisites - -- Access to an {product-title} cluster using an account with -`cluster-admin` permissions. -- `oc` command installed on workstation. - -.Procedure - -. Check the current version of the subscribed MetalLB Operator in the `currentCSV` field: -+ -[source,terminal] ----- -$ oc get subscription metallb-operator -n metallb-system -o yaml | grep currentCSV ----- -+ -.Example output -[source,terminal] ----- - currentCSV: metallb-operator.4.10.0-202207051316 ----- - -. Delete the subscription: -+ -[source,terminal] ----- -$ oc delete subscription metallb-operator -n metallb-system ----- -+ -.Example output -[source,terminal] ----- -subscription.operators.coreos.com "metallb-operator" deleted ----- - -. Delete the CSV for the Operator in the target namespace using the `currentCSV` value from the previous step: -+ -[source,terminal] ----- -$ oc delete clusterserviceversion metallb-operator.4.10.0-202207051316 -n metallb-system ----- -+ -.Example output -[source,terminal] ----- -clusterserviceversion.operators.coreos.com "metallb-operator.4.10.0-202207051316" deleted ----- diff --git a/modules/olm-deleting-metallb-operators-from-a-cluster-using-web-console.adoc b/modules/olm-deleting-metallb-operators-from-a-cluster-using-web-console.adoc deleted file mode 100644 index 5f58edc508fa..000000000000 --- a/modules/olm-deleting-metallb-operators-from-a-cluster-using-web-console.adoc +++ /dev/null @@ -1,31 +0,0 @@ -// Module included in the following assemblies: -// -// * operators/metallb/metallb-upgrading-operator.adoc - -:_mod-docs-content-type: PROCEDURE -[id="olm-deleting-metallb-operator-from-a-cluster-using-web-console_{context}"] -= Deleting the MetalLB Operator from a cluster using the web console - -Cluster administrators can delete installed Operators from a selected namespace by using the web console. - -.Prerequisites - -- Access to an {product-title} cluster web console using an account with -`cluster-admin` permissions. - -.Procedure - -. Navigate to the *Operators* → *Installed Operators* page. - -. Search for the MetalLB Operator. Then, click on it. - -. On the right side of the *Operator Details* page, select *Uninstall Operator* from the *Actions* drop-down menu. -+ -An *Uninstall Operator?* dialog box is displayed. - -. Select *Uninstall* to remove the Operator, Operator deployments, and pods. Following this action, the Operator stops running and no longer receives updates. -+ -[NOTE] -==== -This action does not remove resources managed by the Operator, including custom resource definitions (CRDs) and custom resources (CRs). Dashboards and navigation items enabled by the web console and off-cluster resources that continue to run might need manual clean up. To remove these after uninstalling the Operator, you might need to manually delete the Operator CRDs. -==== diff --git a/modules/olm-installing-from-operatorhub-using-cli.adoc b/modules/olm-installing-from-operatorhub-using-cli.adoc index 29a4c0a91dcc..fc899494632f 100644 --- a/modules/olm-installing-from-operatorhub-using-cli.adoc +++ b/modules/olm-installing-from-operatorhub-using-cli.adoc @@ -13,14 +13,14 @@ endif::[] :_mod-docs-content-type: PROCEDURE [id="olm-installing-operator-from-operatorhub-using-cli_{context}"] -= Installing from OperatorHub using the CLI += Installing from OperatorHub by using the CLI Instead of using the {product-title} web console, you can install an Operator from OperatorHub by using the CLI. Use the `oc` command to create or update a `Subscription` object. .Prerequisites ifndef::olm-user[] -- Access to an {product-title} cluster using an account with +* Access to an {product-title} cluster using an account with ifdef::openshift-enterprise,openshift-webscale,openshift-origin[] `cluster-admin` permissions. endif::[] @@ -30,10 +30,10 @@ endif::[] endif::[] ifdef::olm-user[] -- Access to an {product-title} cluster using an account with Operator installation permissions. +* Access to an {product-title} cluster using an account with Operator installation permissions. endif::[] -- You have installed the OpenShift CLI (`oc`). +* You have installed the OpenShift CLI (`oc`). .Procedure @@ -82,7 +82,7 @@ However, if the Operator uses the `SingleNamespace` mode and you do not already * The web console version of this procedure handles the creation of the `OperatorGroup` and `Subscription` objects automatically behind the scenes for you when choosing `SingleNamespace` mode. * You can only have one Operator group per namespace. For more information, see "Operator groups". ==== - ++ .. Create an `OperatorGroup` object YAML file, for example `operatorgroup.yaml`: + .Example `OperatorGroup` object @@ -101,7 +101,7 @@ spec: -- include::snippets/operator-group-unique-name.adoc[] -- - ++ .. Create the `OperatorGroup` object: + [source,terminal] diff --git a/modules/olm-installing-from-operatorhub-using-web-console.adoc b/modules/olm-installing-from-operatorhub-using-web-console.adoc index c81480378003..09b38e4edf9c 100644 --- a/modules/olm-installing-from-operatorhub-using-web-console.adoc +++ b/modules/olm-installing-from-operatorhub-using-web-console.adoc @@ -30,7 +30,7 @@ endif::[] :_mod-docs-content-type: PROCEDURE [id="olm-installing-from-operatorhub-using-web-console_{context}"] -= Installing from OperatorHub using the web console += Installing from OperatorHub by using the web console You can install and subscribe to an Operator from OperatorHub by using the {product-title} web console. diff --git a/modules/olm-updating-metallb-operatorgroup.adoc b/modules/olm-updating-metallb-operatorgroup.adoc deleted file mode 100644 index 9f9a85bb0d55..000000000000 --- a/modules/olm-updating-metallb-operatorgroup.adoc +++ /dev/null @@ -1,113 +0,0 @@ -// Module included in the following assemblies: -// -// * operators/metallb/metallb-upgrading-operator.adoc - -:_mod-docs-content-type: PROCEDURE -[id="olm-updating-metallb-operatorgroup_{context}"] -= Editing the MetalLB Operator Operator group - -When upgrading from any MetalLB Operator version up to and including 4.10 to 4.11 and later, remove `spec.targetNamespaces` from the Operator group custom resource (CR). You must remove the spec regardless of whether you used the web console or the CLI to delete the MetalLB Operator. -[NOTE] -==== -The MetalLB Operator version 4.11 or later only supports the `AllNamespaces` install mode, whereas 4.10 or earlier versions support `OwnNamespace` or `SingleNamespace` modes. -==== - -.Prerequisites - -- You have access to an {product-title} cluster with `cluster-admin` permissions. -- You have installed the OpenShift CLI (`oc`). - -.Procedure - -. List the Operator groups in the `metallb-system` namespace by running the following command: -+ -[source,terminal] ----- -$ oc get operatorgroup -n metallb-system ----- -+ -.Example output - -[source,terminal] ----- -NAME AGE -metallb-system-7jc66 85m ----- - -. Verify that the `spec.targetNamespaces` is present in the Operator group CR associated with the `metallb-system` namespace by running the following command: -+ -[source,terminal] ----- -$ oc get operatorgroup metallb-system-7jc66 -n metallb-system -o yaml ----- -+ -.Example output -[source,terminal] ----- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - annotations: - olm.providedAPIs: "" - creationTimestamp: "2023-10-25T09:42:49Z" - generateName: metallb-system- - generation: 1 - name: metallb-system-7jc66 - namespace: metallb-system - resourceVersion: "25027" - uid: f5f644a0-eef8-4e31-a306-e2bbcfaffab3 -spec: - targetNamespaces: - - metallb-system - upgradeStrategy: Default -status: - lastUpdated: "2023-10-25T09:42:49Z" - namespaces: - - metallb-system ----- - -. Edit the Operator group and remove the `targetNamespaces` and `metallb-system` present under the `spec` section by running the following command: -+ -[source,terminal] ----- -$ oc edit n metallb-system ----- -+ -.Example output -+ -[source,terminal] ----- -operatorgroup.operators.coreos.com/metallb-system-7jc66 edited ----- - -. Verify the `spec.targetNamespaces` is removed from the Operator group custom resource associated with the `metallb-system` namespace by running the following command: -+ -[source,terminal] ----- -$ oc get operatorgroup metallb-system-7jc66 -n metallb-system -o yaml ----- -+ -.Example output -[source,terminal] ----- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - annotations: - olm.providedAPIs: "" - creationTimestamp: "2023-10-25T09:42:49Z" - generateName: metallb-system- - generation: 2 - name: metallb-system-7jc66 - namespace: metallb-system - resourceVersion: "61658" - uid: f5f644a0-eef8-4e31-a306-e2bbcfaffab3 -spec: - upgradeStrategy: Default -status: - lastUpdated: "2023-10-25T14:31:30Z" - namespaces: - - "" ----- - - diff --git a/networking/metallb/metallb-upgrading-operator.adoc b/networking/metallb/metallb-upgrading-operator.adoc index 02de16cacea4..c61222abc1e0 100644 --- a/networking/metallb/metallb-upgrading-operator.adoc +++ b/networking/metallb/metallb-upgrading-operator.adoc @@ -6,37 +6,16 @@ include::_attributes/common-attributes.adoc[] toc::[] -If you are currently running version 4.10 or an earlier version of the MetalLB Operator, please note that automatic updates to any version later than 4.10 do not work. Upgrading to a newer version from any version of the MetalLB Operator that is 4.11 or later is successful. For example, upgrading from version 4.12 to version 4.13 will occur smoothly. +A `Subscription` custom resource (CR) that subscribes the namespace to `metallb-system` by default, automatically sets the `installPlanApproval` parameter to `Automatic`. This means that when Red{nbsp}Hat-provided Operator catalogs include a newer version of the MetalLB Operator, the MetalLB Operator is automatically upgraded. -A summary of the upgrade procedure for the MetalLB Operator from 4.10 and earlier is as follows: +If you need to manually control upgrading the MetalLB Operator, set the `installPlanApproval` parameter to `Manual`. -. Delete the installed MetalLB Operator version for example 4.10. Ensure that the namespace and the `metallb` custom resource are not removed. - -. Using the CLI, install the MetalLB Operator {product-version} in the same namespace where the previous version of the MetalLB Operator was installed. - -[NOTE] -==== -This procedure does not apply to automatic z-stream updates of the MetalLB Operator, which follow the standard straightforward method. -==== - -For detailed steps to upgrade the MetalLB Operator from 4.10 and earlier, see the guidance that follows. As a cluster administrator, start the upgrade process by deleting the MetalLB Operator by using the OpenShift CLI (`oc`) or the web console. - -//Delete metallb using web console -include::modules/olm-deleting-metallb-operators-from-a-cluster-using-web-console.adoc[leveloffset=+1] - -//Delete metallb using cli -include::modules/olm-deleting-metallb-operators-from-a-cluster-using-cli.adoc[leveloffset=+1] - -//Delete targetNamespace -include::modules/olm-updating-metallb-operatorgroup.adoc[leveloffset=+1] - -//Upgrade the MetalLB +// Manually upgrading the MetalLB Operator include::modules/nw-metalLB-basic-upgrade-operator.adoc[leveloffset=+1] [id="additional-resources"] == Additional resources -* xref:../../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[Deleting Operators from a cluster] +* xref:../../updating/understanding_updates/intro-to-updates.adoc#intro-to-updates_intro-to-updates[Introduction to OpenShift updates] * xref:../../networking/metallb/metallb-operator-install.adoc#metallb-operator-install[Installing the MetalLB Operator] - diff --git a/observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.adoc b/observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.adoc index 7c87e7731734..8b9b1594735e 100644 --- a/observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.adoc +++ b/observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.adoc @@ -87,6 +87,6 @@ include::modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc[level * xref:../../../post_installation_configuration/preparing-for-users.adoc#creating-cluster-admin_post-install-preparing-for-users[Creating a cluster admin] * link:https://operatorhub.io/[OperatorHub.io] * xref:../../../web_console/web-console.adoc#web-console[Accessing the web console] -* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console] +* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub by using the web console] * xref:../../../operators/user/olm-creating-apps-from-installed-operators.adoc#olm-creating-apps-from-installed-operators[Creating applications from installed Operators] * xref:../../../cli_reference/openshift_cli/getting-started-cli.adoc#getting-started-cli[Getting started with the OpenShift CLI] diff --git a/observability/otel/otel-installing.adoc b/observability/otel/otel-installing.adoc index 3a3bacef4730..e4d93cbdc901 100644 --- a/observability/otel/otel-installing.adoc +++ b/observability/otel/otel-installing.adoc @@ -29,6 +29,6 @@ include::modules/otel-creating-required-RBAC-resources-automatically.adoc[levelo * xref:../../post_installation_configuration/preparing-for-users.adoc#creating-cluster-admin_post-install-preparing-for-users[Creating a cluster admin] * link:https://operatorhub.io/[OperatorHub.io] * xref:../../web_console/web-console.adoc#web-console[Accessing the web console] -* xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console] +* xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub by using the web console] * xref:../../operators/user/olm-creating-apps-from-installed-operators.adoc#olm-creating-apps-from-installed-operators[Creating applications from installed Operators] * xref:../../cli_reference/openshift_cli/getting-started-cli.adoc#getting-started-cli[Getting started with the OpenShift CLI] diff --git a/operators/admin/olm-adding-operators-to-cluster.adoc b/operators/admin/olm-adding-operators-to-cluster.adoc index 36683b81c880..dfa3edcee50e 100644 --- a/operators/admin/olm-adding-operators-to-cluster.adoc +++ b/operators/admin/olm-adding-operators-to-cluster.adoc @@ -38,8 +38,11 @@ include::modules/olm-installing-operators-from-operatorhub.adoc[leveloffset=+1] * xref:../../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding OperatorHub] +// Installing from OperatorHub by using the CLI include::modules/olm-installing-from-operatorhub-using-web-console.adoc[leveloffset=+1] + ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-rosa[] + include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+1] [role="_additional-resources"] @@ -58,7 +61,7 @@ include::modules/olm-installing-specific-version-cli.adoc[leveloffset=+1] include::modules/olm-preparing-multitenant-operators.adoc[leveloffset=+1] .Next steps -* Install the Operator in the tenant Operator namespace. This task is more easily performed by using the OperatorHub in the web console instead of the CLI; for a detailed procedure, see xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console]. +* Install the Operator in the tenant Operator namespace. This task is more easily performed by using the OperatorHub in the web console instead of the CLI; for a detailed procedure, "Installing from OperatorHub by using the web console". + [NOTE] ==== @@ -71,9 +74,10 @@ After completing the Operator installation, the Operator resides in the tenant O * xref:../../operators/understanding/olm-multitenancy.adoc#olm-multitenancy[Operators in multitenant clusters] include::modules/olm-installing-global-namespaces.adoc[leveloffset=+1] + .Next steps -* Install the desired Operator in your custom global namespace. Because the web console does not populate the *Installed Namespace* menu during Operator installation with custom global namespaces, this task can only be performed with the OpenShift CLI (`oc`). For a detailed procedure, see xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operator-from-operatorhub-using-cli_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the CLI]. +* Install the desired Operator in your custom global namespace. Because the web console does not populate the *Installed Namespace* menu during Operator installation with custom global namespaces, the install task can only be performed with the OpenShift CLI (`oc`). For a detailed installation procedure, see "Installing from OperatorHub by using the CLI". + [NOTE] ====