diff --git a/machine_management/deploying-machine-health-checks.adoc b/machine_management/deploying-machine-health-checks.adoc index 56258fc5ac..2ff2ca9f75 100644 --- a/machine_management/deploying-machine-health-checks.adoc +++ b/machine_management/deploying-machine-health-checks.adoc @@ -1,5 +1,5 @@ [id='deploying-machine-health-checks'] -= Deploying machine heath checks += Deploying machine health checks include::modules/common-attributes.adoc[] :context: deploying-machine-health-checks toc::[] diff --git a/modules/machine-api-overview.adoc b/modules/machine-api-overview.adoc index a9c5c444e3..c72728932c 100644 --- a/modules/machine-api-overview.adoc +++ b/modules/machine-api-overview.adoc @@ -14,15 +14,12 @@ The Machine API is a combination of primary resources that are based on the upst link:https://github.com/kubernetes-sigs/cluster-api[Cluster API] project and custom {product-title} resources. -The three primary resources are: +The two primary resources are: `Machines`:: A fundamental unit that describes a `Node`. A `machine` has a class, which describes the types of compute nodes that are offered for different cloud platforms. For example, a `machine` type for a worker node on Amazon Web Services (AWS) might define a specific machine type and required metadata. -`MachineClasses`:: A unit that defines a class of `machines` and facilitates -configuration reuse across `machines` of the same class. This unit functions -like a `StorageClass` for PersistentVolumeClaims. `MachineSets`:: Groups of machines. `MachineSets` are to `machines` as `ReplicaSets` are to `Pods`. If you need more `machines` or need to scale them down, you change the *replicas* field on the `MachineSet` to meet your compute need. @@ -36,12 +33,13 @@ specified `MachineSet`, and the `MachineAutoscaler` maintains that range of node The `MachineAutoscaler` object takes effect after a `ClusterAutoscaler` object exists. Both `ClusterAutoscaler` and `MachineAutoscaler` resources are made available by the `ClusterAutoscalerOperator`. -`MachineHealthChecker`:: This resource detects when a machine is unhealthy, +`MachineHealthCheck`:: This resource detects when a machine is unhealthy, deletes it, and, on supported platforms, makes a new machine. `ClusterAutoscaler`:: This resource is based on the upstream link:https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler[ClusterAutoscaler] project. In the {product-title} implementation, it is integrated with the Cluster API by extending the `MachineSet` API. +//// `ClusterAutoscalerOperator`:: Instead of interacting with the `ClusterAutoscaler` itself, you use its Operator. The `ClusterAutoscalerOperator` manages the `ClusterAutoscaler` deployment. With this Operator, you can set cluster-wide @@ -49,6 +47,7 @@ scaling limits for resources such as cores, nodes, memory, and GPU. and so on. You can set the priority so that the cluster prioritizes pods so that new nodes are not brought online for less important pods. You can also set the ScalingPolicy so you can scale up nodes but not scale them down. +//// In {product-title} version 3.11, you could not roll out a multi-zone architecture easily because the cluster diff --git a/modules/machine-health-checks-about.adoc b/modules/machine-health-checks-about.adoc index 6583d6f63f..a49a745c77 100644 --- a/modules/machine-health-checks-about.adoc +++ b/modules/machine-health-checks-about.adoc @@ -5,7 +5,7 @@ [id='machine-health-checks-about-{context}'] = About MachineHealthChecks -MachineHealthChecks automatically repair unhealthy Machines in a particular +MachineHealthChecks automatically repairs unhealthy Machines in a particular MachinePool. To monitor machine health, you create a resource to define the diff --git a/modules/machine-health-checks-resource.adoc b/modules/machine-health-checks-resource.adoc index d6aa666654..d1954b3c3f 100644 --- a/modules/machine-health-checks-resource.adoc +++ b/modules/machine-health-checks-resource.adoc @@ -14,25 +14,22 @@ apiVersion: healthchecking.openshift.io/v1alpha1 kind: MachineHealthCheck metadata: name: example <1> - namespace: example <2> + namespace: openshift-machine-api Spec: Selector: matchLabels: - sigs.k8s.io/cluster-api-cluster: <3> - sigs.k8s.io/cluster-api-machine-role: