First steps of quadlet integration #1965
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tomasmatus
previously approved these changes
Jan 15, 2025
jelly
force-pushed
the
quadlet-integration
branch
from
9459c7c to
cac26a0
Compare
|
We need the tests to check for |
jelly
force-pushed
the
quadlet-integration
branch
from
cac26a0 to
9dcc576
Compare
garrett
previously approved these changes
Jan 16, 2025
jelly
force-pushed
the
quadlet-integration
branch
from
9dcc576 to
860291a
Compare
|
RHEL-8-10 seems broken |
jelly
force-pushed
the
quadlet-integration
branch
2 times, most recently
from
eaa3eac to
e57d1c9
Compare
martinpitt
previously approved these changes
Jan 17, 2025
test/check-application
Outdated
| @@ -2994,6 +3020,13 @@ class TestApplication(testlib.MachineCase): | |||
| b.wait_visible(container_1_sel + " .ct-badge-toolbox:contains('toolbox')") | |||
| b.wait_visible(container_2_sel + " .ct-badge-distrobox:contains('distrobox')") | |||
|
|
|||
| if podman_version(self) >= (4, 4, 0): | |||
There was a problem hiding this comment.
I'm not a big fan of this. If this goes wrong in any way, we'll silently skip the test everywhere. There should only be a few OSes which don't have that, and that list will shrink to zero in a controllable way. I.e. I'd prefer a if m.image not in [...] list.
src/Containers.jsx
Outdated
| @@ -211,14 +211,15 @@ const ContainerActions = ({ container, healthcheck, onAddNotification, localImag | |||
| } | |||
| } | |||
|
|
|||
| const canRename = !isSystemdService && version.localeCompare("3", undefined, { numeric: true, sensitivity: 'base' }) >= 0; | |||
There was a problem hiding this comment.
Ugh -- this is old code, but it feels like we can drop this now? Our oldest OS Ubuntu 22.04 has podman 3.4
test/check-application
Outdated
| @@ -2986,6 +2986,16 @@ WantedBy=multi-user.target default.target | |||
| self.execute(auth, f"podman inspect --format '{{{{.Id}}}}' {container_name_new}").strip() | |||
| self.waitContainerRow(container_name_new) | |||
|
|
|||
| # service containers cannot be renamed | |||
| if podman_version(self) >= (4, 4, 0): | |||
There was a problem hiding this comment.
Same "meh dynamic check" issue like above.
jelly
force-pushed
the
quadlet-integration
branch
from
e57d1c9 to
f6e25ee
Compare
martinpitt
requested changes
Jan 17, 2025
test/check-application
Outdated
| @@ -155,6 +155,7 @@ class TestApplication(testlib.MachineCase): | |||
| self.has_criu = "debian" not in m.image and "ubuntu" not in m.image | |||
| self.has_selinux = not any(img in m.image for img in ["arch", "debian", "ubuntu", "suse"]) | |||
| self.has_cgroupsV2 = not m.image.startswith('rhel-8') | |||
| self.supports_quadlet = not any(img in m.image for img in ["ubuntu-2204"]) | |||
There was a problem hiding this comment.
Ah sorry, debian stable has 4.3, so that needs to be excluded, too. But TBH I have troubles parsing this "three levels nested" loop. I think what it does is to compare each letter in "ubuntu-2204" against m.image, which really isn't what you want 😁
Could you just do
supports_quadlet = img not in ["debian-stable", "ubuntu-2204"]
please?
Quadlets and containers created by `podman generate systemd` are managed by systemd and treated more or less read-only in our UI. The first step is to show them different like we do with toolbox / distrobox containers.
Our lowest supported podman version is 3.4 on Ubuntu 22.04.
This is a footgun for users, the quadlet configuration determines the container name so allowing a user to rename a container would lead to an unknown state where the systemd service would name things different then the running container.
Running a healthcheck is automated in containers so this action does not need to be prominently advertised in our UI. The health detail tab still has a button to perform a healtcheck if the user is willing to do so manually.
jelly
force-pushed
the
quadlet-integration
branch
from
f6e25ee to
71165c3
Compare
|
This is a 3x affected flake and unrelated, so 👍 Thanks! |
martinpitt
approved these changes
Jan 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Small steps into better supporting quadlets in cockpit-podman.
The visual changes are a new
servicelabel to identify quadlet/podman generate systemd managed containersOther changes are:
.containerfile determines the name of the container allow users to change it will cause issues.