github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24080 from tyangliu/fix-infra-network-cfg

Browse Source 
Pass dockerOpts by reference to setInfraContainerNetworkConfig
This commit is contained in:
Jeff Lowdermilk 2016-05-13 09:53:39 -07:00
commit 1fe0e0778f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/dockertools/manager.go
View File

@ -673,7 +673,7 @@ func (dm *DockerManager) runContainer(
// Set network configuration for infra-container // Set network configuration for infra-container
if container.Name == PodInfraContainerName { if container.Name == PodInfraContainerName {
setInfraContainerNetworkConfig(pod, netMode, opts, dockerOpts) setInfraContainerNetworkConfig(pod, netMode, opts, &dockerOpts)
} }
setEntrypointAndCommand(container, opts, dockerOpts) setEntrypointAndCommand(container, opts, dockerOpts)
@ -705,7 +705,7 @@ func (dm *DockerManager) runContainer(
// setInfraContainerNetworkConfig sets the network configuration for the infra-container. We only set network configuration for infra-container, all // setInfraContainerNetworkConfig sets the network configuration for the infra-container. We only set network configuration for infra-container, all
// the user containers will share the same network namespace with infra-container. // the user containers will share the same network namespace with infra-container.
func setInfraContainerNetworkConfig(pod *api.Pod, netMode string, opts *kubecontainer.RunContainerOptions, dockerOpts dockertypes.ContainerCreateConfig) { func setInfraContainerNetworkConfig(pod *api.Pod, netMode string, opts *kubecontainer.RunContainerOptions, dockerOpts *dockertypes.ContainerCreateConfig) {
exposedPorts, portBindings := makePortsAndBindings(opts.PortMappings) exposedPorts, portBindings := makePortsAndBindings(opts.PortMappings)
dockerOpts.Config.ExposedPorts = exposedPorts dockerOpts.Config.ExposedPorts = exposedPorts
dockerOpts.HostConfig.PortBindings = dockernat.PortMap(portBindings) dockerOpts.HostConfig.PortBindings = dockernat.PortMap(portBindings)