Add integration tests for inplace machine upgrade by aaronfern · Pull Request #1144 · gardener/machine-controller-manager

aaronfern · 2026-08-31T11:41:11Z

What this PR does / why we need it:
This PR adds integration tests for machine inplace upgrade

The following scenarios have been added

Happy path - move machine to new mcs after successful upgrade
Machine transition to InPlaceUpdateFailed phase when node update fails and update-result=failed annotation is set
Machine transitions to InPlaceUpdateFailed when update result is not set within timeout
Manual inPlace upgrade

Which issue(s) this PR fixes:
Fixes partially #1123

Special notes for your reviewer:

Release note:

Added integration tests for inPlace machine upgrade

gardener-prow · 2026-08-31T11:41:16Z

[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 kon-angelo 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

takoverflow · 2026-09-11T07:03:05Z

+	return mcd
+}
+
+// NewMachineDeploymentWithName returns a MachineDeployment with a custom name and a unique label derived from that name,


The canonical MCM way of identifying MCD for a machine with the name label can be used here rather than creating a different key.

takoverflow · 2026-09-11T07:04:09Z

+)
+
+var (
+	testLabels = map[string]string{"test-label": "test-label"}


What is the use-case of adding this?

Use case would be to be able to list machines created be tests easily without having to filter out machines that were already present or created by some other cluster operation

takoverflow · 2026-09-11T07:06:37Z

+}
+
+// InPlaceMcdLabels returns the unique label map used for a given inplace test MCD name
+func InPlaceMcdLabels(mcdName string) map[string]string {


If the only purpose of this is to identify machines belonging to a specific MCD, consider using the name label key.

Signed-off-by: aaronfern <aaron.francis.fernandes@sap.com>

takoverflow

Thanks for the tests!

Just a general question, is there a reason why a lot of Get calls' errors are being ignored?

I've only explicitly added comments for a few but was wondering since it happened across tests.

takoverflow · 2026-09-23T07:08:18Z

+				originalOwnerRefMcsName := ""
+				for _, b := range runningMachines[0].ObjectMeta.OwnerReferences {
+					if b.Kind == "MachineSet" {
+						originalOwnerRefMcsName = b.Name


We can break out of the loop once we've found the MCS ownerRef.

takoverflow · 2026-09-23T07:08:37Z

+
+				ginkgo.By("Trigger inPlace rollout by updating MachineClass")
+				retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+					md, _ := c.ControlCluster.McmClient.MachineV1alpha1().MachineDeployments(controlClusterNamespace).Get(ctx, helpers.InPlaceMcdNameHappyPath, metav1.GetOptions{})


Shouldn't this Get error be checked for?

takoverflow · 2026-09-23T07:13:34Z

+
+				ginkgo.By("Add node.machine.sapcloud.io/update-result:successful label to node")
+				retryErr = retry.RetryOnConflict(retry.DefaultRetry, func() error {
+					node, _ := c.TargetCluster.Clientset.CoreV1().Nodes().Get(ctx, runningMachines[0].ObjectMeta.Labels[v1alpha1.NodeLabelKey], metav1.GetOptions{})


Get call's error is not being handled

takoverflow · 2026-09-23T07:16:26Z

+					c.pollingInterval).Should(gomega.BeTrue())
+
+				ginkgo.By("Verify that old mcs has been scaled to zero")
+				// Old mcs is not removed because mcd.Spec.RevisionHistoryLimit is set to it's default value nil.


Suggested change

// Old mcs is not removed because mcd.Spec.RevisionHistoryLimit is set to it's default value nil.

// Old mcs is not removed because mcd.Spec.RevisionHistoryLimit is set to its default value nil.

takoverflow · 2026-09-23T07:24:19Z


-	// Testcase #04 | Orphaned Resources
+	// Testcase #04 | InPlace Updates
+	ginkgo.Describe("InPlace machine update", ginkgo.Ordered, func() {


Can these tests not be run in parallel? Asking since they're using independent machines belonging to different MCDs.

gardener-prow · 2026-09-23T13:38:34Z

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

aaronfern requested a review from a team as a code owner August 31, 2026 11:41

gardener-prow Bot added do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 31, 2026

aaronfern mentioned this pull request Sep 2, 2026

Introduce additional integration tests #1123

Open

6 tasks

gardener-prow Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 4, 2026

takoverflow reviewed Sep 11, 2026

View reviewed changes

thiyyakat mentioned this pull request Sep 16, 2026

Fix bug which leaves stale machine class name on inplace updated machine #1153

Merged

Add integration tests for inplace machine upgrade

b22e6da

Signed-off-by: aaronfern <aaron.francis.fernandes@sap.com>

aaronfern force-pushed the inplace_it branch from c122a47 to b22e6da Compare September 16, 2026 09:12

gardener-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 16, 2026

takoverflow reviewed Sep 23, 2026

View reviewed changes

gardener-prow Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 23, 2026

Navigation Menu

Add integration tests for inplace machine upgrade - #1144

Add integration tests for inplace machine upgrade#1144
aaronfern wants to merge 1 commit into
gardener:masterfrom
aaronfern:inplace_it

aaronfern commented Aug 31, 2026

Uh oh!

gardener-prow Bot commented Aug 31, 2026

Uh oh!

takoverflow Sep 11, 2026

Uh oh!

takoverflow Sep 11, 2026

Uh oh!

aaronfern Sep 16, 2026

Uh oh!

takoverflow Sep 11, 2026

Uh oh!

Uh oh!

takoverflow left a comment •

edited

Loading

Uh oh!

takoverflow Sep 23, 2026

Uh oh!

takoverflow Sep 23, 2026

Uh oh!

takoverflow Sep 23, 2026

Uh oh!

takoverflow Sep 23, 2026

Uh oh!

takoverflow Sep 23, 2026

Uh oh!

gardener-prow Bot commented Sep 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	// Old mcs is not removed because mcd.Spec.RevisionHistoryLimit is set to it's default value nil.
	// Old mcs is not removed because mcd.Spec.RevisionHistoryLimit is set to its default value nil.

Conversation

aaronfern commented Aug 31, 2026

Uh oh!

gardener-prow Bot commented Aug 31, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

takoverflow left a comment • 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gardener-prow Bot commented Sep 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

takoverflow left a comment •

edited

Loading