Merge branch 'main' into update_pw_hashing_algorithm

Author: eberlep

api/v1/postgres_types.go

@@ -73,7 +73,7 @@ const (
 	teamIDPrefix = "pg"
 
 	DefaultPatroniParamValueLoopWait     uint32 = 10
-	DefaultPatroniParamValueRetryTimeout uint32 = 60
+	DefaultPatroniParamValueRetryTimeout uint32 = 10
 
 	defaultPostgresParamValueTCPKeepAlivesIdle      = "200"
 	defaultPostgresParamValueTCPKeepAlivesInterval  = "30"

main.go

@@ -151,8 +151,8 @@ func main() {
 		enablePatroniFailsafeMode           bool
 		enableFsGroupChangePolicyWebhook    bool
 
-		portRangeStart                        int
-		portRangeSize                         int
+		portRangeStart                        int32
+		portRangeSize                         int32
 		replicationChangeRequeueTimeInSeconds int
 
 		patroniTTL          uint32
@@ -200,9 +200,9 @@ func main() {
 
 	// todo: Check the default port range start and size.
 	viper.SetDefault(portRangeStartFlg, 32000)
-	portRangeStart = viper.GetInt(portRangeStartFlg)
+	portRangeStart = viper.GetInt32(portRangeStartFlg)
 	viper.SetDefault(portRangeSizeFlg, 8000)
-	portRangeSize = viper.GetInt(portRangeSizeFlg)
+	portRangeSize = viper.GetInt32(portRangeSizeFlg)
 
 	viper.SetDefault(customPSPNameFlg, "postgres-operator-psp")
 	pspName = viper.GetString(customPSPNameFlg)
@@ -440,8 +440,8 @@ func main() {
 
 	var lbMgrOpts lbmanager.Options = lbmanager.Options{
 		LBIP:                        lbIP,
-		PortRangeStart:              int32(portRangeStart), // nolint
-		PortRangeSize:               int32(portRangeSize),  // nolint
+		PortRangeStart:              portRangeStart,
+		PortRangeSize:               portRangeSize,
 		EnableStandbyLeaderSelector: enableStandbyLeaderSelector,
 		EnableLegacyStandbySelector: enableLegacyStandbySelector,
 		StandbyClustersSourceRanges: standbyClusterSourceRanges,