Skip to content

Commit 455e85d

Browse files
committed
[OSDOCS-4242]: machine sets are for compute only
1 parent b05c996 commit 455e85d

File tree

131 files changed

+444
-429
lines changed

Some content is hidden

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

131 files changed

+444
-429
lines changed

_topic_maps/_topic_map.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1877,37 +1877,37 @@ Distros: openshift-origin,openshift-enterprise
18771877
Topics:
18781878
- Name: Overview of machine management
18791879
File: index
1880-
- Name: Creating machine sets
1880+
- Name: Creating compute machine sets
18811881
Dir: creating_machinesets
18821882
Distros: openshift-origin,openshift-enterprise
18831883
Topics:
1884-
- Name: Creating a machine set on Alibaba Cloud
1884+
- Name: Creating a compute machine set on Alibaba Cloud
18851885
File: creating-machineset-alibaba
1886-
- Name: Creating a machine set on AWS
1886+
- Name: Creating a compute machine set on AWS
18871887
File: creating-machineset-aws
1888-
- Name: Creating a machine set on Azure
1888+
- Name: Creating a compute machine set on Azure
18891889
File: creating-machineset-azure
1890-
- Name: Creating a machine set on Azure Stack Hub
1890+
- Name: Creating a compute machine set on Azure Stack Hub
18911891
File: creating-machineset-azure-stack-hub
1892-
- Name: Creating a machine set on GCP
1892+
- Name: Creating a compute machine set on GCP
18931893
File: creating-machineset-gcp
1894-
- Name: Creating a machine set on IBM Cloud
1894+
- Name: Creating a compute machine set on IBM Cloud
18951895
File: creating-machineset-ibm-cloud
1896-
- Name: Creating a machine set on Nutanix
1896+
- Name: Creating a compute machine set on Nutanix
18971897
File: creating-machineset-nutanix
1898-
- Name: Creating a machine set on OpenStack
1898+
- Name: Creating a compute machine set on OpenStack
18991899
File: creating-machineset-osp
1900-
- Name: Creating a machine set on RHV
1900+
- Name: Creating a compute machine set on RHV
19011901
File: creating-machineset-rhv
19021902
Distros: openshift-enterprise
1903-
- Name: Creating a machine set on oVirt
1903+
- Name: Creating a compute machine set on oVirt
19041904
File: creating-machineset-rhv
19051905
Distros: openshift-origin
1906-
- Name: Creating a machine set on vSphere
1906+
- Name: Creating a compute machine set on vSphere
19071907
File: creating-machineset-vsphere
1908-
- Name: Manually scaling a machine set
1908+
- Name: Manually scaling a compute machine set
19091909
File: manually-scaling-machineset
1910-
- Name: Modifying a machine set
1910+
- Name: Modifying a compute machine set
19111911
File: modifying-machineset
19121912
- Name: Deleting a machine
19131913
File: deleting-machine

_unused_topics/windows-machine-config-operator.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[discrete]
99
== Purpose
1010

11-
The Windows Machine Config Operator (WMCO) orchestrates the process of deploying and managing Windows workloads on a cluster. The WMCO configures Windows machines into compute nodes, enabling Windows container workloads to run in {product-title} clusters. This is done by creating a machine set that uses a Windows image with the Docker-formatted container runtime installed. The WMCO completes all necessary steps to configure the underlying Windows VM so that it can join the cluster as a compute node.
11+
The Windows Machine Config Operator (WMCO) orchestrates the process of deploying and managing Windows workloads on a cluster. The WMCO configures Windows machines into compute nodes, enabling Windows container workloads to run in {product-title} clusters. This is done by creating a compute machine set that uses a Windows image with the Docker-formatted container runtime installed. The WMCO completes all necessary steps to configure the underlying Windows VM so that it can join the cluster as a compute node.
1212

1313
[discrete]
1414
== Project

installing/installing_gcp/installing-gcp-customizations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2]
3838
[role="_additional-resources"]
3939
== Additional resources
4040

41-
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a machine set]
41+
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a compute machine set]
4242

4343
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
4444

installing/installing_gcp/installing-gcp-network-customizations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2]
4545
[role="_additional-resources"]
4646
== Additional resources
4747

48-
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a machine set]
48+
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a compute machine set]
4949

5050
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
5151

installing/installing_gcp/installing-gcp-private.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ include::modules/nw-gcp-installing-global-access-configuration.adoc[leveloffset=
4545
[role="_additional-resources"]
4646
== Additional resources
4747

48-
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a machine set]
48+
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a compute machine set]
4949

5050
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
5151

installing/installing_gcp/installing-gcp-vpc.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ include::modules/nw-gcp-installing-global-access-configuration.adoc[leveloffset=
4141
[role="_additional-resources"]
4242
== Additional resources
4343

44-
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a machine set]
44+
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a compute machine set]
4545

4646
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
4747

installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ include::modules/installation-ibm-cloud-config-yaml.adoc[leveloffset=+2]
3636

3737
//.Additional resources
3838

39-
//* ../../machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-ibm-cloud[Enabling customer-managed encryption keys for a machine set]
39+
//* ../../machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-ibm-cloud[Enabling customer-managed encryption keys for a compute machine set]
4040

4141
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
4242

installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ include::modules/installation-ibm-cloud-config-yaml.adoc[leveloffset=+2]
3939

4040
//.Additional resources
4141

42-
//* ../../machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-ibm-cloud[Enabling customer-managed encryption keys for a machine set]
42+
//* ../../machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-ibm-cloud[Enabling customer-managed encryption keys for a compute machine set]
4343

4444
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
4545

machine_management/applying-autoscaling.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ include::modules/machine-autoscaler-about.adoc[leveloffset=+1]
4040
[id="configuring-machineautoscaler"]
4141
== Configuring the machine autoscalers
4242

43-
After you deploy the cluster autoscaler, deploy `MachineAutoscaler` resources that reference the machine sets that are used to scale the cluster.
43+
After you deploy the cluster autoscaler, deploy `MachineAutoscaler` resources that reference the compute machine sets that are used to scale the cluster.
4444

4545
[IMPORTANT]
4646
====
@@ -49,7 +49,7 @@ You must deploy at least one `MachineAutoscaler` resource after you deploy the `
4949

5050
[NOTE]
5151
====
52-
You must configure separate resources for each machine set. Remember that machine sets are different in each region, so consider whether you want to enable machine scaling in multiple regions. The machine set that you scale must have at least one machine in it.
52+
You must configure separate resources for each compute machine set. Remember that compute machine sets are different in each region, so consider whether you want to enable machine scaling in multiple regions. The compute machine set that you scale must have at least one machine in it.
5353
====
5454

5555
include::modules/machine-autoscaler-cr.adoc[leveloffset=+2]

machine_management/capi-machine-management.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ 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 Amazon Web Services (AWS) and Google Cloud Platform (GCP) clusters. You can use the Cluster API to create and manage machine sets and machines in your {product-title} cluster. This capability is in addition or an alternative to managing machines with the Machine API.
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) clusters. You can use the Cluster API to create and manage compute machine sets and machines in your {product-title} cluster. This capability is in addition or an alternative to managing machines with the Machine API.
1313

1414
For {product-title} {product-version} clusters, you can use the Cluster API to perform node host provisioning management actions after the cluster installation finishes. This system enables an elastic, dynamic provisioning method on top of public or private cloud infrastructure.
1515

16-
With the Cluster API Technology Preview, you can create compute machines and machine sets on {product-title} clusters for supported providers. You can also explore the features that are enabled by this implementation that might not be available with the Machine API.
16+
With the Cluster API Technology Preview, you can create compute machines and compute machine sets on {product-title} clusters for supported providers. You can also explore the features that are enabled by this implementation that might not be available with the Machine API.
1717

1818
[discrete]
1919
[id="cluster-api-benefits_{context}"]
@@ -27,7 +27,7 @@ By using the Cluster API, {product-title} users and developers are able to reali
2727

2828
* The ability to use the same set of Kubernetes tools for infrastructure management in {product-title}.
2929

30-
* The ability to create machine sets using the Cluster API that support features that are not available with the Machine API.
30+
* The ability to create compute machine sets using the Cluster API that support features that are not available with the Machine API.
3131

3232
[discrete]
3333
[id="capi-tech-preview-limitations"]
@@ -43,7 +43,7 @@ Using the Cluster API to manage machines is a Technology Preview feature and has
4343

4444
* Control plane machines cannot be managed by the Cluster API.
4545

46-
* Migration of existing machine sets created by the Machine API to Cluster API machine sets is not supported.
46+
* Migration of existing compute machine sets created by the Machine API to Cluster API compute machine sets is not supported.
4747

4848
* Full feature parity with the Machine API is not available.
4949

@@ -79,7 +79,7 @@ include::modules/capi-yaml-infrastructure-aws.adoc[leveloffset=+3]
7979
//Sample YAML for CAPI AWS machine template resource
8080
include::modules/capi-yaml-machine-template-aws.adoc[leveloffset=+3]
8181

82-
//Sample YAML for a CAPI AWS machine set resource
82+
//Sample YAML for a CAPI AWS compute machine set resource
8383
include::modules/capi-yaml-machine-set-aws.adoc[leveloffset=+3]
8484

8585
[id="capi-sample-yaml-files-gcp"]
@@ -93,10 +93,10 @@ include::modules/capi-yaml-infrastructure-gcp.adoc[leveloffset=+3]
9393
//Sample YAML for CAPI GCP machine template resource
9494
include::modules/capi-yaml-machine-template-gcp.adoc[leveloffset=+3]
9595

96-
//Sample YAML for a CAPI GCP machine set resource
96+
//Sample YAML for a CAPI GCP compute machine set resource
9797
include::modules/capi-yaml-machine-set-gcp.adoc[leveloffset=+3]
9898

99-
//Creating a CAPI machine set
99+
//Creating a CAPI compute machine set
100100
include::modules/capi-machine-set-creating.adoc[leveloffset=+1]
101101

102102
//Troubleshooting clusters that use the Cluster API

0 commit comments

Comments
 (0)