Fix kuttl cleanup timeout#454
Merged
openshift-merge-bot[bot] merged 1 commit intoJun 16, 2026
Merged
Conversation
The 99-cleanup step was timing out (600s) because it checked for the absence of openstack-config ConfigMap and openstack-config-secret Secret. These are infrastructure resources managed by the CI environment, not by the test-operator. Other operators (e.g. keystone) in the namespace recreate them after deletion, causing the error check to never pass. Also fix Pod label selectors in errors-cleanup.yaml from job-name to instanceName, which is the label actually set by the test-operator. Signed-off-by: Vito Castellano <vcastell@redhat.com>
|
Skipping CI for Draft Pull Request. |
Valkyrie00
changed the title
Valkyrie00
changed the title
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: evallesp, posikoya, Valkyrie00 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 |
openshift-merge-bot
Bot
merged commit 2755df4
into
openstack-k8s-operators:main
7 checks passed
|
/lgtm |
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
4 participants
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.
Problem
The
tempest-basickuttl test fails withcontext deadline exceededduring the99-cleanupstep after waiting 600 seconds.The shared
errors-cleanup.yamlasserted the absence ofopenstack-configConfigMap andopenstack-config-secretSecret. These are infrastructure resources deployed byinstall_yamlsfor the CI environment. They are notcreated or managed by the test-operator. Other operators running in the
test-operator-kuttl-testsnamespace (keystone, galera, rabbitmq, memcached) keep these resources alive, so they persist after deletion and the error check never passes.Additionally, the Pod checks in
errors-cleanup.yamlusedjob-nameas the label selector, but the test-operator labels its pods withinstanceName(seeinternal/controller/common.go). The old selector never matched any test-operator pods, making the check a no-op.Fix Proposal
openstack-configConfigMap andopenstack-config-secretSecret from bothcleanup-all-tests.yaml(delete step) anderrors-cleanup.yamlThe cleanup now only targets test-operator CRs.job-nametoinstanceNameso the absence check actually matches pods created by the test-operator.Assisted-By: Cursor
Relevance: #417 #452