Fix flaky upstream-authority-vault and upstream-authority-ejbca integration tests#6836
Merged
amartinezfayo merged 1 commit intoApr 7, 2026
Conversation
…ration tests Signed-off-by: Agustín Martínez Fayó <amartinezfayo@gmail.com>
MarcosDY
approved these changes
Apr 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
upstream-authority-vaultandupstream-authority-ejbcaintegration test suites were intermittently failing witherror: no matching resources foundwhen runningkubectl wait pods -l app=spire-server --for=condition=Ready.After
kubectl apply, Kubernetes creates the Deployment object first, then the Deployment controller creates the ReplicaSet, which then creates the Pod. Ifkubectl waitruns before any pods with the label selector exist, it exits with an error immediately. Withset -eactive in the test scripts, this causes the step to fail.This PR replaces the four
kubectl wait pods ... --for=condition=Readycalls inupstream-authority-vault/02-deploy-spire-and-verify-authand the one inupstream-authority-ejbca/02-deploy-spirewithkubectl rollout status deployment/spire-server, which operates on the Deployment resource directly and correctly handles the window betweenkubectl applyand pod creation.Example of failure: https://github.com/spiffe/spire/actions/runs/24039273578/job/70107728628?pr=6833