Skip to content

Commit 4fef87f

Browse files
committed
OSDOCS-15793: modularizes Operators assemblies MicroShift
1 parent 8374096 commit 4fef87f

25 files changed

+172
-108
lines changed

microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ include::_attributes/attributes-microshift.adoc[]
66

77
toc::[]
88

9-
You can use OLM-based Operators in disconnected situations by embedding them in a {op-system-ostree-first} image.
9+
[role="_abstract"]
10+
You can use Operators managed by Operator Lifecycle Manager (OLM) for various tasks in disconnected situations by embedding them in a {op-system-ostree-first} image.
1011

11-
//Using OLM disconnected
1212
include::modules/microshift-olm-deploy-op-disconnected-con.adoc[leveloffset=+1]
1313

14-
//additional resources for embedding operators into rhel for edge disconnected
15-
[role="_additional-resources"]
16-
.Additional resources
17-
* link:https://access.redhat.com/documentation/en-us/red_hat_build_of_microshift/{ocp-version}/html/embedding_in_a_rhel_for_edge_image/microshift-embed-in-rpm-ostree#microshift-creating-ostree-iso_microshift-embed-in-rpm-ostree[Creating the RHEL for Edge image]
18-
* xref:../../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc#microshift-embed-rpm-ostree-offline-use[Embedding in a {op-system-ostree} image for offline use]
19-
* xref:../../microshift_networking/microshift-disconnected-network-config.adoc#microshift-networking-disconnected-hosts[Configuring network settings for fully disconnected hosts]
20-
2114
include::modules/microshift-oc-mirror-dry-run.adoc[leveloffset=+2]
2215

2316
include::modules/microshift-oc-mirror-embed-ops-disconnected-use.adoc[leveloffset=+2]
2417

2518
include::modules/microshift-ops-config-embed-ostree.adoc[leveloffset=+2]
19+
20+
[id="additional-resources_microshift-operators-oc-mirror-disconnected"]
21+
[role="_additional-resources"]
22+
== Additional resources
23+
24+
* xref:../../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc#microshift-embed-rpm-ostree-offline-use[Embedding in a {op-system-ostree} image for offline use]
25+
* xref:../../microshift_networking/microshift-disconnected-network-config.adoc#microshift-networking-disconnected-hosts[Configuring network settings for fully disconnected hosts]

microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ include::_attributes/attributes-microshift.adoc[]
66

77
toc::[]
88

9-
You can create custom catalogs with widely available Operators and mirror them by using the oc-mirror {oc-first} plugin.
9+
[role="_abstract"]
10+
You can create custom catalogs with widely available Operators and mirror them by using the oc-mirror {oc-first} plugin. Custom catalogs give you the tool so that you can host Operators locally, or control a variety of factors, such as versions and access.
1011

1112
include::modules/microshift-olm-rh-ops-mirror.adoc[leveloffset=+1]
1213

microshift_running_apps/microshift_operators/microshift-operators-olm.adoc

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,58 +6,28 @@ include::_attributes/attributes-microshift.adoc[]
66

77
toc::[]
88

9-
Operator Lifecycle Manager (OLM) is used in {microshift-short} for installing and running optional add-on Operators. See the following link for more information:
9+
[role="_abstract"]
10+
You can use Operator Lifecycle Manager (OLM) with {microshift-short} to install and run optional add-on Operators.
1011

11-
* link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.20/html/operators/understanding-operators#operator-lifecycle-manager-olm[Operator Lifecycle Manager]
12+
include::modules/microshift-olm-considerations.adoc[leveloffset=+1]
1213

13-
[id="microshift-olm-considerations_{context}"]
14-
== Considerations for using OLM with {microshift-short}
15-
16-
* Cluster Operators as applied in {ocp} are not used in {microshift-short}.
17-
* You must create your own catalogs for the add-on Operators you want to use with your applications. Catalogs are not provided by default.
18-
** Each catalog must have an accessible `CatalogSource` added to a node, so that the OLM catalog Operator can use the catalog for content.
19-
* You must use the CLI to conduct OLM activities with {microshift-short}. The console and OperatorHub GUIs are not available.
20-
** Use the link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/cli_tools/opm-cli#cli-opm-install[Operator Package Manager `opm` CLI] with a network-connected node, or for building catalogs for custom Operators that use an internal registry.
21-
** To mirror your catalogs and Operators for disconnected or offline nodes, install link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html-single/disconnected_environments/index#installation-oc-mirror-installing-plugin_about-installing-oc-mirror-v2.
22-
23-
[IMPORTANT]
24-
====
25-
Before using an Operator, verify with the provider that the Operator is supported on {product-title}.
26-
====
27-
28-
[id="microshift-installing-olm-options_{context}"]
29-
== Determining your OLM installation type
30-
You can install the OLM package manager for use with {microshift-short} 4.15 or newer versions. There are different ways to install OLM for a {microshift-short} node, depending on your use case.
31-
32-
* You can install the `microshift-olm` RPM at the same time you install the {microshift-short} RPM on {op-system-base-full}.
33-
* You can install the `microshift-olm` on an existing {microshift-short} {product-version}. Restart the {microshift-short} service after installing OLM for the changes to apply.
34-
See xref:../../microshift_install_rpm/microshift-install-rpm.adoc#microshift-install-rpms-olm_microshift-install-rpm[Installing the Operator Lifecycle Manager (OLM) from an RPM package].
35-
* You can embed OLM in a {op-system-ostree-first} image. See xref:../../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-adding-olm-to-blueprint_microshift-embed-in-rpm-ostree[Adding the Operator Lifecycle Manager (OLM) service to a blueprint].
14+
include::modules/microshift-installing-olm-options.adoc[leveloffset=+1]
3615

3716
include::modules/microshift-olm-namespaces.adoc[leveloffset=+1]
3817

3918
include::modules/microshift-olm-build-op-catalogs.adoc[leveloffset=+1]
4019

41-
//additional resources for building catalogs module
42-
[role="_additional-resources"]
43-
.Additional resources
44-
* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/cli_tools/opm-cli[`opm` CLI reference]
45-
* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html-single/operators/index#olm-about-catalogs_olm-rh-catalogs[About Operator catalogs]
46-
* To create file-based catalogs by using the `opm` CLI, see link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/operators/administrator-tasks#olm-managing-custom-catalogs[Managing custom catalogs]
47-
4820
include::modules/microshift-olm-deploy-ops-con.adoc[leveloffset=+1]
4921

50-
//additional resources for deploying operators concept module
51-
[role="_additional-resources"]
52-
.Additional resources
53-
* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html-single/operators/index#olm-operatorgroups-membership_olm-understanding-operatorgroups[Operator group membership]
54-
5522
include::modules/microshift-olm-deploy-ops-global-ns.adoc[leveloffset=+2]
5623

5724
include::modules/microshift-olm-deploy-ops-spec-ns.adoc[leveloffset=+2]
5825

59-
//additional resources for working with operators after deployment
26+
[id="Additional-resources_microshift-operators-oc-mirror_{context}"]
6027
[role="_additional-resources"]
61-
.Additional resources
28+
== Additional resources
29+
30+
* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html/operators/understanding-operators#operator-lifecycle-manager-olm[Operator Lifecycle Manager]
31+
* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/cli_tools/opm-cli[`opm` CLI reference]
6232
* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html/operators/administrator-tasks#olm-upgrading-operators[Updating installed Operators]
6333
* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html/operators/administrator-tasks#olm-deleting-operator-from-a-cluster-using-cli_olm-deleting-operators-from-a-cluster[Deleting Operators from a cluster using the CLI]
Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
[id="operators-with-microshift"]
2+
[id="microshift-operators"]
33
= Using Operators with {microshift-short}
44
include::_attributes/attributes-microshift.adoc[]
5-
:context: operators-microshift
5+
:context: microshift-operators
66

77
toc::[]
88

9-
You can use Operators with {microshift-short} to create applications that monitor the running services in your node. Operators can manage applications and their resources, such as deploying a database or message bus. As customized software running inside your node, Operators can be used to implement and automate common operations.
9+
[role="_abstract"]
10+
You can use Operators with {microshift-short} to create applications that monitor the running services in your node. As customized software running inside your node, you can use Operators to implement and automate common operations.
1011

11-
Operators offer a more localized configuration experience and integrate with Kubernetes APIs and CLI tools such as `kubectl` and `oc`. Operators are designed specifically for your applications. Operators enable you to configure components instead of modifying a global configuration file.
12+
include::modules/microshift-about-using-operators.adoc[leveloffset=+1]
1213

13-
{microshift-short} applications are generally expected to be deployed in static environments. However, Operators are available if helpful in your use case. To determine the compatibility of an Operator with {microshift-short}, check the Operator documentation.
14-
15-
[id="microshift-operators-installation-paths_{context}"]
16-
== How to use Operators with a {microshift-short} node
17-
18-
There are two ways to use Operators for your {microshift-short} node:
19-
20-
[id="microshift-operators-paths-manifests_{context}"]
21-
=== Manifests for Operators
22-
Operators can be installed and managed directly by using manifests. You can use the `kustomize` configuration management tool with {microshift-short} to deploy an application. Use the same steps to install Operators with manifests.
23-
24-
* See xref:../../microshift_running_apps/microshift-applications.adoc#microshift-manifests-overview_applications-microshift[Using Kustomize manifests to deploy applications] and xref:../../microshift_running_apps/microshift-applications.adoc#microshift-applying-manifests-example_applications-microshift[Using manifests example] for details.
25-
26-
[id="microshift-operators-paths-olm_{context}"]
27-
=== Operator Lifecycle Manager for Operators
28-
You can also install add-on Operators to a {microshift-short} node by using Operator Lifecycle Manager (OLM). OLM can be used to manage both custom Operators and Operators that are widely available. Building catalogs is required to use OLM with {microshift-short}.
29-
30-
* For details, see xref:../../microshift_running_apps/microshift_operators/microshift-operators-olm.adoc#microshift-operators-olm[Using Operator Lifecycle Manager with {microshift-short}].
14+
include::modules/microshift-operators-how-to-install-and-manage.adoc[leveloffset=+1]
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//Module included in the following assemblies:
2+
//
3+
//* microshift_running_apps/microshift_operators/microshift-operators.adoc
4+
5+
:_mod-docs-content-type: CONCEPT
6+
[id="microshift-about-using-operators_{context}"]
7+
= About using Operators with a {microshift-short} node
8+
9+
[role="_abstract"]
10+
You can use Operators to manage applications and their resources, such as deploying a database or message bus.
11+
12+
Operators offer a more localized configuration experience and integrate with Kubernetes APIs and CLI tools such as `kubectl` and `oc`. You can design or use Operators that are specifically for your applications. By using Operators, you can configure components instead of modifying a global configuration file.
13+
14+
{microshift-short} applications are generally expected to be deployed in static environments. However, Operators are available if helpful in your use case. To discover whether an Operator is compatible with {microshift-short}, check the Operator documentation.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//Module included in the following assemblies:
2+
//
3+
//* microshift_running_apps/microshift_operators/microshift-operators-olm.adoc
4+
5+
:_mod-docs-content-type: CONCEPT
6+
[id="microshift-installing-olm-options_{context}"]
7+
= Determining your OLM installation type
8+
9+
[role="_abstract"]
10+
You can install Operator Lifecycle Manager (OLM) for use with {microshift-short} 4.16 or newer versions. There are different ways to install OLM for a {microshift-short} node, depending on your use case.
11+
12+
* You can install the `microshift-olm` RPM at the same time you install the {microshift-short} RPM on {op-system-base-full}.
13+
* You can install the `microshift-olm` on an existing {microshift-short} {product-version}. Restart the {microshift-short} service after installing OLM for the changes to apply.
14+
* See the following links for specifics on each installation type:
15+
** link:https://docs.redhat.com/en/documentation/red_hat_build_of_microshift/4.20/html/installing_optional_rpm_packages/microshift-install-optional-rpms#microshift-installing-with-olm-from-rpm-package_microshift-install-optional-rpm[Installing the Operator Lifecycle Manager (OLM) from an RPM package]
16+
** link:https://docs.redhat.com/en/documentation/red_hat_build_of_microshift/4.20/html/embedding_in_a_rhel_for_edge_image/microshift-embed-in-rpm-ostree#microshift-adding-other-services-to-blueprint_microshift-embed-in-rpm-ostree[Adding other packages to a blueprint]

modules/microshift-oc-mirror-about-con.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[id="microshift-using-oc-mirror_{context}"]
77
= About the oc-mirror plugin for creating a mirror registry
88

9-
You can use the oc-mirror OpenShift CLI (oc) plugin with {microshift-short} to filter and delete images from Operator catalogs. You can then mirror the filtered catalog contents to a mirror registry or use the container images in disconnected or offline deployments.
9+
[role="_abstract"]
10+
You can use the oc-mirror {oc-first} plugin with {microshift-short} to filter and delete images from Operator catalogs. You can then mirror the filtered catalog contents to a mirror registry or use the container images in disconnected or offline deployments.
1011

1112
The procedure to mirror content from Red Hat-hosted registries connected to the internet to a disconnected image registry is the same, independent of the registry you select. After you mirror the contents of your catalog, configure each node to retrieve this content from your mirror registry.

modules/microshift-oc-mirror-connectivity.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
[id="microshift-connectivity-considerations_{context}"]
77
= Connectivity considerations when populating a mirror registry
88

9-
When you populate your registry, you can use one of following connectivity scenarios:
9+
[role="_abstract"]
10+
When you populate your mirror registry, you can use connected or disconnected mirroring depending on your use case.
1011

1112
Connected mirroring::
1213
If you have a host that can access both the internet and your mirror registry, but not your node, you can directly mirror the content from that machine.

modules/microshift-oc-mirror-creating-imageset-config.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
[id="microshift-oc-mirror-creating-imageset-config_{context}"]
77
= Creating an image set configuration file
88

9-
You must create an `ImageSetConfiguration` YAML file. This image set configuration file specifies both the Operators to mirror and the configuration settings for the oc-mirror plugin. Edit the contents of the image set configuration file so that the entries are compatible with both {microshift-short} and the Operator you plan to use.
9+
[role="_abstract"]
10+
You must create an `ImageSetConfiguration` YAML file to specify both the Operators to mirror and the configuration settings for the oc-mirror plugin. Edit the contents of the file so that the entries are compatible with both {microshift-short} and the Operator you plan to use.
1011

1112
[NOTE]
1213
====
@@ -54,6 +55,7 @@ The `platform` field, related fields, and Helm are not supported by {microshift-
5455
. Save the updated file as `ImageSetConfiguration.yaml`.
5556

5657
.Next steps
58+
5759
* Use the oc-mirror plugin to mirror an image set directly to a target mirror registry.
5860
* Configure CRI-O.
5961
* Apply the catalog sources to your node.

modules/microshift-oc-mirror-dry-run.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// Module included in the following assemblies:
22
//
3-
// * microshift_running_apps/microshift_operators/microshift-operators-olm.adoc
3+
// * microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc
44

55
:_mod-docs-content-type: PROCEDURE
66
[id="microshift-oc-mirror-dry-run_{context}"]
77
= Performing a dry run
88

9-
You can use oc-mirror to perform a dry run, without actually mirroring any images. A dry run means you can review the list of images to be mirrored. You can catch any errors with your image set configuration early by using a dry run, or use the generated list of images with other tools to conduct mirroring.
9+
[role="_abstract"]
10+
You can use oc-mirror to perform a dry run so that you can review the list of images to be mirrored. By using a dry run, you can catch any errors with your image set configuration early or use the generated list of images with other tools to conduct mirroring.
1011

1112
.Prerequisites
1213

0 commit comments

Comments
 (0)