Merge pull request #68594 from jldohmann/OCPBUGS-18769

OCPBUGS-18769: autoscaler fixes

Author: jldohmann

modules/nw-autoscaling-ingress-controller.adoc

@@ -12,40 +12,9 @@ Automatically scale an Ingress Controller to dynamically meet routing performanc
 . You have the OpenShift CLI (`oc`) installed.
 . You have access to an {product-title} cluster as a user with the `cluster-admin` role.
 . You have the Custom Metrics Autoscaler Operator installed.
+. You are in the `openshift-ingress-operator` project namespace.
 
 .Procedure
-. Create a project in the `openshift-ingress-operator` namespace by running the following command:
-+
-[source,terminal]
-----
-$ oc project openshift-ingress-operator
-----
-
-. Enable OpenShift monitoring for user-defined projects by creating and applying a config map:
-
-.. Create a new `ConfigMap` object, `cluster-monitoring-config.yaml`:
-+
-.cluster-monitoring-config.yaml
-[source,yaml]
-----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cluster-monitoring-config
-  namespace: openshift-monitoring
-data:
-  config.yaml: |
-    enableUserWorkload: true <1>
-----
-+
-<1> When set to `true`, the `enableUserWorkload` parameter enables monitoring for user-defined projects in a cluster.
-
-.. Apply the config map by running the following command:
-+
-[source,terminal]
-----
-$ oc apply -f cluster-monitoring-config.yaml
-----
 
 . Create a service account to authenticate with Thanos by running the following command:
 +
@@ -184,7 +153,7 @@ spec:
   - type: prometheus
     metricType: AverageValue
     metadata:
-      serverAddress: https://<example-cluster>:9091 <3>
+      serverAddress: https://thanos-querier.openshift-monitoring.svc.cluster.local:9091 <3>
       namespace: openshift-ingress-operator <4>
       metricName: 'kube-node-role'
       threshold: '1'
@@ -195,7 +164,7 @@ spec:
 ----
 <1> The custom resource that you are targeting. In this case, the Ingress Controller.
 <2> Optional: The maximum number of replicas. If you omit this field, the default maximum is set to 100 replicas.
-<3> The cluster address and port.
+<3> The Thanos service endpoint in the `openshift-monitoring` namespace.
 <4> The Ingress Operator namespace.
 <5> This expression evaluates to however many worker nodes are present in the deployed cluster.
 +