Commit Graph

24067 Commits

Author SHA1 Message Date
openshift-merge-bot[bot]
ec691c7112 Merge pull request #24568 from Luap99/ssh_config
remote: fix ssh_config handling
2024-11-18 18:30:26 +00:00
openshift-merge-bot[bot]
9a66cbf0ea Merge pull request #24596 from edsantiago/bump-systemd
Bump CI VMs
2024-11-18 15:44:45 +00:00
openshift-merge-bot[bot]
1712594493 Merge pull request #24592 from giuseppe/honor-pivot-root-build
libpod: pass down NoPivotRoot to Buildah
2024-11-18 15:02:55 +00:00
Ed Santiago
926b31e053 Bump CI VMs
Get new systemd-257~rc1 on rawhide, see what happens with #24220

Built in : https://github.com/containers/automation_images/pull/394

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-11-18 07:39:35 -07:00
openshift-merge-bot[bot]
e1951772c5 Merge pull request #24578 from Luap99/addHosts-nil-deref
libpod: addHosts() prevent nil deref
2024-11-18 12:59:03 +00:00
openshift-merge-bot[bot]
a132e62be7 Merge pull request #24582 from containers/renovate/github.com-opencontainers-runc-1.x
fix(deps): update module github.com/opencontainers/runc to v1.2.2
2024-11-18 12:12:15 +00:00
Giuseppe Scrivano
e60e11167e libpod: pass down NoPivotRoot to Buildah
Closes: https://github.com/containers/podman/issues/24546

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2024-11-18 12:41:47 +01:00
Giuseppe Scrivano
d59794992f vendor: bump containers/buildah
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2024-11-18 12:36:07 +01:00
renovate[bot]
cf2ef12664 fix(deps): update module github.com/opencontainers/runc to v1.2.2
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-16 04:57:36 +00:00
Paul Holzinger
d513973237 libpod: addHosts() prevent nil deref
In theory RootlessNetnsInfo() should never return nil here. However that
was actually only true when the rootless netns was set up before and
wrote the right cache file with the ip addresses.

Given this cache file is a new feature just added in 5.3 if you updated
from 5.2 or earlier the file will not exists thus cause failures for all
following started containers.
The fix for this is to stop all containers and make sure the
rootless-netns was removed so the next start creates it new with the
proper 5.3 cache file. However as there is no way to rely on users doing
that and it is also not requirement so simply handle the nil deref here.

The only way to test this would be to run the old version then the new
version which we cannot really do in CI. We do have upgrade test for
that but they are root only and likely need a lot more work to get them
going rootless but certainly worth to explore to prevent such problems
in the future.

Fixes: a1e6603133 ("libpod: make use of new pasta option from c/common")
Fixes: #24566

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-15 13:39:45 +01:00
Paul Holzinger
71f1f52894 only read ssh_config for non machine connections
For machine we know we have all the info we need so there is no reason
to read and parse another file.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-14 18:29:22 +01:00
Paul Holzinger
cbb2820a7e ssh_config: allow IdentityFile file with tilde
The ssh_config can contain a path with ~/ to refer to the home dir like
done on shells. Handle that special case and resolve the path correctly
so it can be used.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-14 18:26:55 +01:00
Paul Holzinger
a7120b50b1 ssh_config: do not overwrite values from config file
When we alreadty get a full URL with user, port and identity then we
should not read the config file just to overwrite them with wrong
values. This is a bad regression for user using * wildcard in their
ssh_config as it makes podman machine unusable.

Fixes: #24567
Fixes: e523734ab6 ("Add support for ssh_config for connection")

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-14 18:26:33 +01:00
Paul Holzinger
8a5ec2c505 connection: ignore errors when parsing ssh_config
The new ssh_Config feature doesn't work on my system because the lib
fails to parse configs using Match[1]. However Fedora and RHEL based
distros seem to ship /etc/ssh/ssh_config.d/50-redhat.conf which contains
a Match line thus it always fails to parse and never uses the proper
values from my home dir config.

[1] https://github.com/kevinburke/ssh_config/issues/6

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-14 16:17:50 +01:00
openshift-merge-bot[bot]
777a99762c Merge pull request #24563 from slp/update-krunkit-0.1.4
Bump bundled krunkit to 0.1.4
2024-11-14 15:02:32 +00:00
Sergio Lopez
7b41e28b95 Bump bundled krunkit to 0.1.4
Bump the bundled krunkit version from 0.1.3 to 0.1.4.

Fixes: #24559

Signed-off-by: Sergio Lopez <slp@redhat.com>
2024-11-14 15:38:11 +01:00
openshift-merge-bot[bot]
5dbb567db6 Merge pull request #24321 from gaufde/main
Fix for podman machine init not creating necessary JSON file when an ignition-path is passed
2024-11-14 11:25:16 +00:00
openshift-merge-bot[bot]
fa5e3b6e94 Merge pull request #24535 from M1cha/network-driver-options
add support for driver-specific options during container creation
2024-11-14 09:29:44 +00:00
openshift-merge-bot[bot]
ecaf9bf515 Merge pull request #24525 from Luap99/lint
update golangci-lint to v1.62.0
2024-11-13 21:47:38 +00:00
Michael Zimmermann
315e7412e8 add support for driver-specific options during container creation
This way has a huge disadvantage: The user will not see an error when he
uses a non-existent option. Another disadvantage is, that if we add more
options within podman, they might collide with the names chosen by
plugins. Such issues might be hard to debug.
The advantage is that the usage is very nice:
--network bridge:opt1=val1,opt2=val2.

Alternatively, we could put this behind `opt=`, which is harder to use,
but would solve all issues above:
--network bridge:opt=opt1=val1,opt=opt2=val2

Signed-off-by: Michael Zimmermann <sigmaepsilon92@gmail.com>
2024-11-13 18:14:58 +01:00
openshift-merge-bot[bot]
c348367453 Merge pull request #24491 from lsm5/main-540-bump
[CI:ALL] Bump main to v5.4.0-dev
2024-11-13 17:14:31 +00:00
openshift-merge-bot[bot]
a52061cba1 Merge pull request #24552 from M5oul/main
doc: fix words repetitions
2024-11-13 17:00:46 +00:00
Maël Azimi
6809bf1d90 doc: fix words repetitions
Signed-off-by: Maël Azimi <mael.azimi@moul.re>
2024-11-13 15:21:40 +01:00
openshift-merge-bot[bot]
77e67e7a54 Merge pull request #24554 from mheon/update_release_notes_53
Update release notes on main for v5.3.0
2024-11-13 13:37:16 +00:00
Matt Heon
d2d2e4a605 Update release notes on main for v5.3.0
We haven't done this in a while, so include all the missing
updates from v5.1.x and v5.2.x as well.

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-11-13 08:16:22 -05:00
openshift-merge-bot[bot]
6a6e890553 Merge pull request #24553 from containers/renovate/setuptools-75.x
chore(deps): update dependency setuptools to ~=75.5.0
2024-11-13 12:47:43 +00:00
openshift-merge-bot[bot]
e3ecc59914 Merge pull request #24549 from edsantiago/parallel-010
CI: system tests: parallelize 010
2024-11-13 12:16:15 +00:00
renovate[bot]
590fcafc2b chore(deps): update dependency setuptools to ~=75.5.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-13 12:01:33 +00:00
Ed Santiago
1c77ee6fc5 CI: system tests: parallelize 010
Final cleanup. Has been working fine in #23257 for weeks.
Not much gain here, but every little bit helps.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-11-13 04:14:57 -07:00
Graceson Aufderheide
34a15ae300 fix podman machine init --ignition-path
Fix the issue where podman machine init does not create
all the necessary machine files when ignition-path is used. Fixes: #23544

Signed-off-by: Graceson Aufderheide <gracesonphoto@gmail.com>
2024-11-12 17:56:43 -07:00
openshift-merge-bot[bot]
8f2d5011f2 Merge pull request #24532 from mheon/subpath
Add subpath support to volumes in `--mount` option
2024-11-12 21:46:58 +00:00
Michael Zimmermann
3e47e0bc8c vendor: update containers/common
Signed-off-by: Michael Zimmermann <sigmaepsilon92@gmail.com>
2024-11-12 19:59:14 +01:00
openshift-merge-bot[bot]
3f10c91e0b Merge pull request #24534 from containers/renovate/github.com-moby-sys-capability-0.x
fix(deps): update module github.com/moby/sys/capability to v0.4.0
2024-11-12 16:55:45 +00:00
openshift-merge-bot[bot]
5f5783d54b Merge pull request #24547 from giuseppe/clamp-limits-userns
spec: clamp rlimits in a userns
2024-11-12 16:30:46 +00:00
Giuseppe Scrivano
0a69aefa41 spec: clamp rlimits in a userns
commit 5ebba75dbd implemented this
behaviour for rootless users, but the same limitation exists for any
user in a user namespace.  Change the check to use the clamp to the
current values anytime podman runs in a user namespace.

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

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2024-11-12 16:44:33 +01:00
openshift-merge-bot[bot]
f41eab21de Merge pull request #24540 from Luap99/vendor
vendor containers projects to tagged versions
2024-11-12 15:00:03 +00:00
openshift-merge-bot[bot]
da8995658b Merge pull request #24542 from ksw2000/refactor-linuxns-string
refactor: simplify LinuxNS type definition and String method
2024-11-12 14:18:31 +00:00
Matt Heon
8a192c8403 Add subpath support to volumes in --mount option
All the backend work was done a while back for image volumes, so
this is effectively just plumbing the option in for volumes in
the parser logic. We do need to change the return type of the
volume parser as it only worked on spec.Mount before (which does
not have subpath support, so we'd have to pass it as an option
and parse it again) but that is cleaner than the alternative.

Fixes #20661

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-11-12 09:13:16 -05:00
openshift-merge-bot[bot]
2bcbffa186 Merge pull request #24531 from containers/renovate/setuptools-75.x
chore(deps): update dependency setuptools to ~=75.4.0
2024-11-12 12:39:16 +00:00
Kashiwa
da6404ba16 refactor: simplify LinuxNS type definition and String method
Signed-off-by: Kashiwa <13825170+ksw2000@users.noreply.github.com>
2024-11-12 11:46:47 +00:00
Paul Holzinger
0a1363d8eb test/e2e: remove FIPS test
First, creating a global file /etc/system-fips was never a good idea for
testing as it affects other running tests at the same time.
And as of a recent change to FIPS mounts[1] we no longer use the file so
the test breaks with c/common v0.61. Instead it uses the kernel file
/proc/sys/crypto/fips_enabled which requires the real fips mode to be
activated and that in turn requires a reboot. As such this is not
somthing that can be tested in upstream CI like that.

[1] https://github.com/containers/common/pull/2174

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-12 10:59:04 +01:00
Paul Holzinger
42e8322532 vendor containers projects to tagged versions
Updates:
 - c/storage v1.56.0
 - c/image v5.33.0
 - c/common v0.61.0
 - c/buildah v1.38.0
 - c/libhvee v0.9.0
 - github.com/crc-org/crc/v2 v2.43.0

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-12 10:51:22 +01:00
renovate[bot]
fa335f99e0 fix(deps): update module github.com/moby/sys/capability to v0.4.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-11 21:45:04 +00:00
openshift-merge-bot[bot]
7a3e8da8ea Merge pull request #24515 from edsantiago/kube-template
system tests: safer install_kube_template()
2024-11-11 20:51:21 +00:00
renovate[bot]
ca7703643b chore(deps): update dependency setuptools to ~=75.4.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-11 19:10:38 +00:00
Ed Santiago
969417711d system tests: safer install_kube_template()
Previous version was badly broken: it relied on 'make'
rebuilding a file under cwd, which is a no-no; and, in
the case where we don't have a source directory, just
blindly hoped that there'd be a system-installed .service
file with the correct path to podman.

Solution:
  . if running in source directory, run sed directly into
    destination service file in $UNIT_DIR. This is ugly
    duplication of a line in Makefile.

  . if NOT running in a source directory, check $PODMAN:
    . if it's /usr/bin/podman, continue. Include a warning
      that will be shown only on test failure.
    . otherwise skip, because we don't know what we're testing

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-11-11 10:44:32 -07:00
openshift-merge-bot[bot]
50714d2455 Merge pull request #24526 from edsantiago/buildah-vendor-update
Buildah treadmill tweaks
2024-11-11 16:10:52 +00:00
Ed Santiago
33398ebc1e Buildah treadmill tweaks
* treadmill script: handle an obscure corner case
  wherein the script would bail because it thought
  there were no buildah-vendor changes.

* two new test skips

* update the diffs; line-number changes due to buildah
  PRs touching helpers.bash

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-11-11 07:04:39 -07:00
openshift-merge-bot[bot]
b5d953e23c Merge pull request #24511 from containers/renovate/golang.org-x-net-0.x
fix(deps): update module golang.org/x/net to v0.31.0
2024-11-11 13:25:52 +00:00
Paul Holzinger
9eca92d625 update golangci-lint to v1.62.0
- fix issues found by recvcheck
- skip k8s files from recvcheck
- remove two removed linters gomnd and execinquery

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-11 14:21:17 +01:00