public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make pod termination grace period configurable

This commit is contained in:
Murat Kabilov 2017-08-18 16:52:19 +02:00 committed by GitHub
parent 5ff6d6a636 71dfb33b2b
commit f44c8e1206
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/configmap.yaml
View File

@ -31,3 +31,4 @@ data:
enable_load_balancer: "true" enable_load_balancer: "true"
api_port: "8080" api_port: "8080"
ring_log_lines: "100" ring_log_lines: "100"
pod_terminate_grace_period: 5m

2
pkg/cluster/k8sres.go
View File

@ -303,7 +303,7 @@ func (c *Cluster) generatePodTemplate(resourceRequirements *v1.ResourceRequireme
Privileged: &privilegedMode, Privileged: &privilegedMode,
}, },
} }
terminateGracePeriodSeconds := int64(30) terminateGracePeriodSeconds := int64(c.OpConfig.PodTerminateGracePeriod.Seconds())
podSpec := v1.PodSpec{ podSpec := v1.PodSpec{
ServiceAccountName: c.OpConfig.ServiceAccountName, ServiceAccountName: c.OpConfig.ServiceAccountName,

2
pkg/util/config/config.go
View File

@ -63,6 +63,8 @@ type Config struct {
Workers uint32 `name:"workers" default:"4"` Workers uint32 `name:"workers" default:"4"`
APIPort int `name:"api_port" default:"8080"` APIPort int `name:"api_port" default:"8080"`
RingLogLines int `name:"ring_log_lines" default:"100"` RingLogLines int `name:"ring_log_lines" default:"100"`
PodTerminateGracePeriod time.Duration `name:"pod_terminate_grace_period" default:"5m"`
} }
// MustMarshal marshals the config or panics // MustMarshal marshals the config or panics