Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion _topic_maps/_topic_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1967,7 +1967,7 @@ Topics:
File: olm-understanding-metrics
- Name: Webhooks
File: olm-webhooks
- Name: OperatorHub
- Name: Software catalog
Distros: openshift-enterprise,openshift-origin
File: olm-understanding-operatorhub
- Name: Red Hat-provided Operator catalogs
Expand Down
2 changes: 1 addition & 1 deletion _topic_maps/_topic_map_osd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ Topics:
File: olm-understanding-metrics
- Name: Webhooks
File: olm-webhooks
- Name: OperatorHub
- Name: Software catalog
File: olm-understanding-operatorhub
- Name: Red Hat-provided Operator catalogs
File: olm-rh-catalogs
Expand Down
2 changes: 1 addition & 1 deletion _topic_maps/_topic_map_rosa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ Topics:
File: olm-understanding-metrics
- Name: Webhooks
File: olm-webhooks
- Name: OperatorHub
- Name: Software catalog
File: olm-understanding-operatorhub
- Name: Red Hat-provided Operator catalogs
File: olm-rh-catalogs
Expand Down
2 changes: 1 addition & 1 deletion _topic_maps/_topic_map_rosa_hcp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ Topics:
File: olm-understanding-metrics
- Name: Webhooks
File: olm-webhooks
- Name: OperatorHub
- Name: Software catalog
File: olm-understanding-operatorhub
- Name: Red Hat-provided Operator catalogs
File: olm-rh-catalogs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The {servicebinding-title} manages the data plane for workloads and backing serv

* You have access to an {product-title} cluster using an account with `cluster-admin` permissions.
* You have installed the `oc` CLI.
* You have installed the {servicebinding-title} from OperatorHub.
* You have installed the {servicebinding-title} from the software catalog.

//Deploying PostgreSQL operator
include::modules/sbo-deploying-a-postgresql-database-operator-power-z.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
* You have access to an {product-title} cluster using an account with `dedicated-admin` permissions.
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
* You have installed the `oc` CLI.
* You have installed {servicebinding-title} from OperatorHub.
* You have installed {servicebinding-title} from the software catalog.
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
* You have installed the 5.1.2 version of the Crunchy Postgres for Kubernetes Operator from OperatorHub using the *v5* Update channel. The installed Operator is available in an appropriate namespace, such as the `my-petclinic` namespace.
* You have installed the 5.1.2 version of the Crunchy Postgres for Kubernetes Operator from the software catalog using the *v5* Update channel. The installed Operator is available in an appropriate namespace, such as the `my-petclinic` namespace.
+
[NOTE]
====
You can create the namespace using the `oc create namespace my-petclinic` command.
====
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
* You have installed the 5.1.2 version of the Crunchy Postgres for Kubernetes Operator from OperatorHub using the *v5* Update channel. The installed Operator is available in an appropriate project, such as the `my-petclinic` project.
* You have installed the 5.1.2 version of the Crunchy Postgres for Kubernetes Operator from the software catalog using the *v5* Update channel. The installed Operator is available in an appropriate project, such as the `my-petclinic` project.
+
[NOTE]
====
Expand Down
2 changes: 1 addition & 1 deletion applications/odc-exporting-applications.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ As a developer, you can export your application in the ZIP file format. Based on
[id="prerequisites_odc-exporting-applications"]
== Prerequisites

* You have installed the gitops-primer Operator from the OperatorHub.
* You have installed the gitops-primer Operator from the software catalog.
+
[NOTE]
====
Expand Down
2 changes: 1 addition & 1 deletion architecture/control-plane.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ include::modules/arch-olm-operators.adoc[leveloffset=+2]
[role="_additional-resources"]
.Additional resources
* xref:../operators/understanding/olm/olm-understanding-olm.adoc#olm-understanding-olm[Operator Lifecycle Manager (OLM) concepts and resources]
* xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding OperatorHub].
* xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding the software catalog].

include::modules/etcd-overview.adoc[leveloffset=+1]

Expand Down
2 changes: 1 addition & 1 deletion architecture/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ endif::openshift-dedicated,openshift-rosa[]
As a developer, you can use different tools, methods, and formats to xref:../architecture/understanding-development.adoc#understanding-development[develop your containerized application] based on your unique requirements, for example:

* Use various build-tool, base-image, and registry options to build a simple container application.
* Use supporting components such as OperatorHub and templates to develop your application.
* Use supporting components such as the software catalog and templates to develop your application.
* Package and deploy your application as an Operator.

You can also create a Kubernetes manifest and store it in a Git repository.
Expand Down
4 changes: 2 additions & 2 deletions architecture/understanding-development.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ a logging component. To fulfill that need, you might be able to obtain the
required component from the following Catalogs that are available in the
{product-title} web console:

* OperatorHub, which is available in each {product-title} {product-version}
cluster. The OperatorHub makes Operators available from Red Hat,
* The software catalog, which is available in each {product-title} {product-version}
cluster. The software catalog makes Operators available from Red Hat,
certified Red Hat partners, and community members to the cluster operator. The
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 [error] Vale.Terms: Use 'Operators?' instead of 'operator'.

cluster operator can make those Operators available in all or selected
namespaces in the cluster, so developers can launch them and configure them
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ include::snippets/oadp-mtc-operator.adoc[]

You configure {aws-short} for Velero, create a default `Secret`, and then install the Data Protection Application. For more details, see xref:../../../backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc#oadp-installing-operator-doc[Installing the OADP Operator].

To install the OADP Operator in a restricted network environment, you must first disable the default OperatorHub sources and mirror the Operator catalog. See xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] for details.
To install the OADP Operator in a restricted network environment, you must first disable the default software catalog sources and mirror the Operator catalog. See xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] for details.

You can install {oadp-short} on an AWS {sts-first} (AWS STS) cluster manually. Amazon {aws-short} provides {aws-short} STS as a web service that enables you to request temporary, limited-privilege credentials for users. You use STS to provide trusted users with temporary access to resources via API calls, your {aws-short} console, or the {aws-short} command-line interface (CLI).

Expand All @@ -33,12 +33,12 @@ 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 the software catalog 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"]
== Backing up workload on OADP AWS STS, with an optional cleanup

include::modules/performing-a-backup-oadp-aws-sts.adoc[leveloffset=+2]

include::modules/cleanup-a-backup-oadp-aws-sts.adoc[leveloffset=+2]
include::modules/cleanup-a-backup-oadp-aws-sts.adoc[leveloffset=+2]
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ include::snippets/oadp-mtc-operator.adoc[]

You configure AWS for Velero, create a default `Secret`, and then install the Data Protection Application. For more details, see xref:../../../backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc#oadp-installing-operator-doc[Installing the OADP Operator].

To install the OADP Operator in a restricted network environment, you must first disable the default OperatorHub sources and mirror the Operator catalog. See xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] for details.
To install the OADP Operator in a restricted network environment, you must first disable the default software catalog sources and mirror the Operator catalog. See xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] for details.

include::modules/oadp-s3-and-gov-cloud.adoc[leveloffset=+1]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ include::snippets/oadp-mtc-operator.adoc[]

You configure Azure for Velero, create a default `Secret`, and then install the Data Protection Application. For more details, see xref:../../../backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc#oadp-installing-operator-doc[Installing the OADP Operator].

To install the OADP Operator in a restricted network environment, you must first disable the default OperatorHub sources and mirror the Operator catalog. See xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] for details.
To install the OADP Operator in a restricted network environment, you must first disable the default software catalog sources and mirror the Operator catalog. See xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] for details.


include::modules/migration-configuring-azure.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ include::snippets/oadp-mtc-operator.adoc[]

You configure GCP for Velero, create a default `Secret`, and then install the Data Protection Application. For more details, see xref:../../../backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc#oadp-installing-operator-doc[Installing the OADP Operator].

To install the OADP Operator in a restricted network environment, you must first disable the default OperatorHub sources and mirror the Operator catalog. See xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] for details.
To install the OADP Operator in a restricted network environment, you must first disable the default software catalog sources and mirror the Operator catalog. See xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] for details.

//include::modules/oadp-installing-operator.adoc[leveloffset=+1]
include::modules/migration-configuring-gcp.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ The following storage options are excluded:

For more information, see xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-backing-up-applications-restic-doc.adoc#oadp-backing-up-applications-restic-doc[Backing up applications with File System Backup: Kopia or Restic].
====
To install the OADP Operator in a restricted network environment, you must first disable the default OperatorHub sources and mirror the Operator catalog. See xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] for details.
To install the OADP Operator in a restricted network environment, you must first disable the default software catalog sources and mirror the Operator catalog. See xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] for details.

include::modules/install-and-configure-oadp-kubevirt.adoc[leveloffset=+1]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include::snippets/oadp-mtc-operator.adoc[]

You can create a `Secret` CR for the backup location and install the Data Protection Application. For more details, see xref:../../../backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc#oadp-installing-operator-doc[Installing the OADP Operator].

To install the OADP Operator in a restricted network environment, you must first disable the default OperatorHub sources and mirror the Operator catalog. For details, see xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments].
To install the OADP Operator in a restricted network environment, you must first disable the default software catalog sources and mirror the Operator catalog. For details, see xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments].

//include::modules/oadp-installing-operator.adoc[leveloffset=+1]
include::modules/migration-configuring-mcg.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ You can configure xref:../../../backup_and_restore/application_backup_and_restor

You can create a `Secret` CR for the backup location and install the Data Protection Application. For more details, see xref:../../../backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc#oadp-installing-operator-doc[Installing the OADP Operator].

To install the OADP Operator in a restricted network environment, you must first disable the default OperatorHub sources and mirror the Operator catalog. For details, see xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments].
To install the OADP Operator in a restricted network environment, you must first disable the default software catalog sources and mirror the Operator catalog. For details, see xref:../../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments].

//include::modules/oadp-installing-operator.adoc[leveloffset=+1]
include::modules/oadp-about-backup-snapshot-locations-secrets.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ include::modules/updating-role-arn-oadp-rosa-sts.adoc[leveloffset=+1]
.Additional resources
// This xref points to a topic that is not published in the ROSA docs.
ifndef::openshift-rosa,openshift-rosa-hcp[]
* 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 the software catalog using the web console].
endif::openshift-rosa,openshift-rosa-hcp[]
* xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#backing-up-applications[Backing up applications]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This section uses the `pipelines-tutorial` example to demonstrate the preceding
== Prerequisites

* You have access to an {product-title} cluster.
* You have installed xref:../../cicd/pipelines/installing-pipelines.adoc#installing-pipelines[{pipelines-shortname}] using the {pipelines-title} Operator listed in the OpenShift OperatorHub. After it is installed, it is applicable to the entire cluster.
* You have installed xref:../../cicd/pipelines/installing-pipelines.adoc#installing-pipelines[{pipelines-shortname}] using the {pipelines-title} Operator listed in the software catalog. After it is installed, it is applicable to the entire cluster.
* You have installed xref:../../cli_reference/tkn_cli/installing-tkn.adoc#installing-tkn[{pipelines-shortname} CLI].
* You have forked the front-end link:https://github.com/openshift/pipelines-vote-ui/tree/{pipelines-ver}[`pipelines-vote-ui`] and back-end link:https://github.com/openshift/pipelines-vote-api/tree/{pipelines-ver}[`pipelines-vote-api`] Git repositories using your GitHub ID, and have administrator access to these repositories.
* Optional: You have cloned the link:https://github.com/openshift/pipelines-tutorial/tree/{pipelines-ver}[`pipelines-tutorial`] Git repository.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Install the ACK controller to create and delete buckets in the S3 service by usi
We will use an Operator to make it easy. The Operator installation will also create an `ack-system` namespace and a service account `ack-s3-controller` for you.

. Log in to the cluster console.
. On the left menu, click *Operators*, then *OperatorHub*.
. On the left menu, click *Ecosystem*, then *Software Catalog*.
. In the filter box, enter "S3" and select *AWS Controller for Kubernetes - Amazon S3*.
+
image:cloud-experts-deploying-integrating-ack-operator.png[]
Expand Down Expand Up @@ -390,4 +390,4 @@ $ aws s3 ls s3://${OSTOY_NAMESPACE}-bucket
----
$ aws s3 ls s3://ostoy-bucket
2023-05-04 22:20:51 51 OSToy.txt
----
----
2 changes: 1 addition & 1 deletion cloud_experts_tutorials/cloud-experts-external-dns.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ EOF
$ oc new-project external-dns-operator
----

. Install the `External DNS` Operator from OperatorHub:
. Install the `External DNS` Operator from the software catalog:
+
[source,terminal]
----
Expand Down
6 changes: 3 additions & 3 deletions cloud_experts_tutorials/cloud-experts-using-aws-ack.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ toc::[]

link:https://aws-controllers-k8s.github.io/community/[AWS Controllers for Kubernetes] (ACK) lets you define and use AWS service resources directly from {product-title}. With ACK, you can take advantage of AWS-managed services for your applications without needing to define resources outside of the cluster or run services that provide supporting capabilities such as databases or message queues within the cluster.

You can install various ACK Operators directly from OperatorHub. This makes it easy to get started and use the Operators with your applications. This controller is a component of the AWS Controller for Kubernetes project, which is currently in developer preview.
You can install various ACK Operators directly from the software catalog. This makes it easy to get started and use the Operators with your applications. This controller is a component of the AWS Controller for Kubernetes project, which is currently in developer preview.

Use this tutorial to deploy the ACK S3 Operator. You can also adapt it for any other ACK Operator in the OperatorHub of your cluster.
Use this tutorial to deploy the ACK S3 Operator. You can also adapt it for any other ACK Operator in the software catalog of your cluster.

[id="cloud-experts-using-aws-ack-prerequisites"]
== Prerequisites
Expand Down Expand Up @@ -145,7 +145,7 @@ $ oc -n ack-system create configmap \
--from-env-file=${SCRATCH}/config.txt ack-${ACK_SERVICE}-user-config
----
+
. Install the ACK S3 Operator from OperatorHub:
. Install the ACK S3 Operator from the software catalog:
+
[source,terminal]
----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ include::modules/olm-mirroring-catalog-post.adoc[leveloffset=+2]
[role="_additional-resources"]
.Additional resources

* xref:../../post_installation_configuration/preparing-for-users.adoc#post-install-mirrored-catalogs[Populating OperatorHub from mirrored Operator catalogs]
* xref:../../post_installation_configuration/preparing-for-users.adoc#post-install-mirrored-catalogs[Populating the software catalog from mirrored Operator catalogs]
* xref:../../operators/admin/olm-managing-custom-catalogs.adoc#olm-filtering-fbc_olm-managing-custom-catalogs[Updating or filtering a file-based catalog image]

[id="next-steps_installing-mirroring-installation-images"]
Expand Down
Loading