Skip to content

[enterprise-4.19] OSDOCS-14522: Cluster API base YAML updates #94498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2025
Merged

[enterprise-4.19] OSDOCS-14522: Cluster API base YAML updates #94498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions _attributes/common-attributes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,9 @@ endif::openshift-origin[]
// Cluster API Provider VMware vSphere
:cap-vsphere-first: Cluster API Provider VMware vSphere
:cap-vsphere-short: Cluster API Provider vSphere
// Cluster API Provider Metal3
:cap-bare-metal-first: Cluster API Provider Metal3
:cap-bare-metal-short: Cluster API Provider Metal3
// Hosted control planes related attributes
:hcp-capital: Hosted control planes
:hcp: hosted control planes
Expand Down
5 changes: 4 additions & 1 deletion modules/capi-creating-machine-template.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
The following values are valid:
+
|====
|Cluster cloud provider |Value
|Cluster infrastructure provider |Value

|{aws-first}
|`AWSMachineTemplate`
Expand All @@ -55,6 +55,9 @@ The following values are valid:
|{vmw-first}
|`VSphereMachineTemplate`

|Bare metal
|`Metal3MachineTemplate`

|====
<2> Specify a name for the machine template.
<3> Specify the details for your environment. These parameters are provider specific. For more information, see the sample Cluster API machine template YAML for your provider.
Expand Down
5 changes: 4 additions & 1 deletion modules/capi-modifying-machine-template.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ $ oc get <machine_template_kind> <1>
The following values are valid:
+
|====
|Cluster cloud provider |Value
|Cluster infrastructure provider |Value

|{aws-full}
|`AWSMachineTemplate`
Expand All @@ -46,6 +46,9 @@ The following values are valid:
|{vmw-full}
|`VSphereMachineTemplate`

|Bare metal
|`Metal3MachineTemplate`

|====
--
+
Expand Down
18 changes: 17 additions & 1 deletion modules/cluster-capi-operator.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ link:https://github.com/openshift/cluster-capi-operator[cluster-capi-operator]
** Scope: Namespaced
** CR: `gcpmachine`

* `azuremachines.infrastructure.cluster.x-k8s.io`
** Scope: Namespaced
** CR: `azuremachine`

* `openstackmachines.infrastructure.cluster.x-k8s.io`
** Scope: Namespaced
** CR: `openstackmachine`
Expand All @@ -39,6 +43,10 @@ link:https://github.com/openshift/cluster-capi-operator[cluster-capi-operator]
** Scope: Namespaced
** CR: `vspheremachine`

* `metal3machines.infrastructure.cluster.x-k8s.io`
** Scope: Namespaced
** CR: `metal3machine`

* `awsmachinetemplates.infrastructure.cluster.x-k8s.io`
** Scope: Namespaced
** CR: `awsmachinetemplate`
Expand All @@ -47,10 +55,18 @@ link:https://github.com/openshift/cluster-capi-operator[cluster-capi-operator]
** Scope: Namespaced
** CR: `gcpmachinetemplate`

* `azuremachinetemplates.infrastructure.cluster.x-k8s.io`
** Scope: Namespaced
** CR: `azuremachinetemplate`

* `openstackmachinetemplates.infrastructure.cluster.x-k8s.io`
** Scope: Namespaced
** CR: `openstackmachinetemplate`

* `vspheremachinetemplates.infrastructure.cluster.x-k8s.io`
** Scope: Namespaced
** CR: `vspheremachinetemplate`
** CR: `vspheremachinetemplate`

* `metal3machinetemplates.infrastructure.cluster.x-k8s.io`
** Scope: Namespaced
** CR: `metal3machinetemplate`