mirror of https://github.com/containers/podman.git
pod create: read network mode from config
When we create a pod we have to parse the network mode form the config
file. This is a regression in commit d28e85741f
.
Fixes #12207
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
parent
d6ef903164
commit
8b7b0b7caf
|
@ -117,7 +117,7 @@ func create(cmd *cobra.Command, args []string) error {
|
||||||
return fmt.Errorf("cannot specify no-hosts without an infra container")
|
return fmt.Errorf("cannot specify no-hosts without an infra container")
|
||||||
}
|
}
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
createOptions.Net, err = common.NetFlagsToNetOptions(nil, *flags, false)
|
createOptions.Net, err = common.NetFlagsToNetOptions(nil, *flags, createOptions.Infra)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -134,7 +134,7 @@ func create(cmd *cobra.Command, args []string) error {
|
||||||
} else {
|
} else {
|
||||||
// reassign certain options for lbpod api, these need to be populated in spec
|
// reassign certain options for lbpod api, these need to be populated in spec
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
infraOptions.Net, err = common.NetFlagsToNetOptions(nil, *flags, false)
|
infraOptions.Net, err = common.NetFlagsToNetOptions(nil, *flags, createOptions.Infra)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
[containers]
|
||||||
|
|
||||||
|
netns = "host"
|
|
@ -957,4 +957,22 @@ ENTRYPOINT ["sleep","99999"]
|
||||||
Expect(ctr3.OutputToString()).To(ContainSubstring("hello"))
|
Expect(ctr3.OutputToString()).To(ContainSubstring("hello"))
|
||||||
})
|
})
|
||||||
|
|
||||||
|
It("podman pod create read network mode from config", func() {
|
||||||
|
confPath, err := filepath.Abs("config/containers-netns.conf")
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
os.Setenv("CONTAINERS_CONF", confPath)
|
||||||
|
defer os.Unsetenv("CONTAINERS_CONF")
|
||||||
|
if IsRemote() {
|
||||||
|
podmanTest.RestartRemoteService()
|
||||||
|
}
|
||||||
|
|
||||||
|
pod := podmanTest.Podman([]string{"pod", "create", "--name", "test", "--infra-name", "test-infra"})
|
||||||
|
pod.WaitWithDefaultTimeout()
|
||||||
|
Expect(pod).Should(Exit(0))
|
||||||
|
|
||||||
|
inspect := podmanTest.Podman([]string{"inspect", "--format", "{{.HostConfig.NetworkMode}}", "test-infra"})
|
||||||
|
inspect.WaitWithDefaultTimeout()
|
||||||
|
Expect(inspect).Should(Exit(0))
|
||||||
|
Expect(inspect.OutputToString()).Should(Equal("host"))
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue