Skip to content
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

pkg/config: do NOT set StaticDir and VolumeDir #1660

Merged
merged 2 commits into from
Sep 22, 2023

Conversation

vrothberg
Copy link
Member

Let callers (i.e., Podman) decide which defaults to chose. This way,
callers know when to override defaults (i.e., when the values are
empty).

Signed-off-by: Valentin Rothberg vrothberg@redhat.com

There's also another commit removing unused fields.

Opened as a draft, as this needs a vendor-PR in Podman.

They are not correctly and inconcistently being used by Podman making it
super hard to know what's going on.  Just remove them for now and deal
with the remaining chaos in subsequent changes in common and Podman.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Let callers (i.e., Podman) decide which defaults to chose.  This way,
callers know when to override defaults (i.e., when the values are
empty).

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrothberg

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

@vrothberg
Copy link
Member Author

Podman PR: containers/podman#20088

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.

LGTM, when the podman PR works

@rhatdan
Copy link
Member

rhatdan commented Sep 21, 2023

/lgtm

@vrothberg
Copy link
Member Author

/hold cancel

@vrothberg vrothberg marked this pull request as ready for review September 22, 2023 10:37
@vrothberg
Copy link
Member Author

vrothberg commented Sep 22, 2023

Can merge. The last remaining failure in containers/podman#20088 is fixed locally. So I can do a final push.

@openshift-merge-robot openshift-merge-robot merged commit 56ed984 into containers:main Sep 22, 2023
7 checks passed
@vrothberg vrothberg deleted the fix-podman-19938 branch September 22, 2023 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants