Trigger node deletion when machine is deleted by gagan16k · Pull Request #1102 · gardener/machine-controller-manager

gagan16k · 2026-05-18T12:33:47Z

What this PR does / why we need it:

Machine controller now explicitly deletes the finalizer and backing node from the target cluster on machine delete events
Extracted finalizer and node deletion as a node helper function to be used here, and in the regular termination flow
The machine status description during creation has been updated from "Creating machine on cloud provider" to "VM created on cloud provider. Waiting for node registration", so the status accurately reflects which stage the machine is in.

Which issue(s) this PR fixes:
Fixes #1044, #1064

Tests:
Passed unit tests

Manual tests performed by deleting node manually

(⎈|garden--aws-ha-external:garden shoot--i765230--demo)➜  machine-controller-manager git:(pr/gagan16k/1102) k get mc
NAME                                              STATUS    AGE     NODE
shoot--i765230--demo-worker-cpu-z1-7988d-hnw4w    Running   7h23m   ip-10-180-3-122.eu-west-1.compute.internal
shoot--i765230--demo-worker-etcd-z1-5dc7f-ttqd5   Running   7h23m   ip-10-180-137-245.eu-west-1.compute.internal

(⎈|garden-i765230--demo-external:default garden-i765230)➜  machine-controller-manager git:(pr/gagan16k/1102) k get no
NAME                                           STATUS   ROLES    AGE     VERSION
ip-10-180-137-245.eu-west-1.compute.internal   Ready    worker   7h22m   v1.34.9
ip-10-180-3-122.eu-west-1.compute.internal     Ready    worker   7h22m   v1.34.9



# Force-delete machine by removing finalizer
(⎈|garden--aws-ha-external:garden shoot--i765230--demo)➜  machine-controller-manager git:(pr/gagan16k/1102) k -n shoot--i765230--demo patch machine shoot--i765230--demo-worker-cpu-z1-7988d-hnw4w --type=merge -p '{"metadata":{"finalizers":null}}'
machine.machine.sapcloud.io/shoot--i765230--demo-worker-cpu-z1-7988d-hnw4w patched
(⎈|garden--aws-ha-external:garden shoot--i765230--demo)➜  machine-controller-manager git:(pr/gagan16k/1102) k -n shoot--i765230--demo delete machine shoot--i765230--demo-worker-cpu-z1-7988d-hnw4w
machine.machine.sapcloud.io "shoot--i765230--demo-worker-cpu-z1-7988d-hnw4w" deleted



# Machine and node deleted
(⎈|garden-i765230--demo-external:default garden-i765230)➜  machine-controller-manager git:(pr/gagan16k/1102) k get no
NAME                                           STATUS   ROLES    AGE     VERSION
ip-10-180-137-245.eu-west-1.compute.internal   Ready    worker   7h24m   v1.34.9

(⎈|garden--aws-ha-external:garden shoot--i765230--demo)➜  machine-controller-manager git:(pr/gagan16k/1102) k get mc
NAME                                              STATUS    AGE     NODE
shoot--i765230--demo-worker-cpu-z1-7988d-h299t              3s
shoot--i765230--demo-worker-etcd-z1-5dc7f-ttqd5   Running   7h25m   ip-10-180-137-245.eu-west-1.compute.internal

For #1064, machine during creation has message

Last Operation:
    Description:       VM created on cloud provider. Waiting for node registration
    Last Update Time:  2026-08-12T06:20:01Z
    State:             Processing
    Type:              Create

Release note:

MCM now deletes the backing node when its machine is force-deleted, and clears finalizers on nodes terminating without a backing machine. 
Machine creation status is also modified to distinguish cloud-provider failures from node-registration failures.

thiyyakat

Thanks for the changes. Just two comments. PTAL.

gardener-ci-robot · 2026-07-04T10:03:27Z

The Gardener project currently lacks enough active contributors to adequately respond to all PRs.
This bot triages PRs according to the following rules:

After 30d of inactivity, lifecycle/stale is applied
After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
After 14d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

Mark this PR as active with /lifecycle active
Mark this PR as fresh with /remove-lifecycle stale
Mark this PR as rotten with /lifecycle rotten
Close this PR with /close

/lifecycle stale

gardener-ci-robot · 2026-08-03T10:25:55Z

The Gardener project currently lacks enough active contributors to adequately respond to all PRs.
This bot triages PRs according to the following rules:

After 30d of inactivity, lifecycle/stale is applied
After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
After 14d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

Mark this PR as active with /lifecycle active
Mark this PR as fresh with /remove-lifecycle rotten
Close this PR with /close

/lifecycle rotten

thiyyakat

Just one small nit.

thiyyakat · 2026-08-12T06:05:28Z

Thanks for addressing the comments.
/lgtm

gardener-prow · 2026-08-12T06:05:34Z

LGTM label has been added.

Details

Git tree hash: 7c6a71242f80f6ef4851c138c0bece6fce8dbd6c

takoverflow · 2026-08-12T06:06:19Z

/assign

thiyyakat · 2026-08-12T06:48:29Z

/lgtm

takoverflow · 2026-08-17T19:38:58Z

/lgtm
/unassign

gardener-prow · 2026-08-17T19:39:04Z

LGTM label has been added.

Details

Git tree hash: 496d730a1f2ecd2b29ad344d0f5d0134fc5346a5

thiyyakat

Hi Gagan. I had one concern about the logs. If error can be handled differently in the callee and caller, maybe it can be improved.

gardener-prow · 2026-08-27T09:20:08Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign ashwani2k for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

…riptions Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

takoverflow

/lgtm

gardener-prow · 2026-08-28T09:44:37Z

LGTM label has been added.

Details

Git tree hash: ce3388f6ae7953dc547a6e02da2a2e7062d0e7ce

thiyyakat · 2026-09-01T10:26:44Z

Thanks for the multiple rounds of changes!

/lgtm

r4mek · 2026-09-03T06:14:55Z

+		return
+	}
+
+	if _, err := c.nodeLister.Get(nodeName); apierrors.IsNotFound(err) {


do we need this check? as in the retry function we are checking for it.

It can serve as a short exit path, so that we do not even spawn a goroutine in case the node is not present.

gagan16k requested a review from a team as a code owner May 18, 2026 12:33

aaronfern added the kind/bug Bug label May 22, 2026

gardener-prow Bot removed the do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. label May 22, 2026

thiyyakat reviewed Jun 3, 2026

View reviewed changes

Comment thread pkg/util/provider/machinecontroller/machine.go Outdated

Comment thread pkg/util/provider/machinecontroller/node.go Outdated

r4mek reviewed Jun 4, 2026

View reviewed changes

Comment thread pkg/util/provider/machinecontroller/machine_test.go Outdated

gardener-prow Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jul 4, 2026

gardener-prow Bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Aug 3, 2026

aaronfern removed the lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. label Aug 3, 2026

gardener-prow Bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 7, 2026

gagan16k force-pushed the fix/machine-delete branch from 3a45864 to 9864805 Compare August 7, 2026 08:00

thiyyakat reviewed Aug 12, 2026

View reviewed changes

Comment thread pkg/util/provider/machinecontroller/node.go Outdated

gardener-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 12, 2026

gardener-prow Bot assigned takoverflow Aug 12, 2026

gardener-prow Bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 12, 2026

gardener-prow Bot requested a review from takoverflow August 12, 2026 06:44

gardener-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 12, 2026

gardener-prow Bot unassigned takoverflow Aug 17, 2026

gardener-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 17, 2026

r4mek reviewed Aug 19, 2026

View reviewed changes

Comment thread pkg/util/provider/machinecontroller/machine.go Outdated

thiyyakat reviewed Aug 19, 2026

View reviewed changes

Comment thread pkg/util/provider/machinecontroller/machine.go Outdated

r4mek reviewed Aug 19, 2026

View reviewed changes

Comment thread pkg/util/provider/machinecontroller/machine.go Outdated

r4mek reviewed Aug 19, 2026

View reviewed changes

Comment thread pkg/util/provider/machinecontroller/machine.go Outdated

gardener-prow Bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 27, 2026

gagan16k added 12 commits August 27, 2026 18:08

Trigger node deletion when machine is deleted and update machine desc…

ae28492

…riptions Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Address review comments

7340515

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Fix test

adf194e

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Remove redundant else

d9cd068

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Change log message

9e7b31f

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Improve error handling and logging for node deletion

2addf62

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Refactor finalizer handling

b21cf78

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Address comments - pt1

6807e57

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Address comments - pt2

23269d5

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Refactor node deletion logic

46820ab

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Cleanup

2795dc4

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

Address review comments

cfe75f3

Signed-off-by: Gagan163264 <gagan.surathkal@gmail.com>

gagan16k force-pushed the fix/machine-delete branch from 0d4ef7e to cfe75f3 Compare August 27, 2026 12:40

takoverflow reviewed Aug 28, 2026

View reviewed changes

gardener-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 28, 2026

r4mek reviewed Sep 3, 2026

View reviewed changes

Uh oh!

Conversation

gagan16k commented May 18, 2026 • edited by takoverflow Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thiyyakat left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gardener-ci-robot commented Jul 4, 2026

Uh oh!

gardener-ci-robot commented Aug 3, 2026

Uh oh!

thiyyakat left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

thiyyakat commented Aug 12, 2026

Uh oh!

gardener-prow Bot commented Aug 12, 2026

Uh oh!

takoverflow commented Aug 12, 2026

Uh oh!

thiyyakat commented Aug 12, 2026

Uh oh!

takoverflow commented Aug 17, 2026

Uh oh!

gardener-prow Bot commented Aug 17, 2026

Uh oh!

Uh oh!

thiyyakat left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gardener-prow Bot commented Aug 27, 2026

Uh oh!

takoverflow left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow Bot commented Aug 28, 2026

Uh oh!

thiyyakat commented Sep 1, 2026

Uh oh!

r4mek Sep 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gagan16k Sep 3, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

gagan16k commented May 18, 2026 •

edited by takoverflow

Loading

r4mek Sep 3, 2026 •

edited

Loading