Merge remote-tracking branch 'origin' into standby_host_attrs

Author: eberlep

main.go

@@ -102,6 +102,7 @@ const (
 	podTopologySpreadConstraintMaxSkewFlg       = "pod-topology-spread-constraint-max-skew"
 	podTopologySpreadConstraintMinDomainsFlg    = "pod-topology-spread-constraint-min-domains"
 	enableStandbyHostAttrsFlg                   = "enable-standby-host-attrs"
+	enableSpiloReadinessProbeFlg                = "enable-spilo-readiness-probe"
 )
 
 var (
@@ -172,6 +173,7 @@ func main() {
 		podAntiaffinityPreferredDuringScheduling bool
 		enablePodTopologySpreadConstraintWebhook bool
 		enableStandbyHostAttrs                   bool
+		enableSpiloReadinessProbe                bool
 
 		portRangeStart                        int32
 		portRangeSize                         int32
@@ -377,6 +379,9 @@ func main() {
 	viper.SetDefault(enableStandbyHostAttrsFlg, false)
 	enableStandbyHostAttrs = viper.GetBool(enableStandbyHostAttrsFlg)
 
+	viper.SetDefault(enableSpiloReadinessProbeFlg, false)
+	enableSpiloReadinessProbe = viper.GetBool(enableSpiloReadinessProbeFlg)
+
 	ctrl.Log.Info("flag",
 		metricsAddrSvcMgrFlg, metricsAddrSvcMgr,
 		metricsAddrCtrlMgrFlg, metricsAddrCtrlMgr,
@@ -433,6 +438,7 @@ func main() {
 		podTopologySpreadConstraintMaxSkewFlg, podTopologySpreadConstraintMaxSkew,
 		podTopologySpreadConstraintMinDomainsFlg, podTopologySpreadConstraintMinDomains,
 		enableStandbyHostAttrsFlg, enableStandbyHostAttrs,
+		enableSpiloReadinessProbeFlg, enableSpiloReadinessProbe,
 	)
 
 	svcClusterConf := ctrl.GetConfigOrDie()
@@ -506,6 +512,7 @@ func main() {
 		PatroniFailsafeMode:                      enablePatroniFailsafeMode,
 		PodAntiaffinityPreferredDuringScheduling: podAntiaffinityPreferredDuringScheduling,
 		PodAntiaffinityTopologyKey:               podAntiaffinityTopologyKey,
+		EnableReadinessProbe:                     enableSpiloReadinessProbe,
 	}
 	opMgr, err := operatormanager.New(svcClusterConf, "external/svc-postgres-operator.yaml", scheme, ctrl.Log.WithName("OperatorManager"), opMgrOpts)
 	if err != nil {

pkg/operatormanager/operatormanager.go

@@ -72,6 +72,7 @@ type Options struct {
 	PatroniFailsafeMode                      bool
 	PodAntiaffinityPreferredDuringScheduling bool
 	PodAntiaffinityTopologyKey               string
+	EnableReadinessProbe                     bool
 }
 
 // OperatorManager manages the operator
@@ -456,6 +457,11 @@ func (m *OperatorManager) editConfigMap(cm *corev1.ConfigMap, namespace string,
 	cm.Data["postgres_superuser_teams"] = ""
 	cm.Data["teams_api_url"] = ""
 
+	if options.EnableReadinessProbe {
+		cm.Data["enable_readiness_probe"] = strconv.FormatBool(true)
+		cm.Data["pod_management_policy"] = "parallel"
+	}
+
 }
 
 // ensureCleanMetadata ensures obj has clean metadata