diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/containers/create.go | 3 | ||||
| -rw-r--r-- | cmd/podman/pods/create.go | 53 |
2 files changed, 1 insertions, 55 deletions
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index c63c074f7..c88cf050e 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -224,6 +224,7 @@ func createInit(c *cobra.Command) error { } cliVals.Env = env } + if c.Flag("cgroups").Changed && cliVals.CGroupsMode == "split" && registry.IsRemote() { return errors.Errorf("the option --cgroups=%q is not supported in remote mode", cliVals.CGroupsMode) } @@ -293,8 +294,6 @@ func createPodIfNecessary(s *specgen.SpecGenerator, netOpts *entities.NetOptions Net: netOpts, CreateCommand: os.Args, Hostname: s.ContainerBasicConfig.Hostname, - Cpus: cliVals.CPUS, - CpusetCpus: cliVals.CPUSetCPUs, Pid: cliVals.PID, } // Unset config values we passed to the pod to prevent them being used twice for the container and pod. diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index abc47164b..0b446a599 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -5,13 +5,9 @@ import ( "fmt" "io/ioutil" "os" - "runtime" - "sort" - "strconv" "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/sysinfo" "github.com/containers/podman/v3/cmd/podman/common" "github.com/containers/podman/v3/cmd/podman/parse" "github.com/containers/podman/v3/cmd/podman/registry" @@ -20,7 +16,6 @@ import ( "github.com/containers/podman/v3/pkg/errorhandling" "github.com/containers/podman/v3/pkg/specgen" "github.com/containers/podman/v3/pkg/util" - "github.com/docker/docker/pkg/parsers" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -60,14 +55,6 @@ func init() { common.DefineNetFlags(createCommand) - cpusetflagName := "cpuset-cpus" - flags.StringVar(&createOptions.CpusetCpus, cpusetflagName, "", "CPUs in which to allow execution") - _ = createCommand.RegisterFlagCompletionFunc(cpusetflagName, completion.AutocompleteDefault) - - cpusflagName := "cpus" - flags.Float64Var(&createOptions.Cpus, cpusflagName, 0.000, "set amount of CPUs for the pod") - _ = createCommand.RegisterFlagCompletionFunc(cpusflagName, completion.AutocompleteDefault) - cgroupParentflagName := "cgroup-parent" flags.StringVar(&createOptions.CGroupParent, cgroupParentflagName, "", "Set parent cgroup for the pod") _ = createCommand.RegisterFlagCompletionFunc(cgroupParentflagName, completion.AutocompleteDefault) @@ -211,46 +198,6 @@ func create(cmd *cobra.Command, args []string) error { } } - numCPU := sysinfo.NumCPU() - if numCPU == 0 { - numCPU = runtime.NumCPU() - } - if createOptions.Cpus > float64(numCPU) { - createOptions.Cpus = float64(numCPU) - } - copy := createOptions.CpusetCpus - cpuSet := createOptions.Cpus - if cpuSet == 0 { - cpuSet = float64(sysinfo.NumCPU()) - } - ret, err := parsers.ParseUintList(copy) - copy = "" - if err != nil { - errors.Wrapf(err, "could not parse list") - } - var vals []int - for ind, val := range ret { - if val { - vals = append(vals, ind) - } - } - sort.Ints(vals) - for ind, core := range vals { - if core > int(cpuSet) { - if copy == "" { - copy = "0-" + strconv.Itoa(int(cpuSet)) - createOptions.CpusetCpus = copy - break - } else { - createOptions.CpusetCpus = copy - break - } - } else if ind != 0 { - copy += "," + strconv.Itoa(core) - } else { - copy = "" + strconv.Itoa(core) - } - } response, err := registry.ContainerEngine().PodCreate(context.Background(), createOptions) if err != nil { return err |