fix: improve must-gather resilience for SOS and container log collection#142
Merged
openshift-merge-bot[bot] merged 3 commits intoJun 29, 2026
Conversation
Fix tar --one-top-level usage in gather_sos to use -C with a relative directory name, matching the fix already applied in gather_edpm_sos (a6cb8e1). The --one-top-level option expects a relative path, not an absolute one, which caused "must use a relative file name" errors. Make SOS report decompression non-fatal: if tar fails, preserve the compressed archive instead of deleting it and leaving nothing. Filter out containers in waiting state from log collection in gather_ctlplane_resources. Containers that have never started have no logs, and oc logs errors on them (e.g. "container frr is not valid for pod speaker-*" in MetalLB with FRR-K8s mode). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
tox 4.56.1 changed the default behavior for missing Python interpreters from skip to fail, breaking CI when py36/py39 are not available on the runner. Explicitly set skip_missing_interpreters to restore the previous behavior. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The gather_sos script creates /var/tmp/sos-osp on the host (via chroot /host), but then passes --tmp-dir=/var/tmp/sos-osp to sos report which runs inside the toolbox container. The support-tools RUN label mounts the host filesystem at /host, not /, so the directory is only accessible at /host/var/tmp/sos-osp inside the container. This has been broken since gather_sos was introduced — SOS reports have never succeeded in CI because of this path mismatch. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fmount 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 8679a70
into
openstack-k8s-operators:main
4 checks passed
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
2 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.
Fix tar --one-top-level usage in gather_sos to use -C with a relative directory name, matching the fix already applied in gather_edpm_sos (a6cb8e1). The --one-top-level option expects a relative path, not an absolute one, which caused "must use a relative file name" errors.
Make SOS report decompression non-fatal: if tar fails, preserve the compressed archive instead of deleting it and leaving nothing.
Filter out containers in waiting state from log collection in gather_ctlplane_resources. Containers that have never started have no logs, and oc logs errors on them (e.g. "container frr is not valid for pod speaker-*" in MetalLB with FRR-K8s mode).