Merge pull request #88209 from michaelryanpeter/osdocs-11119-olmv1-restructure-exisiting-catalog-crs

OSDOCS#12828: Remove references to pull secrets in cluster catalog CRs

Author: michaelryanpeter

modules/olmv1-creating-a-pull-secret-for-catalogd.adoc renamed to _unused_topics/olmv1-creating-a-pull-secret-for-catalogd.adoc

@@ -10,5 +10,3 @@
 = About catalogs in {olmv1}
 
 You can discover installable content by querying a catalog for Kubernetes extensions, such as Operators and controllers, by using the catalogd component. Catalogd is a Kubernetes extension that unpacks catalog content for on-cluster clients and is part of the {olmv1-first} suite of microservices. Currently, catalogd unpacks catalog content that is packaged and distributed as container images.
-
-include::snippets/olmv1-multi-catalog-admon.adoc[]

modules/olmv1-about-catalogs.adoc

@@ -13,36 +13,34 @@ To add a catalog to a cluster, create a catalog custom resource (CR) and apply i
 
 . Create a catalog custom resource (CR), similar to the following example:
 +
-.Example `redhat-operators.yaml`
+.Example `my-redhat-operators.yaml` file
 [source,yaml,subs="attributes+"]
 ----
 apiVersion: catalogd.operatorframework.io/v1alpha1
 kind: ClusterCatalog
 metadata:
-  name: redhat-operators
+  name: my-redhat-operators
 spec:
   source:
     type: image
     image:
       ref: registry.redhat.io/redhat/redhat-operator-index:v{product-version} <1>
-      pullSecret: <pull_secret_name> <2>
-      pollInterval: <poll_interval_duration> <3>
+      pollInterval: <poll_interval_duration> <2>
 ----
 <1> Specify the catalog's image in the `spec.source.image` field.
-<2> If your catalog is hosted on a secure registry, such as `registry.redhat.io`, you must create a pull secret scoped to the `openshift-catalog` namespace.
-<3> Specify the interval for polling the remote registry for newer image digests. The default value is `24h`. Valid units include seconds (`s`), minutes (`m`), and hours (`h`). To disable polling, set a zero value, such as `0s`.
+<2> Specify the interval for polling the remote registry for newer image digests. The default value is `24h`. Valid units include seconds (`s`), minutes (`m`), and hours (`h`). To disable polling, set a zero value, such as `0s`.
 
 . Add the catalog to your cluster by running the following command:
 +
 [source,terminal]
 ----
-$ oc apply -f redhat-operators.yaml
+$ oc apply -f my-redhat-operators.yaml
 ----
 +
 .Example output
 [source,text]
 ----
-catalog.catalogd.operatorframework.io/redhat-operators created
+catalog.catalogd.operatorframework.io/my-redhat-operators created
 ----
 
 .Verification
@@ -59,8 +57,8 @@ $ oc get clustercatalog
 .Example output
 [source,text]
 ----
-NAME                  AGE
-redhat-operators      20s
+NAME                     AGE
+my-redhat-operators      20s
 ----
 
 .. Check the status of your catalog by running the following command:
@@ -73,11 +71,11 @@ $ oc describe clustercatalog
 .Example output
 [source,text,subs="attributes+"]
 ----
-Name:         redhat-operators
+Name:         my-redhat-operators
 Namespace:
-Labels:       <none>
+Labels:       olm.operatorframework.io/metadata.name=my-redhat-operators
 Annotations:  <none>
-API Version:  catalogd.operatorframework.io/v1alpha1
+API Version:  olm.operatorframework.io/v1
 Kind:         ClusterCatalog
 Metadata:
   Creation Timestamp:  2024-06-10T17:34:53Z
@@ -87,9 +85,11 @@ Metadata:
   Resource Version:  46075
   UID:               83c0db3c-a553-41da-b279-9b3cddaa117d
 Spec:
+  Availability Mode:  Available
+  Priority:           0
   Source:
     Image:
-      Pull Secret:  redhat-cred
+      Poll Interval Minutes:  10
       Ref:          registry.redhat.io/redhat/redhat-operator-index:v4.18
     Type:           image
 Status: <1>

modules/olmv1-adding-a-catalog.adoc

@@ -123,10 +123,6 @@ where:
 `<service_account>`:: Specifies the name of the service account you created to install, update, and manage your extension.
 `<channel>`:: Optional: Specifies the channel, such as `pipelines-1.11` or `latest`, for the package you want to install or update.
 `<version>`:: Optional: Specifies the version or version range, such as `1.11.1`, `1.12.x`, or `>=1.12.1`, of the package you want to install or update. For more information, see "Example custom resources (CRs) that specify a target version" and "Support for version ranges".
-+
---
-include::snippets/olmv1-multi-catalog-admon.adoc[]
---
 
 . Apply the CR to the cluster by running the following command:
 +