Skip to content

fix(ci): destroy EKS test cluster with -lock=false to survive orphaned state lock - #2288

Draft
bhavya76 wants to merge 2 commits into
mainfrom
bhavya76/eks-teardown-lock-fix
Draft

bhavya76 wants to merge 2 commits into
mainfrom
bhavya76/eks-teardown-lock-fix

Conversation

@bhavya76

@bhavya76 bhavya76 commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

Description of the issue

When an EKS integration test's terraform apply is killed mid-run (for example when the job's time cap SIGKILLs it while the validator is holding), it can leave an orphaned lock on the local terraform state. The teardown terraform destroy then fails to acquire the lock, so the cluster is never destroyed and leaks.

Description of changes

Add -lock=false to the EKS teardown terraform destroy, so teardown can delete the cluster even when a prior apply left an orphaned local-state lock. Teardown is the final operation on that state, so skipping the lock here is safe. terraform apply is unchanged and still locks state normally.

License

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Tests

One-line change to the teardown step only; verified by inspection of the emitted terraform destroy command. The EKS integration job runs this destroy on teardown and exercises the change.

Requirements

Before commiting your code, please do the following steps.

  1. Run make fmt and make fmt-sh
  2. Run make lint

Integration Tests

To run integration tests against this PR, add the ready for testing label.

@bhavya76
bhavya76 force-pushed the bhavya76/eks-teardown-lock-fix branch from 8b7dda6 to a6a22b4 Compare September 17, 2026 10:12
@bhavya76 bhavya76 changed the title eks teardown: destroy with -lock=false to survive orphaned local state lock ci: integration-test reliability — EKS teardown lock + empty EC2 matrix Sep 17, 2026
@bhavya76 bhavya76 added the ready for testing Indicates this PR is ready for integration tests to run label Sep 17, 2026
@bhavya76
bhavya76 force-pushed the bhavya76/eks-teardown-lock-fix branch from a57f1b6 to a6a22b4 Compare September 17, 2026 14:18
@bhavya76 bhavya76 changed the title ci: integration-test reliability — EKS teardown lock + empty EC2 matrix fix(ci): destroy EKS test cluster with -lock=false to survive orphaned state lock Sep 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready for testing Indicates this PR is ready for integration tests to run

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant