diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-05 05:08:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-05 05:08:28 -0700 |
| commit | e73bc58ace00573fd221477bde2c5d285e2b795d (patch) | |
| tree | b5f78f24e9c1d00c04b732dcb032e2cdbcf9e5b8 /cmd/podman | |
| parent | bda28c61dbab1796035d79aad91a0c52458b3dd8 (diff) | |
| parent | ebc8999fcfc72816eadd8f97640b36c79e4c6457 (diff) | |
| download | podman-e73bc58ace00573fd221477bde2c5d285e2b795d.tar.gz podman-e73bc58ace00573fd221477bde2c5d285e2b795d.tar.bz2 podman-e73bc58ace00573fd221477bde2c5d285e2b795d.zip | |
Merge pull request #2857 from giuseppe/kube-rootless
rootless: add support for kube
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/generate_kube.go | 4 | ||||
| -rw-r--r-- | cmd/podman/play_kube.go | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/cmd/podman/generate_kube.go b/cmd/podman/generate_kube.go index 42cfba8d8..c58372899 100644 --- a/cmd/podman/generate_kube.go +++ b/cmd/podman/generate_kube.go @@ -5,7 +5,6 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/rootless" podmanVersion "github.com/containers/libpod/version" "github.com/ghodss/yaml" "github.com/pkg/errors" @@ -53,9 +52,6 @@ func generateKubeYAMLCmd(c *cliconfig.GenerateKubeValues) error { servicePorts []v1.ServicePort ) - if rootless.IsRootless() { - return errors.Wrapf(libpod.ErrNotImplemented, "rootless users") - } args := c.InputArgs if len(args) != 1 { return errors.Errorf("you must provide exactly one container|pod ID or name") diff --git a/cmd/podman/play_kube.go b/cmd/podman/play_kube.go index b468a7a89..56d80070c 100644 --- a/cmd/podman/play_kube.go +++ b/cmd/podman/play_kube.go @@ -15,7 +15,6 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/image" ns "github.com/containers/libpod/pkg/namespaces" - "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/spec" "github.com/containers/storage" "github.com/cri-o/ocicni/pkg/ocicni" @@ -73,9 +72,6 @@ func playKubeYAMLCmd(c *cliconfig.KubePlayValues) error { ) ctx := getContext() - if rootless.IsRootless() { - return errors.Wrapf(libpod.ErrNotImplemented, "rootless users") - } args := c.InputArgs if len(args) > 1 { return errors.New("you can only play one kubernetes file at a time") @@ -243,6 +239,9 @@ func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container envs map[string]string ) + // The default for MemorySwappiness is -1, not 0 + containerConfig.Resources.MemorySwappiness = -1 + containerConfig.Runtime = runtime containerConfig.Image = containerYAML.Image containerConfig.ImageID = newImage.ID() |