diff --git a/docs/faq.md b/docs/faq.md index 7f0f54c45..1b5d72ac0 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -153,18 +153,16 @@ spec: It can be unpaused again by removing the `Paused` field from the machine-deployment. -### How to delete machine object immedietly if I don't have access to it? +### How to delete machine object immediately if I don't have access to it? -If the user doesn't have access to the machine objects (like in case of Gardener clusters) and they would like to replace a node immedietly then they can place the annotation `node.machine.sapcloud.io/trigger-deletion-by-mcm: "true"` on their node. This will start the replacement of the machine with a new node. - -On the other hand if the user deletes the node object immedietly then replacement will start only after `MachineHealthTimeout`. - -This annotation can also be used if the user wants to expedite the [replacement of unhealthy nodes](#how-does-rate-limiting-replacement-of-machine-work-in-mcm-how-is-it-related-to-meltdown-protection) +If access to the machine object is available, it can be deleted directly. Alternatively, when the machine object is not accessible, the corresponding node object may be deleted directly. This action immediately marks the associated machine object for deletion and triggers the creation of a replacement machine to maintain the desired replica count specified in the machineDeployment or machineSet. +This can also be used if the user wants to expedite the [replacement of unhealthy nodes](#how-does-rate-limiting-replacement-of-machine-work-in-mcm-how-is-it-related-to-meltdown-protection) `NOTE`: -- `node.machine.sapcloud.io/trigger-deletion-by-mcm: "false"` annotation is NOT acted upon by MCM , neither does it mean that MCM will not replace this machine. -- this annotation would delete the desired machine but another machine would be created to maintain `desired replicas` specified for the machineDeployment/machineSet. Currently if the user doesn't have access to machineDeployment/machineSet then they cannot remove a machine without replacement. +- The `node.machine.sapcloud.io/trigger-deletion-by-mcm` annotation is no longer supported on node objects. It is however, still used on the machineDeployment objects (used by the CA-MCM cloud provider integration). +- Setting the annotation to `"false"` is NOT acted upon by MCM and does not prevent machine replacement. +- Deleting a node will trigger machine deletion and replacement. A new machine will be created to maintain the `desired replicas` specified for the machineDeployment/machineSet. Currently if the user doesn't have access to machineDeployment/machineSet then they cannot remove a machine without replacement. ### How to avoid garbage collection of your node? diff --git a/pkg/util/provider/machineutils/utils.go b/pkg/util/provider/machineutils/utils.go index 31ed3cf89..bac822d3f 100644 --- a/pkg/util/provider/machineutils/utils.go +++ b/pkg/util/provider/machineutils/utils.go @@ -59,9 +59,8 @@ const ( // NotManagedByMCM annotation helps in identifying the nodes which are not handled by MCM NotManagedByMCM = "node.machine.sapcloud.io/not-managed-by-mcm" - // TriggerDeletionByMCM annotation on the node or machine would trigger the deletion of the corresponding node and machine object in the control cluster - // This annotation can also be set on the MachineDeployment and contains the machine names for which deletion should be triggered. - // The latter feature is leveraged by the CA-MCM cloud provider. + // TriggerDeletionByMCM can be set on the MachineDeployment and contains the machine names for which deletion should be triggered. + // This feature is leveraged by the CA-MCM cloud provider. TriggerDeletionByMCM = "node.machine.sapcloud.io/trigger-deletion-by-mcm" // NodeUnhealthy is a node termination reason for failed machines