Skip to content

Commit bf64b98

Browse files
authored
Revert "Revert "OSDOCS-14501: Prune Operators""
1 parent 80ec26f commit bf64b98

37 files changed

+236
-180
lines changed

modules/olm-about-catalogs.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ An Operator catalog is a repository of metadata that Operator Lifecycle Manager
1010

1111
An index image, based on the Operator bundle format, is a containerized snapshot of a catalog. It is an immutable artifact that contains the database of pointers to a set of Operator manifest content. A catalog can reference an index image to source its content for OLM on the cluster.
1212

13-
As catalogs are updated, the latest versions of Operators change, and older versions may be removed or altered. In addition, when OLM runs on an {product-title} cluster in a restricted network environment, it is unable to access the catalogs directly from the internet to pull the latest content.
13+
As catalogs are updated, the latest versions of Operators change, and older versions may be removed or altered. In addition, when OLM runs on
14+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
15+
an {product-title}
16+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
17+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
18+
a {product-title}
19+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
20+
cluster in a restricted network environment, it is unable to access the catalogs directly from the internet to pull the latest content.
1421

1522
As a cluster administrator, you can create your own custom index image, either based on a Red Hat-provided catalog or from scratch, which can be used to source the catalog content on the cluster. Creating and updating your own index image provides a method for customizing the set of Operators available on the cluster, while also avoiding the aforementioned restricted network environment issues.
1623

modules/olm-catalog-source-and-psa.adoc

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,25 @@
88

99
_Pod security admission_ was introduced in {product-title} 4.11 to ensure pod security standards. Catalog sources built using the SQLite-based catalog format and a version of the `opm` CLI tool released before {product-title} 4.11 cannot run under restricted pod security enforcement.
1010

11-
In {product-title} {product-version}, namespaces do not have restricted pod security enforcement by default and the default catalog source security mode is set to `legacy`.
11+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
12+
In {product-title} {product-version},
13+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
14+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
15+
In {product-title},
16+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
17+
namespaces do not have restricted pod security enforcement by default and the default catalog source security mode is set to `legacy`.
1218

1319
Default restricted enforcement for all namespaces is planned for inclusion in a future {product-title} release. When restricted enforcement occurs, the security context of the pod specification for catalog source pods must match the restricted pod security standard. If your catalog source image requires a different pod security standard, the pod security admissions label for the namespace must be explicitly set.
1420

1521
[NOTE]
1622
====
17-
If you do not want to run your SQLite-based catalog source pods as restricted, you do not need to update your catalog source in {product-title} {product-version}.
23+
If you do not want to run your SQLite-based catalog source pods as restricted, you do not need to update your catalog source in
24+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
25+
{product-title} {product-version}.
26+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
27+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
28+
{product-title}.
29+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1830
1931
However, it is recommended that you take action now to ensure your catalog sources run under restricted pod security enforcement. If you do not take action to ensure your catalog sources run under restricted pod security enforcement, your catalog sources might not run in future {product-title} releases.
2032
====

modules/olm-catalogsource-image-template.adoc

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ endif::[]
1212
[id="olm-catalogsource-image-template_{context}"]
1313
= Image template for custom catalog sources
1414

15-
Operator compatibility with the underlying cluster can be expressed by a catalog source in various ways. One way, which is used for the default Red Hat-provided catalog sources, is to identify image tags for index images that are specifically created for a particular platform release, for example {product-title} {product-version}.
15+
Operator compatibility with the underlying cluster can be expressed by a catalog source in various ways. One way, which is used for the default Red Hat-provided catalog sources, is to identify image tags for index images that are specifically created for a particular platform release, for example
16+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
17+
{product-title} {product-version}.
18+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
19+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
20+
{product-title}.
21+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1622

1723
During a cluster upgrade, the index image tag for the default Red Hat-provided catalog sources are updated automatically by the Cluster Version Operator (CVO) so that Operator Lifecycle Manager (OLM) pulls the updated version of the catalog. For example during an upgrade from {product-title} {ocp-nminus1} to {product-version}, the `spec.image` field in the `CatalogSource` object for the `redhat-operators` catalog is updated from:
1824

@@ -38,7 +44,7 @@ Starting in {product-title} 4.9, cluster administrators can add the `olm.catalog
3844

3945
[NOTE]
4046
====
41-
You must specify the Kubernetes cluster version and not an {product-title} cluster version, as the latter is not currently available for templating.
47+
You must specify the Kubernetes cluster version and not the {product-title} cluster version, as the latter is not currently available for templating.
4248
====
4349

4450
Provided that you have created and pushed an index image with a tag specifying the updated Kubernetes version, setting this annotation enables the index image versions in custom catalogs to be automatically changed after a cluster upgrade. The annotation value is used to set or update the image reference in the `spec.image` field of the `CatalogSource` object. This helps avoid cluster upgrades leaving Operator installations in unsupported states or without a continued update path.
@@ -77,7 +83,14 @@ If the `spec.image` field and the `olm.catalogImageTemplate` annotation are both
7783
If the `spec.image` field is not set and the annotation does not resolve to a usable pull spec, OLM stops reconciliation of the catalog source and sets it into a human-readable error condition.
7884
====
7985

80-
For an {product-title} {product-version} cluster, which uses Kubernetes 1.33, the `olm.catalogImageTemplate` annotation in the preceding example resolves to the following image reference:
86+
For
87+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
88+
an {product-title} {product-version}
89+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
90+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
91+
a {product-title}
92+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
93+
cluster, which uses Kubernetes 1.33, the `olm.catalogImageTemplate` annotation in the preceding example resolves to the following image reference:
8194

8295
[source,terminal]
8396
----

modules/olm-colocation-namespaces.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ These scenarios can lead to the following issues:
2020
2121
These issues usually surface because, when installing Operators with the {product-title} web console, the default behavior installs Operators that support the *All namespaces* install mode into the default `openshift-operators` global namespace.
2222

23-
ifndef::openshift-dedicated,openshift-rosa[]
23+
ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
2424
As a cluster administrator,
25-
endif::openshift-dedicated,openshift-rosa[]
26-
ifdef::openshift-dedicated,openshift-rosa[]
25+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
26+
ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
2727
As an administrator with the `dedicated-admin` role,
28-
endif::openshift-dedicated,openshift-rosa[]
28+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
2929
you can bypass this default behavior manually by using the following workflow:
3030

31-
ifndef::openshift-dedicated,openshift-rosa[]
31+
ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
3232
. Create a namespace for the installation of the Operator.
33-
endif::openshift-dedicated,openshift-rosa[]
33+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
3434
// In OSD/ROSA, dedicated-admins can create projects, but not namespaces.
35-
ifdef::openshift-dedicated,openshift-rosa[]
35+
ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
3636
. Create a project for the installation of the Operator.
37-
endif::openshift-dedicated,openshift-rosa[]
37+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
3838
. Create a custom _global Operator group_, which is an Operator group that watches all namespaces. By associating this Operator group with the namespace you just created, it makes the installation namespace a global namespace, which makes Operators installed there available in all namespaces.
3939
. Install the desired Operator in the installation namespace.
4040

modules/olm-creating-catalog-from-index.adoc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,39 @@ endif::[]
2626
= Adding a catalog source to a cluster
2727

2828
Adding a catalog source to an {product-title} cluster enables the discovery and installation of Operators for users.
29-
ifndef::openshift-dedicated,openshift-rosa[]
29+
ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
3030
Cluster administrators
31-
endif::openshift-dedicated,openshift-rosa[]
32-
ifdef::openshift-dedicated,openshift-rosa[]
31+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
32+
ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
3333
Administrators with the `dedicated-admin` role
34-
endif::openshift-dedicated,openshift-rosa[]
34+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
3535
can create a `CatalogSource` object that references an index image. OperatorHub uses catalog sources to populate the user interface.
3636

3737
// In OSD/ROSA, a dedicated-admin can see catalog sources here, but can't add, edit, or delete them.
38-
ifndef::openshift-dedicated,openshift-rosa[]
38+
ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
3939
[TIP]
4040
====
4141
Alternatively, you can use the web console to manage catalog sources. From the *Administration* -> *Cluster Settings* -> *Configuration* -> *OperatorHub* page, click the *Sources* tab, where you can create, update, delete, disable, and enable individual sources.
4242
====
43-
endif::openshift-dedicated,openshift-rosa[]
43+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
4444

4545
// In OSD/ROSA, a dedicated-admin can update catalog sources in the console by searching for them.
46-
ifdef::openshift-dedicated,openshift-rosa[]
46+
ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
4747
[TIP]
4848
====
4949
Alternatively, you can use the web console to manage catalog sources. From the *Home* -> *Search* page, select a project, click the *Resources* drop-down and search for `CatalogSource`. You can create, update, delete, disable, and enable individual sources.
5050
====
51-
endif::openshift-dedicated,openshift-rosa[]
51+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
5252

5353
.Prerequisites
5454

5555
* You built and pushed an index image to a registry.
56-
ifndef::openshift-dedicated,openshift-rosa[]
56+
ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
5757
* You have access to the cluster as a user with the `cluster-admin` role.
58-
endif::openshift-dedicated,openshift-rosa[]
59-
ifdef::openshift-dedicated,openshift-rosa[]
58+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
59+
ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
6060
* You have access to the cluster as a user with the `dedicated-admin` role.
61-
endif::openshift-dedicated,openshift-rosa[]
61+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
6262
6363
.Procedure
6464

modules/olm-creating-etcd-cluster-from-operator.adoc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ This procedure walks through creating a new etcd cluster using the etcd Operator
66

77
.Prerequisites
88

9-
ifndef::openshift-dedicated,openshift-rosa[]
9+
ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
1010
* Access to an {product-title} {product-version} cluster.
11-
endif::openshift-dedicated,openshift-rosa[]
12-
ifdef::openshift-dedicated,openshift-rosa[]
13-
* Access to an {product-title} cluster.
14-
endif::openshift-dedicated,openshift-rosa[]
11+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
12+
ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
13+
* Access to a {product-title} cluster.
14+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
1515
* The etcd Operator already installed cluster-wide by an administrator.
1616

1717
.Procedure
1818

1919
. Create a new project in the {product-title} web console for this procedure. This example uses a project called `my-etcd`.
2020

2121
. Navigate to the *Operators -> Installed Operators* page. The Operators that have been installed to the cluster by the
22-
ifndef::openshift-dedicated,openshift-rosa[]
22+
ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
2323
cluster administrator
24-
endif::openshift-dedicated,openshift-rosa[]
25-
ifdef::openshift-dedicated,openshift-rosa[]
24+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
25+
ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
2626
dedicated-admin
27-
endif::openshift-dedicated,openshift-rosa[]
27+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
2828
and are available for use are shown here as a list of cluster service versions (CSVs). CSVs are used to launch and manage the software provided by the Operator.
2929
+
3030
[TIP]
@@ -59,10 +59,10 @@ $ oc policy add-role-to-user edit <user> -n <target_project>
5959
----
6060
6161
You now have an etcd cluster that will react to failures and rebalance data as pods become unhealthy or are migrated between nodes in the cluster. Most importantly,
62-
ifndef::openshift-dedicated,openshift-rosa[]
62+
ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
6363
cluster administrators
64-
endif::openshift-dedicated,openshift-rosa[]
65-
ifdef::openshift-dedicated,openshift-rosa[]
64+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
65+
ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
6666
dedicated-admins
67-
endif::openshift-dedicated,openshift-rosa[]
67+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
6868
or developers with proper access can now easily use the database with their applications.

modules/olm-csv.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[id="olm-csv_{context}"]
66
= Cluster service version
77

8-
A _cluster service version_ (CSV) represents a specific version of a running Operator on an {product-title} cluster. It is a YAML manifest created from Operator metadata that assists Operator Lifecycle Manager (OLM) in running the Operator in the cluster.
8+
A _cluster service version_ (CSV) represents a specific version of a running Operator on your {product-title} cluster. It is a YAML manifest created from Operator metadata that assists Operator Lifecycle Manager (OLM) in running the Operator in the cluster.
99

1010
OLM requires this metadata about an Operator to ensure that it can be kept running safely on a cluster, and to provide information about how updates should be applied as new versions of the Operator are published. This is similar to packaging software for a traditional operating system; think of the packaging step for OLM as the stage at which you make your `rpm`, `deb`, or `apk` bundle.
1111

modules/olm-deleting-operators-from-a-cluster-using-cli.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ Cluster administrators can delete installed Operators from a selected namespace
1111

1212
.Prerequisites
1313

14-
- You have access to an {product-title} cluster using an account with
14+
- You have access to the {product-title} cluster using an account with
1515
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
1616
`cluster-admin` permissions.
1717
endif::[]
18-
ifdef::openshift-dedicated,openshift-rosa[]
18+
ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
1919
`dedicated-admin` permissions.
20-
endif::openshift-dedicated,openshift-rosa[]
20+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
2121
- The OpenShift CLI (`oc`) is installed on your workstation.
2222
2323
.Procedure

modules/olm-deleting-operators-from-a-cluster-using-web-console.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Cluster administrators can delete installed Operators from a selected namespace
1313

1414
.Prerequisites
1515

16-
- You have access to an {product-title} cluster web console using an account with
16+
- You have access to the {product-title} cluster web console using an account with
1717
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
1818
`cluster-admin` permissions.
1919
endif::[]

modules/olm-dependency-resolution-preferences.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ There can be many options that equally satisfy a dependency of an Operator. The
1010
[id="olm-dependency-catalog-priority_{context}"]
1111
== Catalog priority
1212

13-
On {product-title} cluster, OLM reads catalog sources to know which Operators are available for installation.
13+
On {product-title} clusters, OLM reads catalog sources to know which Operators are available for installation.
1414

1515
.Example `CatalogSource` object
1616
[source,yaml]
@@ -40,7 +40,7 @@ There are two rules that govern catalog preference:
4040
[id="olm-dependency-catalog-ordering_{context}"]
4141
== Channel ordering
4242

43-
An Operator package in a catalog is a collection of update channels that a user can subscribe to in an {product-title} cluster. Channels can be used to provide a particular stream of updates for a minor release (`1.2`, `1.3`) or a release frequency (`stable`, `fast`).
43+
An Operator package in a catalog is a collection of update channels that a user can subscribe to in {product-title} clusters. Channels can be used to provide a particular stream of updates for a minor release (`1.2`, `1.3`) or a release frequency (`stable`, `fast`).
4444

4545
It is likely that a dependency might be satisfied by Operators in the same package, but different channels. For example, version `1.2` of an Operator might exist in both the `stable` and `fast` channels.
4646

0 commit comments

Comments
 (0)