Add default net info in container inspect #9092
Conversation
when inspecting a container that is only connected to the default network, we should populate the default network in the container inspect information. Fixes: containers#6618 Signed-off-by: baude <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: baude The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
|
LGTM |
| cniNet := new(define.InspectAdditionalNetwork) | ||
| cniNet.NetworkID = c.runtime.netPlugin.GetDefaultNetworkName() | ||
| settings.Networks[c.runtime.netPlugin.GetDefaultNetworkName()] = cniNet | ||
| } |
There was a problem hiding this comment.
This block is still unnecessary, though. All your work here is undone by the if len(networks) > 0 block below.
There was a problem hiding this comment.
You also are going to need to modify the other use of !isDefault (L958) - the one that handles non-running containers.
There was a problem hiding this comment.
we should talk about that ... look at the block just beneath this. it looks there is step prior where the map is setup. lets discuss in watercooler.
| @@ -443,4 +443,16 @@ var _ = Describe("Podman inspect", func() { | |||
| Expect(inspect.OutputToString()).To(Equal(`"{"80/tcp":[{"HostIp":"","HostPort":"8080"}]}"`)) | |||
| }) | |||
|
|
|||
| It("Verify container inspect has default network", func() { | |||
There was a problem hiding this comment.
Please add another test with a container that is not running.
|
Taking this over - #9109 |
github-actions
bot
added
the
locked - please file new issue/PR
when inspecting a container that is only connected to the default
network, we should populate the default network in the container inspect
information.
Fixes: #6618
Signed-off-by: baude [email protected]