containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix play kube when a pod is specified 

We need to pass the Pod ID in as part of the CreateConfig.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon 2019-05-21 14:18:42 -04:00
parent 03824e04fd
commit e59083f41f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/play_kube.go
View File

@ -217,7 +217,7 @@ func playKubeYAMLCmd(c *cliconfig.KubePlayValues, ctx context.Context, runtime *
if err != nil { if err != nil {
return pod, err return pod, err
} }
createConfig, err := kubeContainerToCreateConfig(ctx, container, runtime, newImage, namespaces, volumes) createConfig, err := kubeContainerToCreateConfig(ctx, container, runtime, newImage, namespaces, volumes, pod.ID())
if err != nil { if err != nil {
return pod, err return pod, err
} }
@ -274,7 +274,7 @@ func getPodPorts(containers []v1.Container) []ocicni.PortMapping {
} }
// kubeContainerToCreateConfig takes a v1.Container and returns a createconfig describing a container // kubeContainerToCreateConfig takes a v1.Container and returns a createconfig describing a container
func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container, runtime *libpod.Runtime, newImage *image.Image, namespaces map[string]string, volumes map[string]string) (*createconfig.CreateConfig, error) { func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container, runtime *libpod.Runtime, newImage *image.Image, namespaces map[string]string, volumes map[string]string, podID string) (*createconfig.CreateConfig, error) {
var ( var (
containerConfig createconfig.CreateConfig containerConfig createconfig.CreateConfig
) )
@ -288,6 +288,8 @@ func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container
containerConfig.Tty = containerYAML.TTY containerConfig.Tty = containerYAML.TTY
containerConfig.WorkDir = containerYAML.WorkingDir containerConfig.WorkDir = containerYAML.WorkingDir
containerConfig.Pod = podID
imageData, _ := newImage.Inspect(ctx) imageData, _ := newImage.Inspect(ctx)
containerConfig.User = "0" containerConfig.User = "0"