Skip to content

Commit 4410f1a

Browse files
authored
Merge pull request #72885 from jeana-redhat/OSDOCS-9925-CAPI-assembly
OSDOCS-9925: Create CAPI directory
2 parents ad1d72b + 209c34c commit 4410f1a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1074
-427
lines changed

_topic_maps/_topic_map.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2300,8 +2300,6 @@ Topics:
23002300
File: adding-vsphere-compute-user-infra
23012301
- Name: Adding compute machines to bare metal
23022302
File: adding-bare-metal-compute-user-infra
2303-
- Name: Managing machines with the Cluster API
2304-
File: capi-machine-management
23052303
- Name: Managing control plane machines
23062304
Dir: control_plane_machine_management
23072305
Topics:
@@ -2334,6 +2332,30 @@ Topics:
23342332
File: cpmso-troubleshooting
23352333
- Name: Disabling the control plane machine set
23362334
File: cpmso-disabling
2335+
- Name: Managing machines with the Cluster API
2336+
Dir: cluster_api_machine_management
2337+
Topics:
2338+
- Name: About the Cluster API
2339+
File: cluster-api-about
2340+
- Name: Getting started with the Cluster API
2341+
File: cluster-api-getting-started
2342+
- Name: Managing machines with the Cluster API
2343+
File: cluster-api-managing-machines
2344+
- Name: Cluster API configuration
2345+
File: cluster-api-configuration
2346+
- Name: Configuration options for Cluster API machines
2347+
Dir: cluster_api_provider_configurations
2348+
Topics:
2349+
- Name: Cluster API configuration options for Amazon Web Services
2350+
File: cluster-api-config-options-aws
2351+
- Name: Cluster API configuration options for Google Cloud Platform
2352+
File: cluster-api-config-options-gcp
2353+
# - Name: Cluster API resiliency and recovery
2354+
# File: cluster-api-resiliency
2355+
- Name: Troubleshooting Cluster API clusters
2356+
File: cluster-api-troubleshooting
2357+
# - Name: Disabling Cluster API machine sets
2358+
# File: cluster-api-disabling
23372359
- Name: Deploying machine health checks
23382360
File: deploying-machine-health-checks
23392361
---

machine_management/capi-machine-management.adoc

Lines changed: 0 additions & 111 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../_attributes/
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="cluster-api-about"]
3+
= About the Cluster API
4+
include::_attributes/common-attributes.adoc[]
5+
:context: cluster-api-about
6+
7+
toc::[]
8+
9+
:FeatureName: Managing machines with the Cluster API
10+
include::snippets/technology-preview.adoc[]
11+
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 Amazon Web Services (AWS) and Google Cloud Platform (GCP).
13+
14+
//Cluster API overview
15+
include::modules/capi-overview.adoc[leveloffset=+1]
16+
17+
//Cluster API benefits
18+
include::modules/capi-benefits.adoc[leveloffset=+2]
19+
20+
//Cluster API limitations
21+
include::modules/capi-limitations.adoc[leveloffset=+2]
22+
23+
[role="_additional-resources"]
24+
.Additional resources
25+
* xref:../../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling-features-about_nodes-cluster-enabling[Enabling features using feature gates]
26+
27+
* xref:../../machine_management/cluster_api_machine_management/cluster-api-getting-started.adoc#cluster-api-getting-started[Getting started with the Cluster API]
28+
29+
* xref:../../machine_management/cluster_api_machine_management/cluster-api-troubleshooting.adoc#ts-capi-cli-reference-intended-objects_cluster-api-troubleshooting[Referencing the intended objects when using the CLI]
30+
31+
[id="cluster-api-architecture_{context}"]
32+
== Cluster API architecture
33+
34+
The {product-title} integration of the upstream Cluster API is implemented and managed by the Cluster CAPI Operator.
35+
The Cluster CAPI Operator and its operands are provisioned in the `openshift-cluster-api` namespace, in contrast to the Machine API, which uses the `openshift-machine-api` namespace.
36+
37+
//The Cluster CAPI Operator
38+
include::modules/capi-arch-operator.adoc[leveloffset=+2]
39+
40+
[role="_additional-resources"]
41+
.Additional resources
42+
* xref:../../operators/operator-reference.adoc#cluster-capi-operator_cluster-operators-ref[Cluster CAPI Operator]
43+
44+
//Cluster API primary resources
45+
include::modules/capi-arch-resources.adoc[leveloffset=+2]
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="cluster-api-configuration"]
3+
= Cluster API configuration
4+
include::_attributes/common-attributes.adoc[]
5+
:context: cluster-api-configuration
6+
7+
toc::[]
8+
9+
:FeatureName: Managing machines with the Cluster API
10+
include::snippets/technology-preview.adoc[]
11+
12+
The following example YAML files show how to make the Cluster API primary resources work together and configure settings for the machines that they create that are appropriate for your environment.
13+
14+
//Sample YAML for a CAPI cluster resource
15+
include::modules/capi-yaml-cluster.adoc[leveloffset=+1]
16+
17+
[id="cpmso-sample-yaml-provider-specific_{context}"]
18+
== Provider-specific configuration options
19+
20+
The remaining Cluster API resources are provider-specific.
21+
For provider-specific configuration options for your cluster, see the following resources:
22+
23+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#cluster-api-config-options-aws[Cluster API configuration options for {aws-full}]
24+
25+
* 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}]
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="cluster-api-disabling"]
3+
= Disabling Cluster API machine sets
4+
include::_attributes/common-attributes.adoc[]
5+
:context: cluster-api-disabling
6+
7+
toc::[]
8+
9+
:FeatureName: Managing machines with the Cluster API
10+
include::snippets/technology-preview.adoc[]
11+
12+
//Placeholder assembly, commented out in the topic map.
13+
//how to disable, clean up, verify, and reenable
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="cluster-api-getting-started"]
3+
= Getting started with the Cluster API
4+
include::_attributes/common-attributes.adoc[]
5+
:context: cluster-api-getting-started
6+
7+
toc::[]
8+
9+
:FeatureName: Managing machines with the Cluster API
10+
include::snippets/technology-preview.adoc[]
11+
12+
For the Cluster API Technology Preview, you must create the primary resources that the Cluster API requires manually.
13+
14+
[id="creating-primary-resources_{context}"]
15+
== Creating the Cluster API primary resources
16+
17+
To create the Cluster API primary resources, you must obtain the cluster ID value, which you use for the `<cluster_name>` parameter in the cluster resource manifest.
18+
19+
//Obtaining the cluster ID value
20+
include::modules/obtaining-value-cluster-id.adoc[leveloffset=+2]
21+
22+
You can create the Cluster API primary resources manually by creating YAML manifest files and applying them with the {oc-first}.
23+
24+
//Creating the Cluster API cluster resource
25+
include::modules/capi-creating-cluster-resource.adoc[leveloffset=+2]
26+
[role="_additional-resources"]
27+
.Additional resources
28+
* xref:../../machine_management/cluster_api_machine_management/cluster-api-configuration.adoc#cluster-api-configuration[Cluster API configuration]
29+
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+
37+
//Creating a Cluster API machine template
38+
include::modules/capi-creating-machine-template.adoc[leveloffset=+2]
39+
[role="_additional-resources"]
40+
.Additional resources
41+
* 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}]
42+
* 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}]
43+
44+
//Creating a Cluster API compute machine set
45+
include::modules/capi-creating-machine-set.adoc[leveloffset=+2]
46+
[role="_additional-resources"]
47+
.Additional resources
48+
* 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}]
49+
* 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}]
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="cluster-api-managing-machines"]
3+
= Managing machines with the Cluster API
4+
include::_attributes/common-attributes.adoc[]
5+
:context: cluster-api-managing-machines
6+
7+
toc::[]
8+
9+
:FeatureName: Managing machines with the Cluster API
10+
include::snippets/technology-preview.adoc[]
11+
12+
//Modifying a Cluster API machine template
13+
include::modules/capi-modifying-machine-template.adoc[leveloffset=+1]
14+
[role="_additional-resources"]
15+
.Additional resources
16+
* 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}]
17+
* 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-managing-machines.adoc#machineset-modifying_cluster-api-managing-machines[Modifying a compute machine set by using the CLI]
19+
20+
//Modifying a compute machine set by using the CLI
21+
include::modules/machineset-modifying.adoc[leveloffset=+1,tags=!*;CAPI]
22+
[role="_additional-resources"]
23+
.Additional resources
24+
* 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}]
25+
* 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}]
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="cluster-api-resiliency"]
3+
= Cluster API resiliency and recovery
4+
include::_attributes/common-attributes.adoc[]
5+
:context: cluster-api-resiliency
6+
7+
toc::[]
8+
9+
:FeatureName: Managing machines with the Cluster API
10+
include::snippets/technology-preview.adoc[]
11+
12+
//Placeholder assembly, commented out in the topic map.
13+
// MAPI would be HA/failure domains, recovery with machine health checks. Not sure about CAPI version
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="cluster-api-troubleshooting"]
3+
= Troubleshooting clusters that use the Cluster API
4+
include::_attributes/common-attributes.adoc[]
5+
:context: cluster-api-troubleshooting
6+
7+
toc::[]
8+
9+
:FeatureName: Managing machines with the Cluster API
10+
include::snippets/technology-preview.adoc[]
11+
12+
Use the information in this section to understand and recover from issues you might encounter.
13+
Generally, troubleshooting steps for problems with the Cluster API are similar to those steps for problems with the Machine API.
14+
15+
The Cluster CAPI Operator and its operands are provisioned in the `openshift-cluster-api` namespace, whereas the Machine API uses the `openshift-machine-api` namespace. When using `oc` commands that reference a namespace, be sure to reference the correct one.
16+
17+
//Returning the intended machines when using the CLI
18+
include::modules/ts-capi-cli-reference-intended-objects.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)