diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc index d73b60b2af96..5b7c02f1bf3c 100644 --- a/_attributes/common-attributes.adoc +++ b/_attributes/common-attributes.adoc @@ -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 diff --git a/modules/capi-creating-machine-template.adoc b/modules/capi-creating-machine-template.adoc index b3340c3d9274..db6200abae89 100644 --- a/modules/capi-creating-machine-template.adoc +++ b/modules/capi-creating-machine-template.adoc @@ -38,7 +38,7 @@ spec: The following values are valid: + |==== -|Cluster cloud provider |Value +|Cluster infrastructure provider |Value |{aws-first} |`AWSMachineTemplate` @@ -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. diff --git a/modules/capi-modifying-machine-template.adoc b/modules/capi-modifying-machine-template.adoc index ef1a2533ee01..6c21889cbb54 100644 --- a/modules/capi-modifying-machine-template.adoc +++ b/modules/capi-modifying-machine-template.adoc @@ -29,7 +29,7 @@ $ oc get <1> The following values are valid: + |==== -|Cluster cloud provider |Value +|Cluster infrastructure provider |Value |{aws-full} |`AWSMachineTemplate` @@ -46,6 +46,9 @@ The following values are valid: |{vmw-full} |`VSphereMachineTemplate` +|Bare metal +|`Metal3MachineTemplate` + |==== -- + diff --git a/modules/cluster-capi-operator.adoc b/modules/cluster-capi-operator.adoc index 82aa589a7a61..4929557582b2 100644 --- a/modules/cluster-capi-operator.adoc +++ b/modules/cluster-capi-operator.adoc @@ -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` @@ -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` @@ -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` \ No newline at end of file +** CR: `vspheremachinetemplate` + +* `metal3machinetemplates.infrastructure.cluster.x-k8s.io` +** Scope: Namespaced +** CR: `metal3machinetemplate` \ No newline at end of file