Skip to content

Conversation

@MateSaary
Copy link
Member

This PR fixes specific operators such as managed-cluster-config failing to be hotfix-promoted due to nested directory structures (e.g., data/services/osd-operators/{component}/app.yml) not being handled by the previous flat path assumption.

The fix derives app.yml paths by parsing the saas file's directory structure to detect nested vs flat layouts. As a defensive guardrail, fallback logic performs filesystem searching in expected paths if the derived path doesn't exist. The functions have been extracted to a new pathutil package to avoid code duplication.

/label tide/merge-method-squash

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 3, 2025
@openshift-ci openshift-ci bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Dec 3, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 3, 2025

@MateSaary: This pull request references SREP-2594 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.21.0" version, but no target version was set.

Details

In response to this:

This PR fixes specific operators such as managed-cluster-config failing to be hotfix-promoted due to nested directory structures (e.g., data/services/osd-operators/{component}/app.yml) not being handled by the previous flat path assumption.

The fix derives app.yml paths by parsing the saas file's directory structure to detect nested vs flat layouts. As a defensive guardrail, fallback logic performs filesystem searching in expected paths if the derived path doesn't exist. The functions have been extracted to a new pathutil package to avoid code duplication.

/label tide/merge-method-squash

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MateSaary

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 3, 2025
Add test coverage for path resolution logic across different directory
structures (services, osd-operators, backplane) to ensure app.yml files
are correctly located for hotfix promotions.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 4, 2025

@MateSaary: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants