Merge pull request #55107 from gabriel-rh/SRVCOM-2113-restructure-integrations

SRVCOM-2113 Restructure the Integrations sections

Author: gabriel-rh

_topic_maps/_topic_map.yml

@@ -3823,9 +3823,6 @@ Topics:
     File: serverless-kafka-admin
   - Name: Serverless components in the Administrator perspective
     File: serverless-admin-perspective
-    # Ingress options
-  - Name: Integrating Service Mesh with OpenShift Serverless
-    File: serverless-ossm-setup
     # Metrics
   - Name: Serverless administrator metrics
     File: serverless-admin-metrics
@@ -3884,6 +3881,8 @@ Topics:
 - Name: Integrations
   Dir: integrations
   Topics:
+  - Name: Integrating Service Mesh with OpenShift Serverless
+    File: serverless-ossm-setup  
   - Name: Integrating Serverless with the cost management service
     File: serverless-cost-management-integration
   - Name: Using NVIDIA GPU resources with serverless applications

_topic_maps/_topic_map_osd.yml

@@ -411,8 +411,6 @@ Topics:
     File: serverless-kafka-admin
   - Name: Serverless components in the Administrator perspective
     File: serverless-admin-perspective
-  - Name: Integrating Service Mesh with OpenShift Serverless
-    File: serverless-ossm-setup
   - Name: Serverless administrator metrics
     File: serverless-admin-metrics
   - Name: High availability

_topic_maps/_topic_map_rosa.yml

@@ -609,8 +609,6 @@ Topics:
     File: serverless-kafka-admin
   - Name: Serverless components in the Administrator perspective
     File: serverless-admin-perspective
-  - Name: Integrating Service Mesh with OpenShift Serverless
-    File: serverless-ossm-setup
   - Name: Serverless administrator metrics
     File: serverless-admin-metrics
   - Name: High availability on OpenShift Serverless
@@ -674,6 +672,16 @@ Topics:
 # Support
 - Name: Serverless support
   File: serverless-support
+# Integrations
+- Name: Integrations
+  Dir: integrations
+  Topics:
+  - Name: Integrating Service Mesh with OpenShift Serverless
+    File: serverless-ossm-setup  
+  - Name: Integrating Serverless with the cost management service
+    File: serverless-cost-management-integration
+  - Name: Using NVIDIA GPU resources with serverless applications
+    File: gpu-resources
 ---
 Name: Troubleshooting
 Dir: rosa_support

modules/serverless-ossm-enabling-serving-metrics.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * /serverless/admin_guide/serverless-ossm-setup.adoc
+// * /serverless/integrations/serverless-ossm-setup.adoc
 
 :_content-type: PROCEDURE
 [id="serverless-ossm-enabling-serving-metrics_{context}"]

modules/serverless-ossm-external-certs.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * /serverless/admin_guide/serverless-ossm-setup.adoc
+// * /serverless/integrations/serverless-ossm-setup.adoc
 
 :_content-type: PROCEDURE
 [id="serverlesss-ossm-external-certs_{context}"]

modules/serverless-ossm-secret-filtering.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * /serverless/admin_guide/serverless-ossm-setup.adoc
+// * /serverless/integrations/serverless-ossm-setup.adoc
 
 :_content-type: PROCEDURE
 [id="serverless-ossm-secret-filtering_{context}"]

modules/serverless-ossm-setup-with-kourier.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * /serverless/admin_guide/serverless-ossm-setup.adoc
+// * /serverless/integrations/serverless-ossm-setup.adoc
 
 :_content-type: PROCEDURE
 [id="serverless-ossm-setup-with-kourier_{context}"]

modules/serverless-ossm-setup.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * /serverless/admin_guide/serverless-ossm-setup.adoc
+// * /serverless/integrations/serverless-ossm-setup.adoc
 
 :_content-type: PROCEDURE
 [id="serverless-ossm-setup_{context}"]

serverless/admin_guide/serverless-admin-metrics.adoc

@@ -35,7 +35,9 @@ endif::[]
 ====
 If {SMProductShortName} is enabled with mTLS, metrics for Knative Serving are disabled by default because Service Mesh prevents Prometheus from scraping metrics.
 
-For information about resolving this issue, see xref:../../serverless/admin_guide/serverless-ossm-setup.adoc#serverless-ossm-enabling-serving-metrics_serverless-ossm-setup[Enabling Knative Serving metrics when using Service Mesh with mTLS].
+ifndef::openshift-dedicated[]
+For information about resolving this issue, see xref:../../serverless/integrations/serverless-ossm-setup.adoc#serverless-ossm-enabling-serving-metrics_serverless-ossm-setup[Enabling Knative Serving metrics when using Service Mesh with mTLS].
+endif::[]
 
 Scraping the metrics does not affect autoscaling of a Knative service, because scraping requests do not go through the activator. Consequently, no scraping takes place if no pods are running.
 ====
@@ -64,3 +66,4 @@ Cluster administrators can view the following metrics for Knative Serving compon
 include::modules/serverless-activator-metrics.adoc[leveloffset=+2]
 include::modules/serverless-autoscaler-metrics.adoc[leveloffset=+2]
 include::modules/serverless-go-metrics.adoc[leveloffset=+2]
+

serverless/integrations/gpu-resources.adoc

@@ -11,7 +11,9 @@ See link:https://docs.nvidia.com/datacenter/kubernetes/openshift-on-gpu-install-
 
 include::modules/serverless-gpu-resources-kn.adoc[leveloffset=+1]
 
+ifdef::openshift-enterprise[]
 [id="additional-requirements_gpu-resources"]
 [role="_additional-resources"]
 == Additional resources
-* xref:../../applications/quotas/quotas-setting-per-project.adoc[Setting resource quotas for extended resources]
+* xref:../../applications/quotas/quotas-setting-per-project.adoc#quotas-setting-per-project[Setting resource quotas for extended resources]
+endif::[]