opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-10 15:23:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2857 from giuseppe/kube-rootless

Browse Source 
rootless: add support for kube
This commit is contained in:
OpenShift Merge Robot
2019-04-05 05:08:28 -07:00
committed by GitHub
parent bda28c61db ebc8999fcf
commit e73bc58ace
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/generate_kube.go
View File

@ -5,7 +5,6 @@ import (
"github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/cmd/podman/libpodruntime"
"github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod"
"github.com/containers/libpod/pkg/rootless"
podmanVersion "github.com/containers/libpod/version" podmanVersion "github.com/containers/libpod/version"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -53,9 +52,6 @@ func generateKubeYAMLCmd(c *cliconfig.GenerateKubeValues) error {
servicePorts []v1.ServicePort servicePorts []v1.ServicePort
) )
if rootless.IsRootless() {
return errors.Wrapf(libpod.ErrNotImplemented, "rootless users")
}
args := c.InputArgs args := c.InputArgs
if len(args) != 1 { if len(args) != 1 {
return errors.Errorf("you must provide exactly one container|pod ID or name") return errors.Errorf("you must provide exactly one container|pod ID or name")

7
cmd/podman/play_kube.go
View File

@ -15,7 +15,6 @@ import (
"github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod"
"github.com/containers/libpod/libpod/image" "github.com/containers/libpod/libpod/image"
ns "github.com/containers/libpod/pkg/namespaces" ns "github.com/containers/libpod/pkg/namespaces"
"github.com/containers/libpod/pkg/rootless"
"github.com/containers/libpod/pkg/spec" "github.com/containers/libpod/pkg/spec"
"github.com/containers/storage" "github.com/containers/storage"
"github.com/cri-o/ocicni/pkg/ocicni" "github.com/cri-o/ocicni/pkg/ocicni"
@ -73,9 +72,6 @@ func playKubeYAMLCmd(c *cliconfig.KubePlayValues) error {
) )
ctx := getContext() ctx := getContext()
if rootless.IsRootless() {
return errors.Wrapf(libpod.ErrNotImplemented, "rootless users")
}
args := c.InputArgs args := c.InputArgs
if len(args) > 1 { if len(args) > 1 {
return errors.New("you can only play one kubernetes file at a time") 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 envs map[string]string
) )
// The default for MemorySwappiness is -1, not 0
containerConfig.Resources.MemorySwappiness = -1
containerConfig.Runtime = runtime containerConfig.Runtime = runtime
containerConfig.Image = containerYAML.Image containerConfig.Image = containerYAML.Image
containerConfig.ImageID = newImage.ID() containerConfig.ImageID = newImage.ID()

4
test/e2e/generate_kube_test.go
View File

@ -48,7 +48,6 @@ var _ = Describe("Podman generate kube", func() {
}) })
It("podman generate kube on container", func() { It("podman generate kube on container", func() {
SkipIfRootless()
session := podmanTest.RunTopContainer("top") session := podmanTest.RunTopContainer("top")
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -62,7 +61,6 @@ var _ = Describe("Podman generate kube", func() {
}) })
It("podman generate service kube on container", func() { It("podman generate service kube on container", func() {
SkipIfRootless()
session := podmanTest.RunTopContainer("top") session := podmanTest.RunTopContainer("top")
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -76,7 +74,6 @@ var _ = Describe("Podman generate kube", func() {
}) })
It("podman generate kube on pod", func() { It("podman generate kube on pod", func() {
SkipIfRootless()
_, rc, _ := podmanTest.CreatePod("toppod") _, rc, _ := podmanTest.CreatePod("toppod")
Expect(rc).To(Equal(0)) Expect(rc).To(Equal(0))
@ -93,7 +90,6 @@ var _ = Describe("Podman generate kube", func() {
}) })
It("podman generate service kube on pod", func() { It("podman generate service kube on pod", func() {
SkipIfRootless()
_, rc, _ := podmanTest.CreatePod("toppod") _, rc, _ := podmanTest.CreatePod("toppod")
Expect(rc).To(Equal(0)) Expect(rc).To(Equal(0))