Skip to content

Commit 829aa6f

Browse files
authored
Merge pull request #87372 from jeana-redhat/OSDOCS-5774-TP-CAPI-Azure-supported
OSDOCS-5774: Azure CAPI TP
2 parents d09b967 + 7836ada commit 829aa6f

29 files changed

+338
-120
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2467,6 +2467,8 @@ Topics:
24672467
File: cluster-api-config-options-aws
24682468
- Name: Cluster API configuration options for Google Cloud Platform
24692469
File: cluster-api-config-options-gcp
2470+
- Name: Cluster API configuration options for Microsoft Azure
2471+
File: cluster-api-config-options-azure
24702472
- Name: Cluster API configuration options for VMware vSphere
24712473
File: cluster-api-config-options-vsphere
24722474
# - Name: Cluster API resiliency and recovery

modules/capi-creating-infrastructure-resource.adoc renamed to _unused_topics/capi-creating-infrastructure-resource.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ This value must match the value for your platform.
4646
The following values are valid:
4747
* `AWSCluster`: The cluster is running on {aws-short}.
4848
* `GCPCluster`: The cluster is running on {gcp-short}.
49+
* `AzureCluster`: The cluster is running on {azure-first}.
4950
* `VSphereCluster`: The cluster is running on {vmw-short}.
5051
<3> Specify the name of the cluster.
5152
<4> Specify the details for your environment.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc
4+
5+
:_mod-docs-content-type: REFERENCE
6+
[id="capi-yaml-infrastructure-aws_{context}"]
7+
= Sample YAML for a Cluster API infrastructure cluster resource on {aws-full}
8+
9+
The infrastructure cluster resource is provider-specific and defines properties that all the compute machine sets in the cluster share, such as the region and subnets.
10+
The compute machine set references this resource when creating machines.
11+
12+
In {product-title} {product-version}, the {cluster-capi-operator} generates this resource.
13+
The following sample YAML file is for informational purposes.
14+
User modification of this generated resource is not recommended.
15+
16+
[source,yaml]
17+
----
18+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
19+
kind: AWSCluster # <1>
20+
metadata:
21+
name: <cluster_name> # <2>
22+
namespace: openshift-cluster-api
23+
spec:
24+
controlPlaneEndpoint: # <3>
25+
host: <control_plane_endpoint_address>
26+
port: 6443
27+
region: <region> # <4>
28+
----
29+
<1> Specifies the infrastructure kind for the cluster.
30+
This value matches the value for your platform.
31+
<2> Specifies the cluster ID as the name of the cluster.
32+
<3> Specifies the address of the control plane endpoint and the port to use to access it.
33+
<4> Specifies the {aws-short} region.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-azure.adoc
4+
5+
:_mod-docs-content-type: REFERENCE
6+
[id="capi-yaml-infrastructure-azure_{context}"]
7+
= Sample YAML for a Cluster API infrastructure cluster resource on {azure-full}
8+
9+
The infrastructure cluster resource is provider-specific and defines properties that all the compute machine sets in the cluster share, such as the region and subnets.
10+
The compute machine set references this resource when creating machines.
11+
12+
In {product-title} {product-version}, the {cluster-capi-operator} generates this resource.
13+
The following sample YAML file is for informational purposes.
14+
User modification of this generated resource is not recommended.
15+
16+
[source,yaml]
17+
----
18+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
19+
kind: AzureCluster # <1>
20+
metadata:
21+
name: <cluster_name> # <2>
22+
namespace: openshift-cluster-api
23+
spec:
24+
azureEnvironment: AzurePublicCloud
25+
bastionSpec: {}
26+
controlPlaneEndpoint: # <3>
27+
host: <control_plane_endpoint_address>
28+
port: 6443
29+
identityRef: # <4>
30+
kind: AzureClusterIdentity
31+
name: <cluster_name>
32+
namespace: openshift-cluster-api
33+
location: westus # <5>
34+
networkSpec:
35+
apiServerLB:
36+
backendPool: {}
37+
nodeOutboundLB:
38+
backendPool:
39+
name: <cluster_name>
40+
name: <cluster_name>
41+
vnet:
42+
name: <cluster_name>-vnet
43+
resourceGroup: <cluster_name>-rg
44+
resourceGroup: <cluster_name>-rg
45+
----
46+
<1> Specifies the infrastructure kind for the cluster.
47+
This value matches the value for your platform.
48+
<2> Specifies the cluster ID as the name of the cluster.
49+
<3> Specifies the address of the control plane endpoint and the port to use to access it.
50+
<4> The cluster identity that the {cluster-capi-operator} creates.
51+
<5> Specifies the {azure-short} region.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc
4+
5+
:_mod-docs-content-type: REFERENCE
6+
[id="capi-yaml-infrastructure-gcp_{context}"]
7+
= Sample YAML for a Cluster API infrastructure cluster resource on {gcp-full}
8+
9+
The infrastructure cluster resource is provider-specific and defines properties that all the compute machine sets in the cluster share, such as the region and subnets.
10+
The compute machine set references this resource when creating machines.
11+
12+
In {product-title} {product-version}, the {cluster-capi-operator} generates this resource.
13+
The following sample YAML file is for informational purposes.
14+
User modification of this generated resource is not recommended.
15+
16+
[source,yaml]
17+
----
18+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
19+
kind: GCPCluster # <1>
20+
metadata:
21+
name: <cluster_name> # <2>
22+
spec:
23+
controlPlaneEndpoint: # <3>
24+
host: <control_plane_endpoint_address>
25+
port: 6443
26+
network:
27+
name: <cluster_name>-network
28+
project: <project> # <4>
29+
region: <region> # <5>
30+
----
31+
<1> Specifies the infrastructure kind for the cluster.
32+
This value matches the value for your platform.
33+
<2> Specifies the cluster ID as the name of the cluster.
34+
<3> Specifies the IP address of the control plane endpoint and the port used to access it.
35+
<4> Specifies the {gcp-short} project name.
36+
<5> Specifies the {gcp-short} region.

modules/capi-yaml-infrastructure-vsphere.adoc renamed to _unused_topics/capi-yaml-infrastructure-vsphere.adoc

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@
44

55
:_mod-docs-content-type: REFERENCE
66
[id="capi-yaml-infrastructure-vsphere_{context}"]
7-
= Sample YAML for a Cluster API infrastructure resource on {vmw-full}
7+
= Sample YAML for a Cluster API infrastructure cluster resource on {vmw-full}
88

9-
The infrastructure resource is provider-specific and defines properties that are shared by all the compute machine sets in the cluster, such as the region and subnets.
9+
The infrastructure cluster resource is provider-specific and defines properties that all the compute machine sets in the cluster share, such as the region and subnets.
1010
The compute machine set references this resource when creating machines.
1111

12+
In {product-title} {product-version}, the {cluster-capi-operator} generates this resource.
13+
The following sample YAML file is for informational purposes.
14+
User modification of this generated resource is not recommended.
15+
1216
[source,yaml]
1317
----
1418
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -24,11 +28,11 @@ spec:
2428
name: <cluster_name>
2529
server: <vsphere_server> # <4>
2630
----
27-
<1> Specify the infrastructure kind for the cluster.
28-
This value must match the value for your platform.
29-
<2> Specify the cluster ID as the name of the cluster.
30-
<3> Specify the IP address of the control plane endpoint and the port used to access it.
31-
<4> Specify the {vmw-short} server for the cluster.
31+
<1> Specifies the infrastructure kind for the cluster.
32+
This value matches the value for your platform.
33+
<2> Specifies the cluster ID as the name of the cluster.
34+
<3> Specifies the IP address of the control plane endpoint and the port used to access it.
35+
<4> Specifies the {vmw-short} server for the cluster.
3236
You can find this value on an existing {vmw-short} cluster by running the following command:
3337
+
3438
[source,terminal]

machine_management/cluster_api_machine_management/cluster-api-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ toc::[]
99
:FeatureName: Managing machines with the Cluster API
1010
include::snippets/technology-preview.adoc[]
1111

12-
The link:https://cluster-api.sigs.k8s.io/[Cluster API] is an upstream project that is integrated into {product-title} as a Technology Preview for {aws-first}, {gcp-first}, and {vmw-first}.
12+
The link:https://cluster-api.sigs.k8s.io/[Cluster API] is an upstream project that is integrated into {product-title} as a Technology Preview for {aws-first}, {gcp-first}, {azure-first} and {vmw-first}.
1313

1414
//Cluster API overview
1515
include::modules/capi-overview.adoc[leveloffset=+1]

machine_management/cluster_api_machine_management/cluster-api-configuration.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ For provider-specific configuration options for your cluster, see the following
2424

2525
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#cluster-api-config-options-gcp[Cluster API configuration options for {gcp-full}]
2626

27+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-azure.adoc#cluster-api-config-options-azure[Cluster API configuration options for {azure-full}]
28+
2729
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#cluster-api-config-options-vsphere[Cluster API configuration options for {vmw-full}]

machine_management/cluster_api_machine_management/cluster-api-getting-started.adoc

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ toc::[]
99
:FeatureName: Managing machines with the Cluster API
1010
include::snippets/technology-preview.adoc[]
1111

12-
For the Cluster API Technology Preview, you must create the primary resources that the Cluster API requires manually.
12+
For the Cluster API Technology Preview, you must manually create some of the primary resources that the Cluster API requires.
1313

1414
[id="creating-primary-resources_{context}"]
1515
== Creating the Cluster API primary resources
@@ -27,20 +27,13 @@ include::modules/capi-creating-cluster-resource.adoc[leveloffset=+2]
2727
.Additional resources
2828
* xref:../../machine_management/cluster_api_machine_management/cluster-api-configuration.adoc#cluster-api-configuration[Cluster API configuration]
2929

30-
//Creating a Cluster API infrastructure resource
31-
include::modules/capi-creating-infrastructure-resource.adoc[leveloffset=+2]
32-
[role="_additional-resources"]
33-
.Additional resources
34-
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#capi-yaml-infrastructure-aws_cluster-api-config-options-aws[Sample YAML for a Cluster API infrastructure resource on {aws-full}]
35-
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#capi-yaml-infrastructure-gcp_cluster-api-config-options-gcp[Sample YAML for a Cluster API infrastructure resource on {gcp-full}]
36-
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#capi-yaml-infrastructure-vsphere_cluster-api-config-options-vsphere[Sample YAML for a Cluster API infrastructure resource on {vmw-full}]
37-
3830
//Creating a Cluster API machine template
3931
include::modules/capi-creating-machine-template.adoc[leveloffset=+2]
4032
[role="_additional-resources"]
4133
.Additional resources
4234
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#capi-yaml-machine-template-aws_cluster-api-config-options-aws[Sample YAML for a Cluster API machine template resource on {aws-full}]
4335
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#capi-yaml-machine-template-gcp_cluster-api-config-options-gcp[Sample YAML for a Cluster API machine template resource on {gcp-full}]
36+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-azure.adoc#capi-yaml-machine-template-azure_cluster-api-config-options-azure[Sample YAML for a Cluster API machine template resource on {azure-full}]
4437
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#capi-yaml-machine-template-vsphere_cluster-api-config-options-vsphere[Sample YAML for a Cluster API machine template resource on {vmw-full}]
4538

4639
//Creating a Cluster API compute machine set
@@ -49,4 +42,5 @@ include::modules/capi-creating-machine-set.adoc[leveloffset=+2]
4942
.Additional resources
5043
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#capi-yaml-machine-set-aws_cluster-api-config-options-aws[Sample YAML for a Cluster API compute machine set resource on {aws-full}]
5144
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#capi-yaml-machine-set-gcp_cluster-api-config-options-gcp[Sample YAML for a Cluster API compute machine set resource on {gcp-full}]
45+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-azure.adoc#capi-yaml-machine-set-azure_cluster-api-config-options-azure[Sample YAML for a Cluster API compute machine set resource on {azure-full}]
5246
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#capi-yaml-machine-set-vsphere_cluster-api-config-options-vsphere[Sample YAML for a Cluster API compute machine set resource on {vmw-full}]

machine_management/cluster_api_machine_management/cluster-api-managing-machines.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ include::modules/capi-modifying-machine-template.adoc[leveloffset=+1]
1515
.Additional resources
1616
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#capi-yaml-machine-template-aws_cluster-api-config-options-aws[Sample YAML for a Cluster API machine template resource on {aws-full}]
1717
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#capi-yaml-machine-template-gcp_cluster-api-config-options-gcp[Sample YAML for a Cluster API machine template resource on {gcp-full}]
18+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-azure.adoc#capi-yaml-machine-template-azure_cluster-api-config-options-azure[Sample YAML for a Cluster API machine template resource on {azure-full}]
1819
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#capi-yaml-machine-template-vsphere_cluster-api-config-options-vsphere[Sample YAML for a Cluster API machine template resource on {vmw-full}]
1920
* xref:../../machine_management/cluster_api_machine_management/cluster-api-managing-machines.adoc#machineset-modifying_cluster-api-managing-machines[Modifying a compute machine set by using the CLI]
2021
@@ -25,4 +26,5 @@ include::modules/machineset-modifying.adoc[leveloffset=+1,tag=!MAPI]
2526
.Additional resources
2627
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#capi-yaml-machine-set-aws_cluster-api-config-options-aws[Sample YAML for a Cluster API compute machine set resource on {aws-full}]
2728
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#capi-yaml-machine-set-gcp_cluster-api-config-options-gcp[Sample YAML for a Cluster API compute machine set resource on {gcp-full}]
29+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-azure.adoc#capi-yaml-machine-set-azure_cluster-api-config-options-azure[Sample YAML for a Cluster API compute machine set resource on {azure-full}]
2830
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#capi-yaml-machine-set-vsphere_cluster-api-config-options-vsphere[Sample YAML for a Cluster API compute machine set resource on {vmw-full}]

0 commit comments

Comments
 (0)