Skip to content

Quadlet - fix dropin overwrites if different parent dirs #26557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 22, 2025

Conversation

eulores
Copy link
Contributor

@eulores eulores commented Jul 2, 2025

fixes #26555

Does this PR introduce a user-facing change?

Fixed the quadlet drop in file behavior to correctly overwrite a previous drop in file when it is further down the hierarchy but did not share the same parent directories. #26555

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I think a test case would be good so we don't regress in the future.
I don't see any existing tests that could extended for this @ygalblum do you have a idea what would be the best way to check this?I guess some new unit tests for loadUnitDropins() is needed?

@ygalblum
Copy link
Contributor

ygalblum commented Jul 2, 2025

Maybe add it as part of the system test:

@test "quadlet - drop-in files" {

@Luap99
Copy link
Member

Luap99 commented Jul 22, 2025

I pushed added a test here so we can move ahead with this and get this fix merged

Test to ensure subdir overwrites work correctly, see containers#26555.

Signed-off-by: Paul Holzinger <[email protected]>
Copy link
Contributor

@ygalblum ygalblum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

openshift-ci bot commented Jul 22, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eulores, ygalblum

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

The pull request process is described here

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 Jul 22, 2025
@Luap99
Copy link
Member

Luap99 commented Jul 22, 2025

@mheon PTAL
(I don't want to self merge as it contains my own commit)

@mheon
Copy link
Member

mheon commented Jul 22, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 62dd921 into containers:main Jul 22, 2025
76 of 77 checks passed
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. lgtm Indicates that a PR is ready to be merged. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Quadlets: Wrong .conf drop-in overwrites, if located in different subdirectories
4 participants