fix(e2e): Clear stale bootstrap IP annotation in bare metal API upgrade flow#10651
Conversation
…de flow The CLI-generated config file is written before the bootstrap-to-management cluster pivot, so it retains the tinkerbell-bootstrap-ip annotation. When the test re-applies this config via kubectl apply, the annotation gets re-added to the Cluster CR, causing the controller to regenerate machine templates with the bootstrap IP instead of the tinkerbellIP. This creates a template diff that triggers unintended rollouts, blocking reconciliation.
eks-distro-bot
added
the
size/XS
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rahulbabu95 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #10651 +/- ##
=======================================
Coverage 69.59% 69.60%
=======================================
Files 670 670
Lines 40923 40923
=======================================
+ Hits 28481 28483 +2
+ Misses 10708 10707 -1
+ Partials 1734 1733 -1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
/cherry-pick release-0.25 |
|
@snarkychef: once the present PR merges, I will cherry-pick it on top of release-0.25 in a new PR and assign it to you. DetailsIn response to this:
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/test-infra repository. |
|
/lgtm |
|
@snarkychef: new pull request created: #10652 DetailsIn response to this:
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/test-infra repository. |
|
/cherrypick release-0.24 |
|
@rahulbabu95: new pull request created: #10668 DetailsIn response to this:
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/test-infra repository. |
- Clear stale bootstrap IP annotation in bare metal API upgrade flow to prevent controller from regenerating machine templates with the bootstrap IP instead of tinkerbellIP (aws#10651) - Increase hardware count for AddWorkerNodeGroup API tests from 2 to 3 to account for CP + existing worker + new worker group (aws#10669) - Add missing licenseToken to K8s 1.31 CP upgrade tests (131To132UpgradeCPOnly, 130To131UpgradeWorkerOnly) which were failing validation for extended kubernetes support Signed-off-by: Rahul Ganesh <rahulbabu95@gmail.com>
- Clear stale bootstrap IP annotation in bare metal API upgrade flow to prevent controller from regenerating machine templates with the bootstrap IP instead of tinkerbellIP (#10651) - Increase hardware count for AddWorkerNodeGroup API tests from 2 to 3 to account for CP + existing worker + new worker group (#10669) - Add missing licenseToken to K8s 1.31 CP upgrade tests (131To132UpgradeCPOnly, 130To131UpgradeWorkerOnly) which were failing validation for extended kubernetes support Signed-off-by: Rahul Ganesh <rahulbabu95@gmail.com>
4 participants
Issue #, if available:
Description of changes:
The CLI-generated config file is written before the bootstrap-to-management cluster pivot, so it retains the tinkerbell-bootstrap-ip annotation. When the test re-applies this config via kubectl apply, the annotation gets re-added to the Cluster CR, causing the controller to regenerate machine templates with the bootstrap IP instead of the tinkerbellIP. This creates a template diff that triggers unintended rollouts which blocks the reconciliation.
Testing (if applicable):
Locally tested the fix.
Documentation added/planned (if applicable):
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.