aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-01-12 07:20:36 -0800
committerGitHub <noreply@github.com>2019-01-12 07:20:36 -0800
commita08da3768255c1155aa14b73bf17d34e5214c568 (patch)
tree3f4f1272973d5cf8b45cbc04873d1a3d3a5952d6 /cmd/podman
parent5c86efb28976938ad77fcc0f677e0842d06b65b5 (diff)
parente10baba32673d4b6d9ada129941428fc8f8304eb (diff)
downloadpodman-a08da3768255c1155aa14b73bf17d34e5214c568.tar.gz
podman-a08da3768255c1155aa14b73bf17d34e5214c568.tar.bz2
podman-a08da3768255c1155aa14b73bf17d34e5214c568.zip
Merge pull request #2145 from baude/playcontainerintopod
podman play kube: add containers to pod
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/create.go7
-rw-r--r--cmd/podman/play_kube.go2
2 files changed, 4 insertions, 5 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 87fa18e47..1aa3425a5 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -145,7 +145,7 @@ func createContainer(c *cli.Context, runtime *libpod.Runtime) (*libpod.Container
return nil, nil, err
}
- ctr, err := createContainerFromCreateConfig(runtime, createConfig, ctx)
+ ctr, err := createContainerFromCreateConfig(runtime, createConfig, ctx, nil)
if err != nil {
return nil, nil, err
}
@@ -832,17 +832,16 @@ func joinOrCreateRootlessUserNamespace(createConfig *cc.CreateConfig, runtime *l
return rootless.BecomeRootInUserNS()
}
-func createContainerFromCreateConfig(r *libpod.Runtime, createConfig *cc.CreateConfig, ctx context.Context) (*libpod.Container, error) {
+func createContainerFromCreateConfig(r *libpod.Runtime, createConfig *cc.CreateConfig, ctx context.Context, pod *libpod.Pod) (*libpod.Container, error) {
runtimeSpec, err := cc.CreateConfigToOCISpec(createConfig)
if err != nil {
return nil, err
}
- options, err := createConfig.GetContainerCreateOptions(r)
+ options, err := createConfig.GetContainerCreateOptions(r, pod)
if err != nil {
return nil, err
}
-
became, ret, err := joinOrCreateRootlessUserNamespace(createConfig, r)
if err != nil {
return nil, err
diff --git a/cmd/podman/play_kube.go b/cmd/podman/play_kube.go
index f165c5f0f..2ce2e21bb 100644
--- a/cmd/podman/play_kube.go
+++ b/cmd/podman/play_kube.go
@@ -154,7 +154,7 @@ func playKubeYAMLCmd(c *cli.Context) error {
if err != nil {
return err
}
- ctr, err := createContainerFromCreateConfig(runtime, createConfig, ctx)
+ ctr, err := createContainerFromCreateConfig(runtime, createConfig, ctx, pod)
if err != nil {
return err
}