Commit Graph

3811 Commits

Author SHA1 Message Date
Brent Baude 39e5b339ec Revert "Export portions of Copier"
This reverts commit 76e87a92ce.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2024-09-23 09:58:53 -05:00
openshift-merge-bot[bot] 11ecc334a4 Merge pull request #2171 from containers/renovate/github.com-docker-docker-27.x
fix(deps): update module github.com/docker/docker to v27.3.1+incompatible
2024-09-23 12:18:51 +00:00
renovate[bot] 72bfe29af2 fix(deps): update module github.com/docker/docker to v27.3.1+incompatible
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-20 19:17:41 +00:00
openshift-merge-bot[bot] 5a3011c61a Merge pull request #2169 from lsm5/rpm-config-customization-trim
RPM: use default seccomp.json profiles
2024-09-20 12:53:26 +00:00
openshift-merge-bot[bot] 5217cfc4e2 Merge pull request #2091 from nalind/manifest-convert
libimage.Image: add ConvertToManifestList()
2024-09-20 12:50:42 +00:00
openshift-merge-bot[bot] 677297be51 Merge pull request #2164 from baude/exportCopierNew
Export portions of Copier
2024-09-20 12:47:56 +00:00
openshift-merge-bot[bot] b3b4aebe60 Merge pull request #2168 from Luap99/netns-dir
pkg/netns: some netns improvements
2024-09-20 12:45:13 +00:00
Lokesh Mandvekar d1b3f01146 RPM: use default seccomp.json profiles
keyctl is in ALLOW by default and `socket` should not always be ALLOW,
per @giuseppe.

This change removes seccomp.json customizations and we'll use the
distro's default seccomp profile.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2024-09-20 16:16:06 +05:30
Paul Holzinger 69f23ed410 pkg/netns: remove NewNSWithName()
This API is not used anywhere, as such remove it and make the loop in
NewNS() better as the netns dir parts should not be part of the loop.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-09-20 12:00:46 +02:00
openshift-merge-bot[bot] a0bd4424f0 Merge pull request #2166 from containers/renovate/github.com-docker-docker-27.x
fix(deps): update module github.com/docker/docker to v27.3.0+incompatible
2024-09-20 09:51:59 +00:00
Paul Holzinger bcb5bd5b4a pkg/netns: add NewNSFrom()
The new API should replace the logic from Podman's setupNetNS() which
did several things incorrect. First and foremost it never bind mounted
the netns dir causing problems when the netns dir was later bind mounted
duplicating the netns mounts on diffeent parents which then caused all
unmount attempts to fail[1].

Also the Podman code did never check for conlicts so we way end up
overwriting an existing netns (super unlikely as we use 16 random bytes
but still). At the very least it duplicates the name logic for no reason
there so having this all here makes much more sense.

Of course we still have to port podman over to this new API.

[1] https://issues.redhat.com/browse/RHEL-59620

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-09-20 11:51:52 +02:00
renovate[bot] 98ae897f0c fix(deps): update module github.com/docker/docker to v27.3.0+incompatible
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-20 09:31:00 +00:00
openshift-merge-bot[bot] bc0075278f Merge pull request #2165 from baude/imagelistselection
Add ImageListSelection to copier options
2024-09-20 09:30:08 +00:00
Paul Holzinger d28725ac05 pkg/netns: ensure makeNetnsDir is race free
There are some rather bad problems when we bind mount over multiple
times, this is a rather small race but can happen. In order to avoid
this take an exclusive lock like ip netns add does because they create
the same bind mount setup. As such we will not race against other podman
process or ip netns add which is a good thing.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-09-20 11:24:42 +02:00
Paul Holzinger 80634c3632 pkg/netns: split out makeNetnsDir logic
Create a new function to create the netns dir.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-09-20 10:54:48 +02:00
Brent Baude 11ea8396fd Add ImageListSelection to copier options
For artifact support, the copier needs to get all tags; as such, we need
to pass in the correct value for ImageListSelection.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2024-09-19 13:42:38 -05:00
Brent Baude 76e87a92ce Export portions of Copier
To support artifact handling, we need to export some of the methods for
copier. The Copy and Close method have been exported.  In addition, a
new constructor that is exported was created so we could introduce a
different SystemContext for artifacts.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2024-09-19 13:32:10 -05:00
openshift-merge-bot[bot] 45c3dd604e Merge pull request #2163 from mrguitar/main
added bootc logos
2024-09-19 15:06:08 +00:00
Ben Breard 130bf78369 added bootc logos
Signed-off-by: Ben Breard <bbreard@redhat.com>
2024-09-19 07:27:16 -05:00
openshift-merge-bot[bot] 3c08ae57ed Merge pull request #2162 from giuseppe/ignore-cgroupv1-controllers
cgroups: ignore ownership for cgroup v1 controllers
2024-09-18 12:29:15 +00:00
Giuseppe Scrivano f4d1cd519f cgroups: ignore ownership for cgroup v1 controllers
if the system is running on cgroup v2, ignore the ownership of cgroup
v1 controllers when the current process is at the root cgroup.

Closes: https://github.com/containers/podman/issues/23990

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2024-09-18 10:58:34 +02:00
openshift-merge-bot[bot] 240c328833 Merge pull request #2160 from containers/renovate/github.com-cyphar-filepath-securejoin-0.x
fix(deps): update module github.com/cyphar/filepath-securejoin to v0.3.2
2024-09-16 08:51:50 +00:00
renovate[bot] 6ea173ae96 fix(deps): update module github.com/cyphar/filepath-securejoin to v0.3.2
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-14 11:40:13 +00:00
openshift-merge-bot[bot] 98e5447005 Merge pull request #2159 from lsm5/packit-sidetag
[skip-ci] Packit: Enable sidetags for bodhi updates
2024-09-14 11:39:18 +00:00
openshift-merge-bot[bot] 5fe71d3e96 Merge pull request #2155 from containers/renovate/github.com-docker-docker-27.x
fix(deps): update module github.com/docker/docker to v27.2.1+incompatible
2024-09-11 17:01:53 +00:00
Lokesh Mandvekar 5f906cc8a9 Packit: split out ELN jobs and reuse fedora downstream targets
ELN is kind of a midway between Fedora and RHEL, so it's best to mention
ELN jobs separately. This will also allow reusing fedora targets using
YAML anchors for TMT tests.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2024-09-11 17:40:07 +05:30
Lokesh Mandvekar 695e88ae4d Packit: Enable sidetags for bodhi updates
Packit now has sidetag support for adding multiple builds into a single
bodhi update.

Since we release c/ccommon, skopeo, buildah and podman often
almoost simultaneously, we should release them to Fedora in a single
bodhi update using sidetags so all builds can be tested together.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2024-09-11 17:36:12 +05:30
renovate[bot] f5cab08749 fix(deps): update module github.com/docker/docker to v27.2.1+incompatible
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-11 10:24:11 +00:00
openshift-merge-bot[bot] 1dc8d37ac3 Merge pull request #2158 from giuseppe/improve-ENOENT-handling-cgroup
cgroups: improve ENOENT and EBUSY handling
2024-09-11 10:22:44 +00:00
Giuseppe Scrivano 0159020c0f cgroups: use filepath.Join
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2024-09-11 10:36:13 +02:00
Giuseppe Scrivano e4f792bc24 cgroups: add handling for EBUSY
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2024-09-10 16:51:34 +02:00
Giuseppe Scrivano 19a4dc0c64 cgroups: improve ENOENT handling
writing to cgroup.subtree_control can fail with ENOENT either if the
file itself doesn't exist, or a specified controller is not available.

Try to detect the reason and improve the error message.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2024-09-10 16:51:30 +02:00
openshift-merge-bot[bot] 295cec58af Merge pull request #2156 from containers/renovate/github.com-checkpoint-restore-go-criu-v7-7.x
fix(deps): update module github.com/checkpoint-restore/go-criu/v7 to v7.2.0
2024-09-10 10:06:46 +00:00
renovate[bot] e10a11291b fix(deps): update module github.com/checkpoint-restore/go-criu/v7 to v7.2.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-09 16:46:01 +00:00
openshift-merge-bot[bot] 81540fe91b Merge pull request #2136 from Luap99/pasta-map-guest-addr
pasta: use new --map-guest-addr option
2024-09-06 12:32:48 +00:00
openshift-merge-bot[bot] e81378866e Merge pull request #2153 from containers/renovate/golang.org-x-crypto-0.x
fix(deps): update module golang.org/x/crypto to v0.27.0
2024-09-06 08:38:09 +00:00
renovate[bot] 2958042207 fix(deps): update module golang.org/x/crypto to v0.27.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-05 19:46:41 +00:00
openshift-merge-bot[bot] 1f081a10af Merge pull request #2152 from Luap99/dep-updates
update some dependecies that need go 1.22
2024-09-05 16:19:18 +00:00
openshift-merge-bot[bot] e9d005b6ce Merge pull request #2099 from lsm5/rpm-iptables
[skip-ci] RPM: move netavark deps to netavark package
2024-09-05 13:50:49 +00:00
openshift-merge-bot[bot] 16c2b959bc Merge pull request #2129 from lsm5/packit-fedora-all
[skip-ci] Packit: update targets for propose-downstream
2024-09-05 13:42:31 +00:00
Paul Holzinger 5d5e6a4479 update golangci.yml
The deadline option was renamed to timeout and I see 1m timeouts in CI
so I think the option isn't working there.
Also remove the core limit, by default it uses all cores and there is no
reason to limit that really.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-09-05 15:35:25 +02:00
Paul Holzinger 861d6aaffc update some dependecies that need go 1.22
Our renovate config does not yet support go 1.22[1] so do it manually
for now.

[1] https://github.com/containers/automation/pull/227

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-09-05 15:23:54 +02:00
openshift-merge-bot[bot] 1222d82ca9 Merge pull request #2145 from lsm5/storage-options
RPM: Update config file patching
2024-09-05 12:53:01 +00:00
Lokesh Mandvekar b69978326a RPM: Update storage.conf patching
storage.conf has been updated upstream so the config files update script
needs to account for that.

Ref: https://github.com/containers/storage/pull/2066

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2024-09-05 14:55:12 +05:30
openshift-merge-bot[bot] 1fb4e75bf3 Merge pull request #2148 from Luap99/go-1.22
update to Go 1.22 and golangci-lint 1.60.3
2024-09-03 17:31:08 +00:00
Paul Holzinger 805e7ae406 update golangci-lint to 1.60.3
Contains fixes for new linters, removed depracted and removed linters
from the config.

Most notably because we use go 1.22 now we can get rid of the copy for
loop vars[1]. Also as of the go 1..2 we can use the new int range syntax
in for loops the new intrange linter checks that.

[1] https://go.dev/blog/loopvar-preview

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-09-03 15:57:02 +02:00
Paul Holzinger 726742a3d5 update go to 1.22
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-09-03 15:36:57 +02:00
openshift-merge-bot[bot] 419f5b1032 Merge pull request #2143 from containers/renovate/github.com-containers-storage-digest
fix(deps): update github.com/containers/storage digest to 8bc8379
2024-09-03 13:08:46 +00:00
Paul Holzinger 564e755ad8 libnetwork/etchosts: add PreferIP option
For the pasta network mode we now use --map-guest-addr which means we
have a specific ip that we want to use as host.containers.internal
address. I first thought we could handle it in podman but that doesn't
work as the contianers.conf option must have a higher priority.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-09-02 11:04:36 +02:00
Paul Holzinger 0f62427d9d libnetwork/etchosts: rework GetHostContainersInternalIP()
GetHostContainersInternalIP() is no longer called in podman or buildah
as they use GetHostContainersInternalIPExcluding(). I need to add a new
option so chnage the function to accept the parameters as struct so we
do not have to break the API every time we add a new parameter.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-09-02 11:02:08 +02:00