From 29ef52ab74fc3d480b548cd997bbf281ea716f60 Mon Sep 17 00:00:00 2001
From: Sergey Dudoladov <sergey.dudoladov@zalando.de>
Date: Thu, 7 Mar 2019 15:56:22 +0100
Subject: [PATCH] add podManagementPolicy
---
docs/reference/operator_parameters.md | 5 +++++
manifests/configmap.yaml | 1 +
pkg/cluster/k8sres.go | 12 +++++++++++-
pkg/util/config/config.go | 1 +
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md
index 5b5f3319..6332e6d8 100644
--- a/docs/reference/operator_parameters.md
+++ b/docs/reference/operator_parameters.md
@@ -226,6 +226,11 @@ configuration they are grouped under the `kubernetes` key.
[topology key](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#interlude-built-in-node-labels)
for pod anti affinity. The default is `kubernetes.io/hostname`.
+* **pod_management_policy**
+ specify the
+ [pod management policy](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies)
+ of stateful sets of PG clusters. The default is `ordered_ready`, the second possible value is `parallel`.
+
## Kubernetes resource requests
This group allows you to configure resource requests for the Postgres pods.
diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
index 97ff9a2b..28babdfe 100644
--- a/manifests/configmap.yaml
+++ b/manifests/configmap.yaml
@@ -44,6 +44,7 @@ data:
pod_terminate_grace_period: 5m
pod_deletion_wait_timeout: 10m
pod_label_wait_timeout: 10m
+ pod_management_policy: "ordered_ready"
ready_wait_interval: 3s
ready_wait_timeout: 30s
# master_pod_move_timeout: 10m
diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
index 25893224..6f86edd8 100644
--- a/pkg/cluster/k8sres.go
+++ b/pkg/cluster/k8sres.go
@@ -860,9 +860,18 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*v1beta1.State
// the operator has domain-specific logic on how to do rolling updates of PG clusters
// so we do not use default rolling updates implemented by stateful sets
- // that leaves "OnDelete" update strategy as the only option
+ // that leaves the legacy "OnDelete" update strategy as the only option
updateStrategy := v1beta1.StatefulSetUpdateStrategy{Type: v1beta1.OnDeleteStatefulSetStrategyType}
+ var podManagementPolicy v1beta1.PodManagementPolicyType
+ if c.OpConfig.PodManagementPolicy == "ordered_ready" {
+ podManagementPolicy = v1beta1.OrderedReadyPodManagement
+ } else if c.OpConfig.PodManagementPolicy == "parallel" {
+ podManagementPolicy = v1beta1.ParallelPodManagement
+ } else {
+ return nil, fmt.Errorf("could not set the pod management policy to the unknown value: %v", c.OpConfig.PodManagementPolicy)
+ }
+
statefulSet := &v1beta1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{
Name: c.statefulSetName(),
@@ -877,6 +886,7 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*v1beta1.State
Template: *podTemplate,
VolumeClaimTemplates: []v1.PersistentVolumeClaim{*volumeClaimTemplate},
UpdateStrategy: updateStrategy,
+ PodManagementPolicy: podManagementPolicy,
},
}
diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go
index 3ea8874c..b52c5787 100644
--- a/pkg/util/config/config.go
+++ b/pkg/util/config/config.go
@@ -109,6 +109,7 @@ type Config struct {
ClusterHistoryEntries int `name:"cluster_history_entries" default:"1000"`
TeamAPIRoleConfiguration map[string]string `name:"team_api_role_configuration" default:"log_statement:all"`
PodTerminateGracePeriod time.Duration `name:"pod_terminate_grace_period" default:"5m"`
+ PodManagementPolicy string `name:"pod_management_policy" default:"ordered_ready"`
ProtectedRoles []string `name:"protected_role_names" default:"admin"`
PostgresSuperuserTeams []string `name:"postgres_superuser_teams" default:""`
SetMemoryRequestToLimit bool `name:"set_memory_request_to_limit" defaults:"false"`
--
GitLab