Skip to content

Add support for Ulimit in quadlet#19956

Merged
openshift-merge-robot merged 1 commit intocontainers:mainfrom
rhatdan:ulimit
Sep 14, 2023
Merged

Add support for Ulimit in quadlet#19956
openshift-merge-robot merged 1 commit intocontainers:mainfrom
rhatdan:ulimit

Conversation

@rhatdan
Copy link
Copy Markdown
Member

@rhatdan rhatdan commented Sep 12, 2023

QM needs to be able to specify the maximum number of open files within the QM environment to ensure FFI.

Does this PR introduce a user-facing change?

Podman quadlet now supports setting Ulimit values.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Sep 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

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 Sep 12, 2023
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

"Use" to "Using", or "will modify" to "to modify". I'd keep "Use"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please move the correct place in the alphabetical order

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please move the correct place in the alphabetical order

Comment on lines 454 to 466
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
ulimit, _ := container.Lookup(ContainerGroup, KeyUlimit)
if len(ulimit) > 0 {
podman.add("--ulimit", ulimit)
}
ulimit, ok := container.Lookup(ContainerGroup, KeyUlimit)
if ok && len(ulimit) > 0 {
podman.add("--ulimit", ulimit)
}

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 14, 2023
QM needs to be able to specify the maximum number of open files within the QM
environment to ensure FFI.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 14, 2023
Copy link
Copy Markdown
Member

@ashley-cui ashley-cui left a comment

Choose a reason for hiding this comment

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

LGTM

@rhatdan rhatdan added the lgtm Indicates that a PR is ready to be merged. label Sep 14, 2023
@rhatdan
Copy link
Copy Markdown
Member Author

rhatdan commented Sep 14, 2023

@martinpitt Any idea why all of the cockpit tests are blowing up?

@openshift-merge-robot openshift-merge-robot merged commit 61b9a38 into containers:main Sep 14, 2023
@martinpitt
Copy link
Copy Markdown
Contributor

@rhatdan Yes I do, see #19953 (comment) -- it's a testing farm issue, we've discussed that since Wednesday. I'll send a hack to cockpit-podman now to counteract TF's bad hack, that'll clear them up. Sorry about that, growing pains from new things..

@martinpitt
Copy link
Copy Markdown
Contributor

@rhatdan Sorry, I meant see this comment: #19962 (comment)

Anyway, testing a workaround now in cockpit-project/cockpit-podman#1410 , should land in about 4 hours.

@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 Dec 15, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 15, 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.

6 participants