From 019efef8f488740141a10bd2c85c0e74dbda1805 Mon Sep 17 00:00:00 2001 From: Thomas Liu Date: Sat, 9 Apr 2016 08:52:24 -0700 Subject: [PATCH] Pass dockerOpts by reference to setInfraContainerNetworkConfig --- pkg/kubelet/dockertools/manager.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 2f85f8647e2..cfbbc1520fe 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -656,7 +656,7 @@ func (dm *DockerManager) runContainer( // Set network configuration for infra-container if container.Name == PodInfraContainerName { - setInfraContainerNetworkConfig(pod, netMode, opts, dockerOpts) + setInfraContainerNetworkConfig(pod, netMode, opts, &dockerOpts) } setEntrypointAndCommand(container, opts, dockerOpts) @@ -688,7 +688,7 @@ func (dm *DockerManager) runContainer( // 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. -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) dockerOpts.Config.ExposedPorts = exposedPorts dockerOpts.HostConfig.PortBindings = dockernat.PortMap(portBindings)