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

generate systemd: handle --restart #11459

Merged
merged 1 commit into from
Sep 7, 2021

Conversation

vrothberg
Copy link
Member

Handle custom restart policies of containers when generating the unit
files; those should be set on the unit level and removed from ExecStart
flags.

Fixes: #11438
Signed-off-by: Valentin Rothberg [email protected]

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 6, 2021

[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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 6, 2021
@vrothberg
Copy link
Member Author

@Luap99 PTAL

pkg/systemd/generate/containers.go Show resolved Hide resolved
pkg/api/handlers/libpod/generate.go Outdated Show resolved Hide resolved
test/system/250-systemd.bats Show resolved Hide resolved
@vrothberg
Copy link
Member Author

Added a bunch of new tests on top.

@mheon
Copy link
Member

mheon commented Sep 6, 2021

LGTM

if err := validateRestartPolicy(info.RestartPolicy); err != nil {
return "", err
if options.RestartPolicy != nil {
if err := validateRestartPolicy(*options.RestartPolicy); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

we could warn and reset to the default restart policy here, not sure if this makes sense

Copy link
Member Author

Choose a reason for hiding this comment

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

I think we should return an error if the user specified something wrong. Imagine it being used in a script or some kind of automation. Logs are usually only consulted when something went wrong, so we'd be hiding that.

Copy link
Member

Choose a reason for hiding this comment

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

Yes returning an error is better, especially since warnings are not displayed on the remote client.

pkg/systemd/generate/containers.go Show resolved Hide resolved
pkg/systemd/generate/pods.go Show resolved Hide resolved
test/system/250-systemd.bats Outdated Show resolved Hide resolved
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

Handle custom restart policies of containers when generating the unit
files; those should be set on the unit level and removed from ExecStart
flags.

Fixes: containers#11438
Signed-off-by: Valentin Rothberg <[email protected]>
@vrothberg
Copy link
Member Author

ready to merge

@Luap99
Copy link
Member

Luap99 commented Sep 7, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2021
@openshift-merge-robot openshift-merge-robot merged commit 8a55363 into containers:main Sep 7, 2021
@vrothberg vrothberg deleted the fix-11438 branch September 7, 2021 13:52
@vrothberg vrothberg added the 3.4 label Sep 7, 2021
@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 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

error in podman generate systemd
5 participants