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 Loading
base: v0.58.0
Choose a base ref
...
head repository: containers/common Loading
compare: v0.58.1
Choose a head ref
  • 9 commits
  • 8 files changed
  • 3 contributors

Commits on Mar 21, 2024

  1. libnetwork/pasta: add new Setup2 to return result

    Currently both callers in podman and buildah join and inspect the netns
    to get the local ip configured by pasta in order to add it to
    /etc/hosts. So instead of doing this in two places let's just do it here
    once and return the result to the caller.
    
    In order to not cause vendoring issues I decided against breaking the
    API and added a new Setup2 function instead. I will then update
    podman and buildah to make use of it.
    
    Also I plan on adding more fields in the result, i.e. dns address.
    
    Because this now depends on linux only functionality make sure to only
    build it on linux, pasta only works on linux anyway so this is not a
    problem.
    
    Signed-off-by: Paul Holzinger <[email protected]>
    Luap99 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    a49ced6 View commit details
    Browse the repository at this point in the history
  2. Revert "libnetwork/pasta: pass --dns none"

    This reverts commit 92784a2.
    I plan on using --dns-forward now so we do not want to disable dns by
    default, see [1].
    
    [1] containers/podman#19213
    
    Signed-off-by: Paul Holzinger <[email protected]>
    Luap99 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    f03a238 View commit details
    Browse the repository at this point in the history
  3. libnetwork/pasta: set --dns-forward as default

    By default set 169.254.0.1 as nameserver in the container, right now we
    do not do special dns handling which means if a user has only localhost
    resolver or the same nameserver ip as the host ip used by pasta then dns
    will most likely fail.
    
    pasta allows us to remap one ipv4 for dns which will then automatically
    get remapped to the host dns server from resolv.conf. For that we must
    use --dns-forward, now the choice of which ip is arbitrary but using the
    local link address 169.254.0.1 is unlikely to be used so it should avoid
    conflicts.
    
    Also return the ip in the result together with a ipv6 bool so that
    podman can create a correct resolv.conf with that ip for the container.
    
    Signed-off-by: Paul Holzinger <[email protected]>
    Luap99 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    c048a12 View commit details
    Browse the repository at this point in the history
  4. libnetwork/rootlessnetns: use pasta.Setup2()

    This tells us if ipv6 is supported. And we should use the forward ips as
    dns servers to make sure we can read localhost resolvers on the host.
    
    Signed-off-by: Paul Holzinger <[email protected]>
    Luap99 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    cac7ff6 View commit details
    Browse the repository at this point in the history
  5. libnetwork/util: add GetLocalIPExcluding()

    For some cases it may be required to get a local ip while excluding a
    certain ip. This will be used to set a better host.containers.internal
    name for pasta networks as it is likely that host eth0 ip == container
    ip so in this case we must use different host ip.
    
    Signed-off-by: Paul Holzinger <[email protected]>
    Luap99 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    587fd96 View commit details
    Browse the repository at this point in the history
  6. libnetwork/etchosts: add GetHostContainersInternalIPExcluding()

    For callers like podman we might have to exclude certain ips for the use
    of host.containers.internal as they might conflict with the inside
    container ip otherwise.
    
    Signed-off-by: Paul Holzinger <[email protected]>
    Luap99 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    f12a245 View commit details
    Browse the repository at this point in the history
  7. libnetwork/slirp4netns: build result type on all oses

    My plan is to directly use the result in podman on the Container struct,
    this is shared with freebsd even though slirp4netns will never be used
    there. Thus we can simply move the type definition to the file that is
    shared to not cause build problems.
    
    Signed-off-by: Paul Holzinger <[email protected]>
    Luap99 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    897f762 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Merge pull request #1929 from Luap99/backport-0.58

    [v0.58] Backport pasta fixes
    rhatdan committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    7d68a8e View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Bump to v0.58.1

    Signed-off-by: Matt Heon <[email protected]>
    mheon committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    2cf153a View commit details
    Browse the repository at this point in the history
Loading