Skip to content

Conversation

@anmazzotti
Copy link
Contributor

@anmazzotti anmazzotti commented Feb 6, 2026

What this PR does / why we need it:

Fixes #2059

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

  • squashed commits into logical changes
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

@anmazzotti anmazzotti self-assigned this Feb 6, 2026
@kkaempf kkaempf added this to the v2.14.0 milestone Feb 6, 2026
Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
@anmazzotti anmazzotti force-pushed the fix_import_reconcile_deletion branch from 47d8cdf to d8aad7d Compare February 6, 2026 11:10
@anmazzotti anmazzotti added kind/bug Something isn't working area/import labels Feb 6, 2026
@anmazzotti anmazzotti moved this to In Progress (8 max) in CAPI / Turtles Feb 6, 2026
@anmazzotti anmazzotti marked this pull request as ready for review February 6, 2026 12:42
@anmazzotti anmazzotti requested a review from a team as a code owner February 6, 2026 12:42
@anmazzotti anmazzotti moved this from In Progress (8 max) to PR to be reviewed in CAPI / Turtles Feb 6, 2026
@anmazzotti anmazzotti enabled auto-merge February 6, 2026 13:44
@anmazzotti anmazzotti merged commit bd0146a into rancher:main Feb 9, 2026
12 of 26 checks passed
@github-project-automation github-project-automation bot moved this from PR to be reviewed to Done in CAPI / Turtles Feb 9, 2026
@anmazzotti
Copy link
Contributor Author

/backport v2.14.0 release/v0.26

@anmazzotti
Copy link
Contributor Author

/backport v2.13.3 release/v0.25

@rancher-backport-assistant
Copy link

Not creating backport PR, there was an error running git am -3:

Applying: fix: improve import controller deletion reconcile
Using index info to reconstruct a base tree...
M	internal/controllers/import_controller.go
Falling back to patching base and 3-way merge...
Auto-merging internal/controllers/import_controller.go
CONFLICT (content): Merge conflict in internal/controllers/import_controller.go
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 fix: improve import controller deletion reconcile

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/import kind/bug Something isn't working

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

e2e: failed import on Azure RKE2 Cluster

4 participants