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

fix an override logic in Inherit function #16668

Merged
merged 3 commits into from
Dec 6, 2022

Conversation

karta0807913
Copy link
Contributor

Signed-off-by: karta0807913 [email protected]

Refer to issue #16632

Does this PR introduce a user-facing change?

No

The variable `s` was unmarshaled from `compatibleOptions`, but `libpod.InfraInherit` doesn't have the `ipcns` field.
Therefore, s.IpcNS.NSMode is always empty.

@giuseppe
Copy link
Member

LGTM, could you add a test?

@rhatdan
Copy link
Member

rhatdan commented Nov 29, 2022

@karta0807913 Either add a test or [NO NEW TESTS NEEDED] to the message above and then force push so we can merge.
LGTM
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 29, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: karta0807913, rhatdan

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 Nov 29, 2022
@karta0807913
Copy link
Contributor Author

Sure, give me some time to figure out how to add a test :D

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 30, 2022
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 30, 2022
Fix an overriding logic in Inhearit function.
Alos, ToSpecGen function doesn't load the cgroup/image volume config from containers.conf.

Signed-off-by: karta0807913 <[email protected]>
Signed-off-by: karta0807913 <[email protected]>
}
if s.ImageVolumeMode == "bind" {
s.ImageVolumeMode = "anonymous"
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@giuseppe could you check the logic here?
I copy them from the fill spec function.

Signed-off-by: karta0807913 <[email protected]>
@karta0807913
Copy link
Contributor Author

HI @rhatdan, I fix all tests.
Could you check my code again?
Thank you!

@rhatdan
Copy link
Member

rhatdan commented Dec 6, 2022

/lgtm
Thanks @karta0807913

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 6, 2022
@openshift-merge-robot openshift-merge-robot merged commit 2e9eb17 into containers:main Dec 6, 2022
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 18, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 18, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants