opensourcemirror
/
concourse
mirror of https://github.com/concourse/concourse.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6031 from concourse/default-pool 

Add new default values Guardian network-pool and max-containers
This commit is contained in:
Muntasir Chowdhury 2020-09-21 09:46:11 -04:00 committed by GitHub
parent 659557ea79 58d6caebbd
commit 64a12a7023
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worker/workercmd/guardian.go
View File

@ -7,6 +7,7 @@ import (
"os"
"os/exec"
"path/filepath"
"strconv"
"strings"
"syscall"
@ -52,6 +53,10 @@ func (cmd *WorkerCommand) guardianRunner(logger lager.Logger) (ifrit.Runner, err
}
gdnServerFlags = append(gdnServerFlags, detectGuardianFlags(logger)...)
gdnServerFlags = append(gdnServerFlags,
"--max-containers", strconv.Itoa(cmd.Guardian.MaxContainers),
"--network-pool", cmd.Guardian.NetworkPool,
)
if cmd.Guardian.DNS.Enable {
dnsProxyRunner, err := cmd.dnsProxyRunner(logger.Session("dns-proxy"))
@ -104,6 +109,7 @@ func (cmd *WorkerCommand) guardianRunner(logger lager.Logger) (ifrit.Runner, err
return grouper.NewParallel(os.Interrupt, members), nil
}
// This won't detect flags listed in the GuardianRuntime struct
func detectGuardianFlags(logger lager.Logger) []string {
env := os.Environ()

8
worker/workercmd/worker_linux.go
View File

@ -32,6 +32,10 @@ type GuardianRuntime struct {
Config flag.File `long:"config" description:"Path to a config file to use for the Garden backend. Guardian flags as env vars, e.g. 'CONCOURSE_GARDEN_FOO_BAR=a,b' for '--foo-bar a --foo-bar b'."`
DNS DNSConfig `group:"DNS Proxy Configuration" namespace:"dns-proxy"`
RequestTimeout time.Duration `long:"request-timeout" default:"5m" description:"How long to wait for requests to the Garden server to complete. 0 means no timeout."`
//Guardian specific flags - these are passed along as-is to the gdn binary as options. The defaults have been defined to suite Concourse.
MaxContainers int `long:"max-containers" default:"250" description:"Max container capacity. 0 means no limit."`
NetworkPool string `long:"network-pool" default:"10.80.0.0/16" description:"Network range to use for dynamically allocated container subnets."`
}
type ContainerdRuntime struct {
@ -43,7 +47,7 @@ type ContainerdRuntime struct {
DNS DNSConfig `group:"DNS Proxy Configuration" namespace:"dns-proxy"`
DNSServers []string `long:"dns-server" description:"DNS server IP address to use instead of automatically determined servers. Can be specified multiple times."`
RestrictedNetworks []string `long:"restricted-network" description:"Network ranges to which traffic from containers will be restricted. Can be specified multiple times."`
MaxContainers int `long:"max-containers" default:"0" description:"Max container capacity. 0 means no limit."`
MaxContainers int `long:"max-containers" default:"250" description:"Max container capacity. 0 means no limit."`
NetworkPool string `long:"network-pool" default:"10.80.0.0/16" description:"Network range to use for dynamically allocated container subnets."`
}
@ -238,4 +242,4 @@ func (cmd *WorkerCommand) verifyRuntimeFlags() error {
}
return nil
}
}