Skip to content

Commit 44e8b8e

Browse files
authored
Merge pull request #55407 from jeana-redhat/OSDOCS-5012-CPMS-Azure
[OSDOCS-5012]: Full Azure CPMS support
2 parents da45c63 + 1784add commit 44e8b8e

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

machine_management/control_plane_machine_management/cpmso-getting-started.adoc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
The process for getting started with the Control Plane Machine Set Operator depends on the state of the `ControlPlaneMachineSet` custom resource (CR) in your cluster.
9+
The process for getting started with the Control Plane Machine Set Operator depends on the state of the `ControlPlaneMachineSet` custom resource (CR) in your cluster.
1010

11-
Clusters with an active generated CR:: Clusters that have a generated CR with an active state use the Operator by default. No administrator action is required.
11+
Clusters with an active generated CR:: Clusters that have a generated CR with an active state use the Operator by default. No administrator action is required.
1212
//+
13-
//AWS clusters that are created with {product-title} version 4.12 or later use the Control Plane Machine Set Operator by default.
13+
//AWS clusters that are created with {product-title} version 4.12 or later use the Control Plane Machine Set Operator by default.
1414

1515
Clusters with an inactive generated CR:: For clusters that include an inactive generated CR, you must review the CR configuration and xref:../../machine_management/control_plane_machine_management/cpmso-getting-started.adoc#cpmso-activating_cpmso-getting-started[activate the CR].
1616
//+
@@ -20,16 +20,16 @@ Clusters without a generated CR:: For clusters that do not include a generated C
2020
//+
2121
//For Azure and VMware vSphere clusters
2222

23-
If you are uncertain about the state of the `ControlPlaneMachineSet` CR in your cluster, you can xref:../../machine_management/control_plane_machine_management/cpmso-getting-started.adoc#cpmso-checking-status_cpmso-getting-started[verify the CR status].
23+
If you are uncertain about the state of the `ControlPlaneMachineSet` CR in your cluster, you can xref:../../machine_management/control_plane_machine_management/cpmso-getting-started.adoc#cpmso-checking-status_cpmso-getting-started[verify the CR status].
2424

2525
[id="cpmso-platform-matrix_{context}"]
2626
== Supported cloud providers
2727

2828
In {product-title} {product-version}, the Control Plane Machine Set Operator is supported for Amazon Web Services (AWS), Microsoft Azure, and VMware vSphere clusters.
2929

30-
The status of the Operator after installation depends on your cloud provider and the version of {product-title} that you installed on your cluster.
30+
The status of the Operator after installation depends on your cloud provider and the version of {product-title} that you installed on your cluster.
3131

32-
.Control Plane Machine Set Operator implementation matrix
32+
.Control plane machine set implementation for {product-title} {product-version}
3333
[cols="<.^5,^.^4,^.^4,^.^4"]
3434
|====
3535
|Cloud provider |Active by default |Generated CR |Manual CR required
@@ -40,9 +40,9 @@ The status of the Operator after installation depends on your cloud provider and
4040
|
4141

4242
|Microsoft Azure
43-
|
44-
|
43+
|X ^[2]^
4544
|X
45+
|
4646

4747
|VMware vSphere
4848
|
@@ -51,7 +51,8 @@ The status of the Operator after installation depends on your cloud provider and
5151
|====
5252
[.small]
5353
--
54-
1. AWS clusters that are upgraded to version 4.12 from an earlier version require xref:../../machine_management/control_plane_machine_management/cpmso-getting-started.adoc#cpmso-activating_cpmso-getting-started[CR activation].
54+
1. AWS clusters that are upgraded from version 4.11 or earlier require xref:../../machine_management/control_plane_machine_management/cpmso-getting-started.adoc#cpmso-activating_cpmso-getting-started[CR activation].
55+
2. Azure clusters that are upgraded from version 4.12 or earlier require xref:../../machine_management/control_plane_machine_management/cpmso-getting-started.adoc#cpmso-activating_cpmso-getting-started[CR activation].
5556
--
5657

5758
//Checking the Control Plane Machine Set Operator status

0 commit comments

Comments
 (0)