Merge pull request #82415 from michaelryanpeter/osdocs-12117-catalogd-https-support

OSDOCS#12117: Catalogd https support

Author: michaelryanpeter

extensions/index.adoc

@@ -52,4 +52,7 @@ Administrators can use file-based catalogs to install and manage extensions, suc
 +
 In addition, bundle size is no longer constrained by the etcd value size limit. For more information, see xref:../extensions/ce/managing-ce.adoc#managing-ce[Installing extensions].
 
+Secure catalog communication::
+{olmv1} uses HTTPS encryption for catalogd server responses.
+
 include::modules/olmv1-about-purpose.adoc[leveloffset=+1]

modules/olmv1-adding-a-catalog.adoc

@@ -32,7 +32,7 @@ include::snippets/olmv1-secure-registry-pull-secret.adoc[]
 [source,yaml,subs="attributes+"]
 ----
 apiVersion: catalogd.operatorframework.io/v1alpha1
-kind: Catalog
+kind: ClusterCatalog
 metadata:
   name: redhat-operators
 spec:
@@ -93,7 +93,7 @@ Namespace:
 Labels:       <none>
 Annotations:  <none>
 API Version:  catalogd.operatorframework.io/v1alpha1
-Kind:         Catalog
+Kind:         ClusterCatalog
 Metadata:
   Creation Timestamp:  2024-06-10T17:34:53Z
   Finalizers:
@@ -114,7 +114,7 @@ Status: <1>
     Reason:                UnpackSuccessful <2>
     Status:                True
     Type:                  Unpacked
-  Content URL:             http://catalogd-catalogserver.openshift-catalogd.svc/catalogs/redhat-operators/all.json
+  Content URL:             https://catalogd-catalogserver.openshift-catalogd.svc/catalogs/redhat-operators/all.json
   Observed Generation:     1
   Phase:                   Unpacked <3>
   Resolved Source:

modules/olmv1-finding-operators-to-install.adoc

@@ -20,14 +20,14 @@ After you add a catalog to your cluster, you can query the catalog to find Opera
 +
 [source,terminal]
 ----
-$ oc -n openshift-catalogd port-forward svc/catalogd-catalogserver 8080:80
+$ oc -n openshift-catalogd port-forward svc/catalogd-catalogserver 8080:443
 ----
 
-. Download the catalog's JSON file locally by running the following command:
+. In a new terminal window or tab, download the catalog's JSON file locally by running the following command:
 +
 [source,terminal]
 ----
-$ curl -L http://localhost:8080/catalogs/<catalog_name>/all.json \
+$ curl -L -k https://localhost:8080/catalogs/<catalog_name>/all.json \
   -C - -o /<path>/<catalog_name>.json
 ----
 +
@@ -36,7 +36,7 @@ $ curl -L http://localhost:8080/catalogs/<catalog_name>/all.json \
 ====
 [source,terminal]
 ----
-$ curl -L http://localhost:8080/catalogs/redhat-operators/all.json \
+$ curl -L -k https://localhost:8080/catalogs/redhat-operators/all.json \
   -C - -o /home/username/catalogs/rhoc.json
 ----
 ====

modules/olmv1-red-hat-catalogs.adoc

@@ -32,7 +32,7 @@ include::snippets/olmv1-secure-registry-pull-secret.adoc[]
 [source,yaml,subs="attributes+"]
 ----
 apiVersion: catalogd.operatorframework.io/v1alpha1
-kind: Catalog
+kind: ClusterCatalog
 metadata:
   name: redhat-operators
 spec:
@@ -49,7 +49,7 @@ spec:
 [source,yaml,subs="attributes+"]
 ----
 apiVersion: catalogd.operatorframework.io/v1alpha1
-kind: Catalog
+kind: ClusterCatalog
 metadata:
   name: certified-operators
 spec:
@@ -65,7 +65,7 @@ spec:
 [source,yaml,subs="attributes+"]
 ----
 apiVersion: catalogd.operatorframework.io/v1alpha1
-kind: Catalog
+kind: ClusterCatalog
 metadata:
   name: community-operators
 spec: