Skip to content

Commit 26c6986

Browse files
authored
Merge pull request #113505 from dfitzmau/OSDOCS-16988-3-CQA
OSDOCS-16988-3-CQA: CQA PR 3.1 for INSTALL-1: Core Installation Conce…
2 parents b5d76c7 + 66aedae commit 26c6986

7 files changed

Lines changed: 40 additions & 35 deletions

installing/overview/cluster-capabilities.adoc

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
Cluster administrators can use cluster capabilities to enable or disable optional components prior to installation. Cluster administrators can enable cluster capabilities at anytime after installation.
9+
[role="_abstract"]
10+
As a cluster administrator, you can use cluster capabilities to enable or disable optional components before installation. Additionally, you can enable cluster capabilities at anytime after installation.
1011

1112
[NOTE]
1213
====
13-
Cluster administrators cannot disable a cluster capability after it is enabled.
14+
You cannot disable a cluster capability after it is enabled.
1415
====
1516

1617
include::modules/enabling-cluster-capabilities.adoc[leveloffset=+1]
18+
1719
include::snippets/capabilities-table.adoc[]
1820

1921
[role="_additional-resources"]
@@ -42,12 +44,20 @@ include::modules/build-config-capability.adoc[leveloffset=+2]
4244
// Cloud controller manager capability
4345
include::modules/cluster-cloud-controller-manager-operator.adoc[leveloffset=+2]
4446

47+
[role="_additional-resources"]
48+
.Additional resources
49+
50+
* link:https://access.redhat.com/support/offerings/techpreview[Technology Preview]
51+
52+
* link:https://github.com/openshift/cluster-cloud-controller-manager-operator[`cluster-cloud-controller-manager-operator`]
53+
4554
// Cloud credential capability
4655
include::modules/cloud-credential-operator.adoc[leveloffset=+2]
4756

4857
[role="_additional-resources"]
4958
.Additional resources
5059
* xref:../../authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc#about-cloud-credential-operator[About the Cloud Credential Operator]
60+
* link:https://github.com/openshift/cloud-credential-operator[`openshift-cloud-credential-operator`]
5161
5262
// Cluster Image Registry capability
5363
include::modules/cluster-image-registry-operator.adoc[leveloffset=+2]

modules/build-config-capability.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
[id="build-config-capability_{context}"]
77
= Build capability
88

9-
10-
== Purpose
11-
9+
[role="_abstract"]
1210
The `Build` capability enables the `Build` API. The `Build` API manages the lifecycle of `Build` and `BuildConfig` objects.
1311

1412
[IMPORTANT]

modules/cloud-credential-operator.adoc

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ endif::[]
1515
ifdef::operators[= Cloud Credential Operator]
1616
ifdef::cluster-caps[= Cloud credential capability]
1717

18+
[role="_abstract"]
1819
ifdef::cluster-caps[]
1920
The Cloud Credential Operator provides features for the `CloudCredential` capability.
2021

@@ -29,21 +30,18 @@ The Cloud Credential Operator (CCO) manages cloud provider credentials as Kubern
2930
By setting different values for the `credentialsMode` parameter in the `install-config.yaml` file, the CCO can be configured to operate in several different modes. If no mode is specified, or the `credentialsMode` parameter is set to an empty string (`""`), the CCO operates in its default mode.
3031

3132
ifdef::operators[]
33+
Project::
3234

33-
== Project
35+
See "openshift-cloud-credential-operator" in the _Additional resources_ section.
3436

35-
link:https://github.com/openshift/cloud-credential-operator[openshift-cloud-credential-operator]
36-
37-
38-
== CRDs
37+
CRDs::
3938

4039
* `credentialsrequests.cloudcredential.openshift.io`
4140
** Scope: Namespaced
4241
** CR: `CredentialsRequest`
4342
** Validation: Yes
4443
45-
46-
== Configuration objects
44+
Configuration objects::
4745

4846
No configuration required.
4947
endif::operators[]

modules/cluster-bare-metal-operator.adoc

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,14 @@ endif::[]
1616
ifdef::operator-ref[= Cluster Baremetal Operator]
1717
ifdef::cluster-caps[= Bare-metal capability]
1818

19+
[role="_abstract"]
1920
ifdef::operator-ref[]
21+
The Cluster Baremetal Operator is an optional cluster capability that can be disabled by cluster administrators during installation.
2022

21-
[NOTE]
22-
====
23-
The Cluster Baremetal 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_.
24-
====
25-
23+
For more information about optional cluster capabilities, see "Cluster capabilities".
2624
endif::operator-ref[]
27-
2825
ifdef::cluster-caps[]
29-
3026
The Cluster Baremetal Operator provides the features for the `baremetal` capability.
31-
3227
endif::cluster-caps[]
3328

3429
The Cluster Baremetal Operator (CBO) deploys all the components necessary to take a bare-metal server to a fully functioning worker node ready to run {product-title} compute nodes. The CBO ensures that the metal3 deployment, which consists of the Bare Metal Operator (BMO) and Ironic containers, runs on one of the control plane nodes within the {product-title} cluster. The CBO also listens for {product-title} updates to resources that it watches and takes appropriate action.
@@ -43,17 +38,14 @@ If the bare-metal capability is disabled, the cluster cannot provision or manage
4338

4439
[NOTE]
4540
====
46-
It is recommended that cluster administrators only disable the bare-metal capability during installations with user-provisioned infrastructure that do not have any `BareMetalHost` resources in the cluster.
41+
Red{nbsp}Hat recommends that cluster administrators only disable the bare-metal capability during installations with user-provisioned infrastructure that do not have any `BareMetalHost` resources in the cluster.
4742
====
4843
endif::cluster-caps[]
4944

5045
ifdef::operator-ref[]
51-
52-
53-
== Project
46+
Project::
5447

5548
link:https://github.com/openshift/cluster-baremetal-operator[cluster-baremetal-operator]
56-
5749
endif::operator-ref[]
5850

5951
ifeval::["{context}" == "operator-reference"]

modules/cluster-cloud-controller-manager-operator.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ endif::[]
1414
ifdef::operators[= Cloud Controller Manager Operator]
1515
ifdef::cluster-caps[= Cloud controller manager capability]
1616

17+
[role="_abstract"]
1718
ifdef::cluster-caps[]
1819
The Cloud Controller Manager Operator provides features for the `CloudControllerManager` capability.
1920

@@ -41,7 +42,7 @@ endif::cluster-caps[]
4142
====
4243
The status of this Operator is General Availability for {aws-first}, {gcp-first}, {ibm-cloud-name}, global {azure-full}, Microsoft Azure Stack Hub, Nutanix, {rh-openstack-first}, and {vmw-full}.
4344
44-
The Operator is available as a link:https://access.redhat.com/support/offerings/techpreview[Technology Preview] for {ibm-power-server-name}.
45+
The Operator is available as a Technology Preview for {ibm-power-server-name}.
4546
====
4647

4748
The Cloud Controller Manager Operator manages and updates the cloud controller managers deployed on top of {product-title}. The Operator is based on the Kubebuilder framework and `controller-runtime` libraries. You can install the Cloud Controller Manager Operator by using the Cluster Version Operator (CVO).
@@ -55,9 +56,9 @@ By default, the Operator exposes Prometheus metrics through the `metrics` servic
5556

5657
ifdef::operators[]
5758

58-
== Project
59+
Project::
5960

60-
link:https://github.com/openshift/cluster-cloud-controller-manager-operator[cluster-cloud-controller-manager-operator]
61+
See "cluster-cloud-controller-manager-operator" in the _Additional resources_ section.
6162
endif::operators[]
6263

6364
ifeval::["{context}" == "operator-reference"]

modules/enabling-cluster-capabilities.adoc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[id="enabling-cluster-capabilities_{context}"]
77
= Enabling cluster capabilities
88

9+
[role="_abstract"]
910
If you are using an installation method that includes customizing your cluster by creating an `install-config.yaml` file, you can select which cluster capabilities you want to make available on the cluster.
1011

1112
[NOTE]
@@ -18,21 +19,23 @@ You can use the following configuration parameters to select cluster capabilitie
1819
[source,yaml]
1920
----
2021
capabilities:
21-
baselineCapabilitySet: v4.11 <1>
22-
additionalEnabledCapabilities: <2>
22+
baselineCapabilitySet: v4.11
23+
additionalEnabledCapabilities:
2324
- CSISnapshot
2425
- Console
2526
- Storage
2627
----
27-
<1> Defines a baseline set of capabilities to install. Valid values are `None`, `vCurrent` and `v4.x`. If you select `None`, all optional capabilities are disabled. The default value is `vCurrent`, which enables all optional capabilities.
28-
+
28+
29+
`capabilities.baselineCapabilitySet`:: Specifies a baseline set of capabilities to install. Valid values are `None`, `vCurrent` and `v4.x`. If you select `None`, all optional capabilities are disabled. The default value is `vCurrent`, which enables all optional capabilities.
30+
2931
[NOTE]
3032
====
3133
`v4.x` refers to any value up to and including the current cluster version.
3234
For example, valid values for a {product-title} 4.12 cluster are `v4.11` and `v4.12`.
3335
====
34-
<2> Defines a list of capabilities to explicitly enable. These capabilities are enabled in addition to the capabilities specified in `baselineCapabilitySet`.
35-
+
36+
37+
`capabilities.additionalEnabledCapabilities`:: Specifies a list of capabilities to explicitly enable. These capabilities are enabled in addition to the capabilities specified in `baselineCapabilitySet`.
38+
3639
[NOTE]
3740
====
3841
In this example, the default capability is set to `v4.11`. The `additionalEnabledCapabilities` field enables additional capabilities over the default `v4.11` capability set.

modules/explanation-of-capabilities.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@
66
[id="explanation_of_capabilities_{context}"]
77
= Optional cluster capabilities in {product-title} {product-version}
88

9-
Currently, cluster Operators provide the features for these optional capabilities. The following summarizes the features provided by each capability and what functionality you lose if it is disabled.
9+
[role="_abstract"]
10+
Currently, cluster Operators provide the features for these optional capabilities.
11+
12+
The following sections summarize the features provided by each capability and what functionality you lose if you disable a functionality.

0 commit comments

Comments
 (0)