Merge pull request #46355 from abrennan89/SRVCOM-1829-1

[SRVCOM-1829]: Update admin autoscaling abstracts and structure

Author: abrennan89

_topic_maps/_topic_map.yml

@@ -3444,8 +3444,6 @@ Topics:
     File: serverless-kafka-admin
   - Name: Serverless components in the Administrator perspective
     File: serverless-admin-perspective
-  - Name: Autoscaling
-    File: serverless-admin-autoscaling
     # Ingress options
   - Name: Integrating Service Mesh with OpenShift Serverless
     File: serverless-ossm-setup

_topic_maps/_topic_map_osd.yml

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

modules/serverless-enable-scale-to-zero.adoc

@@ -1,18 +1,12 @@
 // Module included in the following assemblies:
 //
-// * serverless/admin_guide/serverless-admin-autoscaling.adoc
+// * /serverless/admin_guide/serverless-configuration.adoc
 
 :_content-type: PROCEDURE
 [id="serverless-enable-scale-to-zero_{context}"]
 = Enabling scale-to-zero
 
-ifdef::openshift-enterprise[]
-Cluster administrators can enable or disable scale-to-zero globally for the cluster.
-endif::[]
-
-ifdef::openshift-dedicated[]
-Cluster or dedicated administrators can enable or disable scale-to-zero globally for the cluster.
-endif::[]
+Knative Serving provides automatic scaling, or _autoscaling_, for applications to match incoming demand. You can use the `enable-scale-to-zero` spec to enable or disable scale-to-zero globally for applications on the cluster.
 
 .Prerequisites
 
@@ -30,8 +24,9 @@ endif::[]
 
 .Procedure
 
-* Modify the `enable-scale-to-zero` spec in the `KnativeServing` CR:
+* Modify the `enable-scale-to-zero` spec in the `KnativeServing` custom resource (CR):
 +
+.Example KnativeServing CR
 [source,yaml]
 ----
 apiVersion: operator.knative.dev/v1alpha1

modules/serverless-scale-to-zero-grace-period.adoc

@@ -1,12 +1,12 @@
 // Module included in the following assemblies:
 //
-// * serverless/admin_guide/serverless-admin-autoscaling.adoc
+// * /serverless/admin_guide/serverless-configuration.adoc
 
 :_content-type: PROCEDURE
 [id="serverless-scale-to-zero-grace-period_{context}"]
 = Configuring the scale-to-zero grace period
 
-This setting specifies an upper bound time limit that Knative waits for scale-from-zero machinery to be in place before the last replica of an application is removed.
+Knative Serving provides automatic scaling down to zero pods for applications. You can use the `scale-to-zero-grace-period` spec to define an upper bound time limit that Knative waits for scale-to-zero machinery to be in place before the last replica of an application is removed.
 
 .Prerequisites
 
@@ -20,12 +20,13 @@ ifdef::openshift-dedicated[]
 * You have cluster or dedicated administrator permissions.
 endif::[]
 
-* You are using the default Knative Pod Autoscaler. The scale to zero feature is not available if you are using the Kubernetes Horizontal Pod Autoscaler.
+* You are using the default Knative Pod Autoscaler. The scale-to-zero feature is not available if you are using the Kubernetes Horizontal Pod Autoscaler.
 
 .Procedure
 
-* Modify the `scale-to-zero-grace-period` spec in the `KnativeServing` CR:
+* Modify the `scale-to-zero-grace-period` spec in the `KnativeServing` custom resource (CR):
 +
+.Example KnativeServing CR
 [source,yaml]
 ----
 apiVersion: operator.knative.dev/v1alpha1

serverless/admin_guide/serverless-admin-autoscaling.adoc

@@ -16,6 +16,9 @@ The `spec.config` in the Knative custom resources have one `<name>` entry for ea
 include::modules/serverless-channel-default.adoc[leveloffset=+1]
 
 // Knative Serving
+//autoscaling
+include::modules/serverless-enable-scale-to-zero.adoc[leveloffset=+1]
+include::modules/serverless-scale-to-zero-grace-period.adoc[leveloffset=+1]
 // deployments
 include::modules/knative-serving-CR-system-deployments.adoc[leveloffset=+1]
 // enable emptydirs

serverless/admin_guide/serverless-configuration.adoc

@@ -41,8 +41,3 @@ include::modules/serverless-about-concurrency.adoc[leveloffset=+1]
 include::modules/serverless-concurrency-limits-configure-soft.adoc[leveloffset=+2]
 include::modules/serverless-concurrency-limits-configure-hard.adoc[leveloffset=+2]
 include::modules/serverless-target-utilization.adoc[leveloffset=+2]
-
-[id="additional-resources_serverless-autoscaling-developer"]
-[role="_additional-resources"]
-== Additional resources
-* xref:../../serverless/admin_guide/serverless-admin-autoscaling.adoc#serverless-enable-scale-to-zero_serverless-admin-autoscaling[Enabling scale-to-zero]