Skip to content

Commit 7f048ba

Browse files
authored
Merge pull request #64654 from stevsmit/OSDOCS-7731-installer-caps-update
Updates some wording on cluster capabilities docs to reflect that the…
2 parents ec226ae + 327224a commit 7f048ba

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

modules/selecting-cluster-capabilities.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77
= Selecting cluster capabilities
88
You can select cluster capabilities by following one of the installation methods that include customizing your cluster, such as "Installing a cluster on AWS with customizations" or "Installing a cluster on GCP with customizations".
99

10-
During a customized installation, you create an `install-config.yaml` file that contains the configuration parameters for your cluster. You can use the following configuration parameters to select cluster capabilities:
10+
During a customized installation, you create an `install-config.yaml` file that contains the configuration parameters for your cluster.
11+
12+
[NOTE]
13+
====
14+
If you customize your cluster by enabling or disabling specific cluster capabilities, you are responsible for manually maintaining your `install-config.yaml` file. New {product-title} updates might declare new capability handles for existing components, or introduce new components altogether. Users who customize their `install-config.yaml` file should consider periodically updating their `install-config.yaml` file as {product-title} is updated.
15+
====
16+
17+
You can use the following configuration parameters to select cluster capabilities:
1118

1219
[source,yaml]
1320
----

snippets/capabilities-table.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ The following table describes the `baselineCapabilitySet` values.
88
|Value|Description
99

1010
|`vCurrent`
11-
|Specify when you want to automatically add new capabilities as they become recommended.
11+
|Specify this option when you want to automatically add new, default capabilities that are introduced in new releases.
1212

1313
|`v4.11`
14-
|Specify when you want the capabilities recommended in {product-title} 4.11 and not automatically enable capabilities, which might be introduced in later versions. The capabilities recommended in {product-title} 4.11 are `baremetal`, `marketplace`, and `openshift-samples`.
14+
|Specify this option when you want to enable the default capabilities for {product-title} 4.11. By specifying `v4.11`, capabilities that are introduced in newer versions of {product-title} are not enabled. The default capabilities in {product-title} 4.11 are `baremetal`, `marketplace`, and `openshift-samples`.
1515

1616
|`v4.12`
17-
|Specify when you want the capabilities recommended in {product-title} 4.12 and not automatically enable capabilities, which might be introduced in later versions. The capabilities recommended in {product-title} 4.12 are `baremetal`, `marketplace`, `openshift-samples`, `Console`, `Insights`, `Storage` and `CSISnapshot`.
17+
|Specify this option when you want to enable the default capabilities for {product-title} 4.12. By specifying `v4.12`, capabilities that are introduced in newer versions of {product-title} are not enabled. The default capabilities in {product-title} 4.12 are `baremetal`, `marketplace`, `openshift-samples`, `Console`, `Insights`, `Storage` and `CSISnapshot`.
1818

1919
|`v4.13`
20-
|Specify when you want the capabilities recommended in {product-title} 4.13 and not automatically enable capabilities, which might be introduced in later versions. The capabilities recommended in {product-title} 4.13 are `baremetal`, `marketplace`, `openshift-samples`, `Console`, `Insights`, `Storage`, `CSISnapshot` and `NodeTuning`.
20+
|Specify this option when you want to enable the default capabilities for {product-title} 4.13. By specifying `v4.13`, capabilities that are introduced in newer versions of {product-title} are not enabled. The default capabilities in {product-title} 4.13 are `baremetal`, `marketplace`, `openshift-samples`, `Console`, `Insights`, `Storage`, `CSISnapshot` and `NodeTuning`.
2121

2222
// TODO: Add `Build` and `DeploymentConfig` to the list for 4.14.
2323

0 commit comments

Comments
 (0)