Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: containers/common
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.58.1
Choose a base ref
...
head repository: containers/common
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.58.2
Choose a head ref
  • 10 commits
  • 7 files changed
  • 3 contributors

Commits on Mar 28, 2024

  1. Merge pull request #1942 from mheon/bump_0581

    Bump to v0.58.1
    TomSweeneyRedHat authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    36904a0 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. libnetwork/rootlessnetns: fix netns leak on errors

    When the netns program fails to configure the netns or we fail for any
    other reason during the setup we must make sure to remove the netns
    mount again. Without it the next command sees the existing mount and
    thinks the netns was setup correctly but than later fails during the
    custom resolv.conf mount because the resolv.conf source file was never
    created.
    
    For future we should consider adding checks due ensure pasta/slirp4netns
    is still running when we access the netns to make it more fault
    tolerant.
    
    The reason this is a common problem is that on boot pasta can likely
    fail if it was started before the networking was fully configured (i.e.
    no default route).
    
    Fixes podman-container-tools/podman#22168
    
    Signed-off-by: Paul Holzinger <pholzing@redhat.com>
    Luap99 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    feb2281 View commit details
    Browse the repository at this point in the history
  2. libnetwork/rootlessnetns: add readPidFile() helper

    Add a function to read a pidfile, this helps to avoid some duplication.
    
    Signed-off-by: Paul Holzinger <pholzing@redhat.com>
    Luap99 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    7281185 View commit details
    Browse the repository at this point in the history
  3. libnetwork/rootlessnetns: make setup more robust

    We have little to no control over what happens tot he slirp4netns/pasta
    process after we started it. It could crash or get killed then we end up
    in state where we think networking works when it doesn't.
    
    To fix this each time we access the rootless-netns we should also make
    to program is still running, if it is not try to recover by starting it
    again. This ensures that we are much more fault tolerant.
    
    Signed-off-by: Paul Holzinger <pholzing@redhat.com>
    Luap99 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    5e61b7e View commit details
    Browse the repository at this point in the history
  4. libnetwork/rootlessnetns: do not use rootless-netns when not re-exec

    The IsRootless() check is dangerous in a sense that it may not do what
    you think it does. It also returns true even when podman is run as root
    and not in the podman userns but as part of a different userns. Could be
    a other container manager that configured the userns.
    
    This results in us doing the rootless-netns logic even when we should
    not need to. To fix this we now check for the
    _CONTAINERS_USERNS_CONFIGURED env var to make sure we are not
    re-exe'ed. This is what we actually care about.
    
    This is a regression compared to podman 4.X, because the code was moved
    into c/common the IsRootless() check was changed to the c/storage
    version which has the userns special case.
    
    Fixes podman-container-tools/podman#22218
    
    Signed-off-by: Paul Holzinger <pholzing@redhat.com>
    Luap99 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    cbda5be View commit details
    Browse the repository at this point in the history
  5. libnetwork/rootlessnetns: make mountns tree private

    While this is a none issue normally because we run in a unprivileged
    userns we cannot modify the host mounts in any way. However in case
    where the rootless netns logic might be executed from a non userns
    context we might change the mount tree if the mounts are shared which is
    the systemd default. While this should never happen let's make sure we
    never mess up the system by accident in case there are more bugs and
    explicitly make our mount tree private.
    
    Signed-off-by: Paul Holzinger <pholzing@redhat.com>
    Luap99 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    5df09a2 View commit details
    Browse the repository at this point in the history
  6. libnetwork/rootlessnetns: do not cleanup twice in Run()

    This here just logs unnecessary errors in case there is an error during
    the Run() call (podman unshare --rootless-netns). runInner() will
    already call cleanup on errors if it created a new netns so we only need
    to cleanup when there is no error.
    
    Signed-off-by: Paul Holzinger <pholzing@redhat.com>
    Luap99 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    61953e9 View commit details
    Browse the repository at this point in the history
  7. libnetwork/netavark: remove ipam bucket on network rm

    This is good to prevent any leaks but more important here there is a
    bug because we cache the last assigned ip. However when a network is
    removed the recreated with a different LeaseRange that ip might be very
    well outside the expected range and the logic seems to handle this
    correctly. I could fix it there but deleting the full bucket seems best
    as it avoid other issues and leaking the bucket forever.
    
    Fixes podman-container-tools/podman#22034
    
    Signed-off-by: Paul Holzinger <pholzing@redhat.com>
    Luap99 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    1358302 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Merge pull request #1954 from Luap99/0.58-backports

    [v0.58] backport my networking fixes
    Luap99 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    173bc93 View commit details
    Browse the repository at this point in the history
  2. Bump to v0.58.2

    Bumping to v0.58.2 for Podman v5.0.2
    
    This time from the right branch.
    
    Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
    TomSweeneyRedHat committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    a1bc620 View commit details
    Browse the repository at this point in the history
Loading