Backport must gather image 1.5 - #240
Conversation
…ages Previously, oc oadp must-gather used a hardcoded image tag (registry.redhat.io/oadp/oadp-mustgather-rhel9:v1.5) regardless of the OADP operator version installed in the cluster. This caused version mismatches between the operator and the diagnostics image. https://github.com/migtools/oadp-cli/blob/oadp-dev/cmd/must-gather/must_gather.go#L57 The image is now resolved at runtime by querying the OADP operator ClusterServiceVersion across all namespaces and extracting the pinned must-gather image reference from spec.relatedImages. This provides an exact SHA256-digested image reference that is guaranteed to match the installed operator release. The CSV is matched by DisplayName ("OADP Operator") for compatibility with both Red Hat and community operator distributions. CSV lookup is bounded by a 30-second timeout. If detection fails, the command errors with a hint to use --image for explicit override. Signed-off-by: Prasad Joshi <prajoshi@redhat.com>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: NicholasYancey The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
2 participants
Why the changes were made
Backports #237 to oadp-1.5. oadp-cli must-gather was resolving the must-gather image from a hardcoded/default value instead of the one actually pinned in the installed OADP operator's CSV relatedImages, so it could pull the wrong image version. This finds the OADP operator's CSV (matching by display name, only in Succeeded phase) and uses its pinned must-gather image instead.