Skip to content

Commit fdfc77d

Browse files
committed
SRVCOM-2113 Restructure the Integrations sections
1 parent 9ef727f commit fdfc77d

13 files changed

+34
-17
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3823,9 +3823,6 @@ Topics:
38233823
File: serverless-kafka-admin
38243824
- Name: Serverless components in the Administrator perspective
38253825
File: serverless-admin-perspective
3826-
# Ingress options
3827-
- Name: Integrating Service Mesh with OpenShift Serverless
3828-
File: serverless-ossm-setup
38293826
# Metrics
38303827
- Name: Serverless administrator metrics
38313828
File: serverless-admin-metrics
@@ -3884,6 +3881,8 @@ Topics:
38843881
- Name: Integrations
38853882
Dir: integrations
38863883
Topics:
3884+
- Name: Integrating Service Mesh with OpenShift Serverless
3885+
File: serverless-ossm-setup
38873886
- Name: Integrating Serverless with the cost management service
38883887
File: serverless-cost-management-integration
38893888
- Name: Using NVIDIA GPU resources with serverless applications

_topic_maps/_topic_map_osd.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,6 @@ Topics:
411411
File: serverless-kafka-admin
412412
- Name: Serverless components in the Administrator perspective
413413
File: serverless-admin-perspective
414-
- Name: Integrating Service Mesh with OpenShift Serverless
415-
File: serverless-ossm-setup
416414
- Name: Serverless administrator metrics
417415
File: serverless-admin-metrics
418416
- Name: High availability

_topic_maps/_topic_map_rosa.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,6 @@ Topics:
609609
File: serverless-kafka-admin
610610
- Name: Serverless components in the Administrator perspective
611611
File: serverless-admin-perspective
612-
- Name: Integrating Service Mesh with OpenShift Serverless
613-
File: serverless-ossm-setup
614612
- Name: Serverless administrator metrics
615613
File: serverless-admin-metrics
616614
- Name: High availability on OpenShift Serverless
@@ -674,6 +672,16 @@ Topics:
674672
# Support
675673
- Name: Serverless support
676674
File: serverless-support
675+
# Integrations
676+
- Name: Integrations
677+
Dir: integrations
678+
Topics:
679+
- Name: Integrating Service Mesh with OpenShift Serverless
680+
File: serverless-ossm-setup
681+
- Name: Integrating Serverless with the cost management service
682+
File: serverless-cost-management-integration
683+
- Name: Using NVIDIA GPU resources with serverless applications
684+
File: gpu-resources
677685
---
678686
Name: Troubleshooting
679687
Dir: rosa_support

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * /serverless/admin_guide/serverless-ossm-setup.adoc
3+
// * /serverless/integrations/serverless-ossm-setup.adoc
44

55
:_content-type: PROCEDURE
66
[id="serverless-ossm-enabling-serving-metrics_{context}"]

modules/serverless-ossm-external-certs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * /serverless/admin_guide/serverless-ossm-setup.adoc
3+
// * /serverless/integrations/serverless-ossm-setup.adoc
44

55
:_content-type: PROCEDURE
66
[id="serverlesss-ossm-external-certs_{context}"]

modules/serverless-ossm-secret-filtering.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * /serverless/admin_guide/serverless-ossm-setup.adoc
3+
// * /serverless/integrations/serverless-ossm-setup.adoc
44

55
:_content-type: PROCEDURE
66
[id="serverless-ossm-secret-filtering_{context}"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * /serverless/admin_guide/serverless-ossm-setup.adoc
3+
// * /serverless/integrations/serverless-ossm-setup.adoc
44

55
:_content-type: PROCEDURE
66
[id="serverless-ossm-setup-with-kourier_{context}"]

modules/serverless-ossm-setup.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * /serverless/admin_guide/serverless-ossm-setup.adoc
3+
// * /serverless/integrations/serverless-ossm-setup.adoc
44

55
:_content-type: PROCEDURE
66
[id="serverless-ossm-setup_{context}"]

serverless/admin_guide/serverless-admin-metrics.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ endif::[]
3535
====
3636
If {SMProductShortName} is enabled with mTLS, metrics for Knative Serving are disabled by default because Service Mesh prevents Prometheus from scraping metrics.
3737
38-
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].
38+
ifndef::openshift-dedicated[]
39+
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].
40+
endif::[]
3941
4042
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.
4143
====
@@ -64,3 +66,4 @@ Cluster administrators can view the following metrics for Knative Serving compon
6466
include::modules/serverless-activator-metrics.adoc[leveloffset=+2]
6567
include::modules/serverless-autoscaler-metrics.adoc[leveloffset=+2]
6668
include::modules/serverless-go-metrics.adoc[leveloffset=+2]
69+

serverless/integrations/gpu-resources.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ See link:https://docs.nvidia.com/datacenter/kubernetes/openshift-on-gpu-install-
1111

1212
include::modules/serverless-gpu-resources-kn.adoc[leveloffset=+1]
1313

14+
ifdef::openshift-enterprise[]
1415
[id="additional-requirements_gpu-resources"]
1516
[role="_additional-resources"]
1617
== Additional resources
17-
* xref:../../applications/quotas/quotas-setting-per-project.adoc[Setting resource quotas for extended resources]
18+
* xref:../../applications/quotas/quotas-setting-per-project.adoc#quotas-setting-per-project[Setting resource quotas for extended resources]
19+
endif::[]

0 commit comments

Comments
 (0)