Skip to content

[release-0.24] fix(e2e): Clear stale bootstrap IP annotation in bare metal API upgrade flow #10668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eks-distro-pr-bot wants to merge 1 commit into
base: release-0.24
Choose a base branch
from
Open

[release-0.24] fix(e2e): Clear stale bootstrap IP annotation in bare metal API upgrade flow #10668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions test/e2e/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ func runUpgradeFlowForBareMetalWithAPI(test *framework.ClusterE2ETest, fillers .
test.GenerateHardwareConfig()
test.CreateCluster(framework.WithControlPlaneWaitTimeout("20m"))
test.LoadClusterConfigGeneratedByCLI()
// The CLI-generated config file is written before the bootstrap cluster pivot,
// so it still contains the tinkerbell-bootstrap-ip annotation. This annotation
// causes the controller to use the bootstrap IP when regenerating machine templates,
// creating a diff with the existing templates (which were updated during pivot to
// use the tinkerbellIP). Clear it so the kubectl apply doesn't re-add it.
test.ClusterConfig.Cluster.ClearTinkerbellIPAnnotation()
test.UpdateClusterConfig(fillers...)
test.ApplyClusterManifest()
test.ValidateClusterState()
Expand Down
Loading