chaos/drone-runner-podman
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add global resource limmits

Browse Source
This commit is contained in:
Brad Rydzewski
2019-10-29 13:08:42 -07:00
parent 3c1ae23a1e
commit 3761bd0df4
10 changed files with 49 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
command/compile.go
View File

@@ -183,13 +183,10 @@ func registerCompile(app *kingpin.Application) {
Int64Var(&c.Resources.CPUShares)
cmd.Flag("memory", "container memory limit").
Int64Var(&c.Resources.MemLimit)
Int64Var(&c.Resources.Memory)
cmd.Flag("memory-swap", "container memory swap limit").
Int64Var(&c.Resources.MemSwapLimit)
cmd.Flag("shmsize", "container shm size").
Int64Var(&c.Resources.ShmSize)
Int64Var(&c.Resources.MemorySwap)
cmd.Flag("docker-config", "path to the docker config file").
StringVar(&c.Config)

9
command/daemon/config.go
View File

@@ -73,6 +73,15 @@ type Config struct {
Trusted bool `envconfig:"DRONE_LIMIT_TRUSTED"`
}
Resources struct {
Memory int64 `envconfig:"DRONE_MEMORY_LIMIT"`
MemorySwap int64 `envconfig:"DRONE_MEMORY_SWAP_LIMIT"`
CPUQuota int64 `envconfig:"DRONE_CPU_QUOTA"`
CPUPeriod int64 `envconfig:"DRONE_CPU_PERIOD"`
CPUShares int64 `envconfig:"DRONE_CPU_SHARES"`
CPUSet []string `envconfig:"DRONE_CPU_SET"`
}
Secret struct {
Endpoint string `envconfig:"DRONE_SECRET_PLUGIN_ENDPOINT"`
Token string `envconfig:"DRONE_SECRET_PLUGIN_TOKEN"`

9
command/daemon/daemon.go
View File

@@ -123,7 +123,14 @@ func (c *daemonCommand) run(*kingpin.ParseContext) error {
Privileged: append(config.Runner.Privileged, compiler.Privileged...),
Networks: config.Runner.Networks,
Volumes: config.Runner.Volumes,
// Resources: nil,
Resources: compiler.Resources{
Memory: config.Resources.Memory,
MemorySwap: config.Resources.MemorySwap,
CPUQuota: config.Resources.CPUQuota,
CPUPeriod: config.Resources.CPUPeriod,
CPUShares: config.Resources.CPUShares,
CPUSet: config.Resources.CPUSet,
},
Registry: registry.Combine(
registry.File(
config.Docker.Config,

7
command/exec.go
View File

@@ -313,13 +313,10 @@ func registerExec(app *kingpin.Application) {
Int64Var(&c.Resources.CPUShares)
cmd.Flag("memory", "container memory limit").
Int64Var(&c.Resources.MemLimit)
Int64Var(&c.Resources.Memory)
cmd.Flag("memory-swap", "container memory swap limit").
Int64Var(&c.Resources.MemSwapLimit)
cmd.Flag("shmsize", "container shm size").
Int64Var(&c.Resources.ShmSize)
Int64Var(&c.Resources.MemorySwap)
cmd.Flag("public-key", "public key file path").
ExistingFileVar(&c.PublicKey)