Merge pull request #85053 from openshift-cherrypick-robot/cherry-pick-84252-to-enterprise-4.16

[enterprise-4.16] OCPBUGS-41971-ent17: Returned the Ingress capability doca

Author: dfitzmau

installing/overview/cluster-capabilities.adoc

@@ -77,6 +77,9 @@ include::modules/cluster-csi-snapshot-controller-operator.adoc[leveloffset=+2]
 // DeploymentConfig capability
 include::modules/deployment-config-capability.adoc[leveloffset=+2]
 
+// Ingress capability
+include::modules/ingress-operator.adoc[leveloffset=+2]
+
 // Insights capability
 include::modules/insights-operator.adoc[leveloffset=+2]
 

modules/ingress-operator.adoc

@@ -1,14 +1,33 @@
 // Module included in the following assemblies:
 //
 // * operators/operator-reference.adoc
+// * installing/overview/cluster-capabilities.adoc
+
+ifeval::["{context}" == "cluster-capabilities"]
+:cluster-caps:
+endif::[]
+
+ifeval::["{context}" == "cluster-operators-ref"]
+:operator-ref:
+endif::[]
 
 :_mod-docs-content-type: REFERENCE
 [id="ingress-operator_{context}"]
-= Ingress Operator
+ifdef::operator-ref[= Ingress Operator]
+ifdef::cluster-caps[= Ingress Capability]
 
 [discrete]
 == Purpose
 
+ifdef::cluster-caps[]
+The Ingress Operator provides the features for the Ingress Capability. The Ingress Capability is enabled by default.
+
+[IMPORTANT]
+====
+If you set the `baselineCapabilitySet` field to `None`, you must explicitly enable the Ingress Capability, because the installation of a cluster fails if the Ingress Capability is disabled.
+====
+endif::cluster-caps[]
+
 The Ingress Operator configures and manages the {product-title} router.
 
 [discrete]
@@ -61,3 +80,11 @@ $ oc get network/cluster -o jsonpath='{.status.clusterNetwork[*]}'
 ----
 map[cidr:10.128.0.0/14 hostPrefix:23]
 ----
+
+ifeval::["{context}" == "cluster-operators-ref"]
+:!operator-ref:
+endif::[]
+
+ifeval::["{context}" == "cluster-caps"]
+:!cluster-caps:
+endif::[]

modules/insights-operator.adoc

@@ -17,12 +17,10 @@ ifdef::operator-ref[= Insights Operator]
 ifdef::cluster-caps[= Insights capability]
 
 ifdef::operator-ref[]
-
 [NOTE]
 ====
-The Insights Operator is an optional cluster capability that can be disabled by cluster administrators during installation. For more information about optional cluster capabilities, see "Cluster capabilities" in _Installing_.
+The Insights Operator is an optional cluster capability that cluster administrators can disable during installation. For more information about optional cluster capabilities, see "Cluster capabilities" in _Installing_.
 ====
-
 endif::operator-ref[]
 
 [discrete]