diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-26 19:21:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 19:21:16 +0200 |
| commit | 051eb43c6957b73e9c0f14cde91142ddee627204 (patch) | |
| tree | c3360ab9971ae8a99156b16bde521ed9601ec062 /pkg/api | |
| parent | d5e13a3a9039fc1068bccce73ce5acd7bf98d576 (diff) | |
| parent | 52656887e1cd3476a18765aa81a7804fceb861b4 (diff) | |
| download | podman-051eb43c6957b73e9c0f14cde91142ddee627204.tar.gz podman-051eb43c6957b73e9c0f14cde91142ddee627204.tar.bz2 podman-051eb43c6957b73e9c0f14cde91142ddee627204.zip | |
Merge pull request #15907 from Luap99/compat-net-opts
compat API: network inspect do not show isolate option
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/networks.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go index 29d1398cf..078e75ed3 100644 --- a/pkg/api/handlers/compat/networks.go +++ b/pkg/api/handlers/compat/networks.go @@ -118,6 +118,11 @@ func convertLibpodNetworktoDockerNetwork(runtime *libpod.Runtime, network *netty if changeDefaultName && name == runtime.Network().DefaultNetworkName() { name = nettypes.BridgeNetworkDriver } + options := network.Options + // bridge always has isolate set in the compat API but we should not return it to not confuse callers + // https://github.com/containers/podman/issues/15580 + delete(options, nettypes.IsolateOption) + report := types.NetworkResource{ Name: name, ID: network.ID, @@ -126,7 +131,7 @@ func convertLibpodNetworktoDockerNetwork(runtime *libpod.Runtime, network *netty Internal: network.Internal, EnableIPv6: network.IPv6Enabled, Labels: network.Labels, - Options: network.Options, + Options: options, IPAM: ipam, Scope: "local", Attachable: false, |