Skip to content

[ci:component:github.com/gardener/machine-controller-manager:v0.62.0->v0.62.1]#398

Merged
gardener-prow[bot] merged 1 commit into
masterfrom
ci-cdnmprpzn
Jul 1, 2026
Merged

[ci:component:github.com/gardener/machine-controller-manager:v0.62.0->v0.62.1]#398
gardener-prow[bot] merged 1 commit into
masterfrom
ci-cdnmprpzn

Conversation

@federated-github-access

Copy link
Copy Markdown
Contributor

Release Notes:

[github.com/gardener/machine-controller-manager:v0.62.1]

🐛 Bug Fixes

  • [OPERATOR] Fix preservation reconcile loop to avoid unconditionally uncordoning nodes unrelated to machine preservation, prevent spurious writes on non-preserved machines, and eliminate conflict errors caused by stale machine object comparison in the defer annotation sync. by @thiyyakat [#1111]

BoM Diff

Added components: 0
Changed components: 1
Removed components: 0

Changed Components:

⚙ github.com/gardener/machine-controller-manager: v0.62.0 → v0.62.1

Component Details:

⚙ github.com/gardener/machine-controller-manager:v0.62.0 → v0.62.1
Resource Version Change
➕ machine-controller-manager v0.62.1
➕ machine-controller-manager v0.62.1
➕ machine-controller-manager v0.62.1
➕ machine-controller-manager v0.62.1
➕ machine-controller-manager v0.62.1
➕ machine-controller-manager v0.62.1
➕ machine-controller-manager v0.62.1
➕ machine-controller-manager-cbom-refv0.62.1
➕ machine-controller-manager-cbom-refv0.62.1
➕ machine-controller-manager-sbom-refv0.62.1
➕ machine-controller-manager-sbom-refv0.62.1
➕ machine-controller-manager-sbom-refv0.62.1
➕ machine-controller-manager-sbom-refv0.62.1
➖ machine-controller-manager v0.62.0
➖ machine-controller-manager-ocm v0.62.0
➖ machine-controller-manager-ocm v0.62.0
➖ machine-controller-manager-spdx-refv0.62.0
➖ machine-controller-manager-spdx-refv0.62.0
🔄 gosec-report v0.62.0 → v0.62.1
🔄 test-results v0.62.0 → v0.62.1
🔄 release-notes v0.62.0 → v0.62.1
🔄 release-notes-archive v0.62.0 → v0.62.1
🔄 branch-info v0.62.0 → v0.62.1

@federated-github-access federated-github-access Bot requested review from a team as code owners July 1, 2026 09:31
@gardener-prow gardener-prow Bot added the do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. label Jul 1, 2026
@federated-github-access

Copy link
Copy Markdown
Contributor Author

The PR needs to be labeled with ok-to-test by a maintainer to trigger the automated validation of the change

@gardener-prow gardener-prow Bot added cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 1, 2026
@aaronfern

Copy link
Copy Markdown
Member

/lgtm
/approve

@gardener-prow gardener-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 1, 2026
@aaronfern aaronfern added kind/bug Bug and removed lgtm Indicates that a PR is ready to be merged. labels Jul 1, 2026
@gardener-prow

gardener-prow Bot commented Jul 1, 2026

Copy link
Copy Markdown

LGTM label has been added.

DetailsGit tree hash: b4ba9e83a604ea829eee126a4ff57fa78699b952

@gardener-prow gardener-prow Bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jul 1, 2026
@aaronfern aaronfern added the lgtm Indicates that a PR is ready to be merged. label Jul 1, 2026
@gardener-prow

gardener-prow Bot commented Jul 1, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aaronfern

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@gardener-prow gardener-prow Bot merged commit afa3919 into master Jul 1, 2026
32 checks passed
@aaronfern aaronfern added the skip-review Indicates a PR is trusted, used by tide for auto-merging PRs. label Jul 1, 2026
@aaronfern

Copy link
Copy Markdown
Member

/cherry-pick rel-v0.27

@gardener-ci-robot

Copy link
Copy Markdown

@aaronfern: #398 failed to apply on top of branch "rel-v0.27":

Applying: Upgrade github.com/gardener/machine-controller-manager
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Upgrade github.com/gardener/machine-controller-manager

Details

In response to this:

/cherry-pick rel-v0.27

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.

gardener-prow Bot pushed a commit that referenced this pull request Jul 1, 2026
from v0.62.0 to v0.62.1

Co-authored-by: federated-github-access[bot] <248678271+federated-github-access[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/bug Bug lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. skip-review Indicates a PR is trusted, used by tide for auto-merging PRs.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants