test fixup

Author: hughcapet

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -636,7 +636,7 @@ spec:
               patroni:
                 type: object
                 properties:
-                  enable_failsafe_mode:
+                  failsafe_mode:
                     type: boolean
                     default: false
           status:

charts/postgres-operator/values.yaml

@@ -411,7 +411,7 @@ configConnectionPooler:
 
 configPatroni:
   # enable Patroni DCS failsafe_mode feature
-  enable_failsafe_mode: false
+  failsafe_mode: false
 
 # Zalando's internal CDC stream feature
 enableStreams: false

e2e/tests/test_e2e.py

@@ -366,7 +366,7 @@ def test_config_update(self):
                     "loop_wait": 9,
                     "retry_timeout": 9,
                     "synchronous_mode": True,
-                    "failsafe_mode": True,
+                    "enable_failsafe_mode": True,
                  }
             }
         }
@@ -393,7 +393,7 @@ def compare_config():
                             "retry_timeout not updated")
                 self.assertEqual(desired_config["synchronous_mode"], effective_config["synchronous_mode"],
                             "synchronous_mode not updated")
-                self.assertEqual(desired_config["failsafe_mode"], effective_config["failsafe_mode"],
+                self.assertEqual(desired_config["enable_failsafe_mode"], effective_config["enable_failsafe_mode"],
                             "failsafe_mode not updated")
                 return True
 

manifests/operatorconfiguration.crd.yaml

@@ -634,7 +634,7 @@ spec:
               patroni:
                 type: object
                 properties:
-                  enable_failsafe_mode:
+                  failsafe_mode:
                     type: boolean
                     default: false
           status:

manifests/postgresql-operator-default-configuration.yaml

@@ -199,4 +199,4 @@ configuration:
     # connection_pooler_schema: "pooler"
     # connection_pooler_user: "pooler"
   patroni:
-    # enable_failsafe_mode: "false"
+    # failsafe_mode: "false"

pkg/apis/acid.zalan.do/v1/operator_configuration_type.go

@@ -229,7 +229,7 @@ type OperatorLogicalBackupConfiguration struct {
 
 // PatroniConfiguration defines configuration for Patroni
 type PatroniConfiguration struct {
-	EnableFailsafeMode bool `json:"enable_failsafe_mode,omitempty"`
+	FailsafeMode *bool `json:"failsafe_mode,omitempty"`
 }
 
 // OperatorConfigurationData defines the operation config

pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go

@@ -59,7 +59,7 @@ type patroniDCS struct {
 	SynchronousNodeCount     uint32                       `json:"synchronous_node_count,omitempty"`
 	PGBootstrapConfiguration map[string]interface{}       `json:"postgresql,omitempty"`
 	Slots                    map[string]map[string]string `json:"slots,omitempty"`
-	FailsafeMode             bool                         `json:"failsafe_mode,omitempty"`
+	FailsafeMode             *bool                        `json:"failsafe_mode,omitempty"`
 }
 
 type pgBootstrap struct {
@@ -380,9 +380,9 @@ PatroniInitDBParams:
 		config.Bootstrap.DCS.SynchronousNodeCount = patroni.SynchronousNodeCount
 	}
 	if patroni.FailsafeMode != nil {
-		config.Bootstrap.DCS.FailsafeMode = *patroni.FailsafeMode
-	} else {
-		config.Bootstrap.DCS.FailsafeMode = opConfig.EnablePatroniFailsafeMode
+		config.Bootstrap.DCS.FailsafeMode = patroni.FailsafeMode
+	} else if opConfig.FailsafeMode != nil {
+		config.Bootstrap.DCS.FailsafeMode = opConfig.FailsafeMode
 	}
 
 	config.PgLocalConfiguration = make(map[string]interface{})

pkg/cluster/k8sres.go

@@ -118,7 +118,7 @@ func TestGenerateSpiloJSONConfiguration(t *testing.T) {
 				Auth: config.Auth{
 					PamRoleName: "zalandos",
 				},
-				EnablePatroniFailsafeMode: true,
+				FailsafeMode: util.True(),
 			},
 			result: `{"postgresql":{"bin_dir":"/usr/lib/postgresql/14/bin"},"bootstrap":{"initdb":[{"auth-host":"md5"},{"auth-local":"trust"}],"users":{"zalandos":{"password":"","options":["CREATEDB","NOLOGIN"]}},"dcs":{"failsafe_mode":true}}}`,
 		},
@@ -132,9 +132,9 @@ func TestGenerateSpiloJSONConfiguration(t *testing.T) {
 				Auth: config.Auth{
 					PamRoleName: "zalandos",
 				},
-				EnablePatroniFailsafeMode: true,
+				FailsafeMode: util.True(),
 			},
-			result: `{"postgresql":{"bin_dir":"/usr/lib/postgresql/14/bin"},"bootstrap":{"initdb":[{"auth-host":"md5"},{"auth-local":"trust"}],"users":{"zalandos":{"password":"","options":["CREATEDB","NOLOGIN"]}},"dcs":{}}}`,
+			result: `{"postgresql":{"bin_dir":"/usr/lib/postgresql/14/bin"},"bootstrap":{"initdb":[{"auth-host":"md5"},{"auth-local":"trust"}],"users":{"zalandos":{"password":"","options":["CREATEDB","NOLOGIN"]}},"dcs":{"failsafe_mode":false}}}`,
 		},
 		{
 			subtest: "Patroni failsafe_mode disabled globally, configured for cluster",
@@ -146,7 +146,7 @@ func TestGenerateSpiloJSONConfiguration(t *testing.T) {
 				Auth: config.Auth{
 					PamRoleName: "zalandos",
 				},
-				EnablePatroniFailsafeMode: false,
+				FailsafeMode: util.False(),
 			},
 			result: `{"postgresql":{"bin_dir":"/usr/lib/postgresql/14/bin"},"bootstrap":{"initdb":[{"auth-host":"md5"},{"auth-local":"trust"}],"users":{"zalandos":{"password":"","options":["CREATEDB","NOLOGIN"]}},"dcs":{"failsafe_mode":true}}}`,
 		},

pkg/cluster/k8sres_test.go

@@ -566,8 +566,8 @@ func (c *Cluster) checkAndSetGlobalPostgreSQLConfiguration(pod *v1.Pod, effectiv
 	if desiredPatroniConfig.TTL > 0 && desiredPatroniConfig.TTL != effectivePatroniConfig.TTL {
 		configToSet["ttl"] = desiredPatroniConfig.TTL
 	}
-	if desiredPatroniConfig.FailsafeMode != effectivePatroniConfig.FailsafeMode {
-		configToSet["failsafe_mode"] = desiredPatroniConfig.FailsafeMode
+	if desiredPatroniConfig.FailsafeMode != nil {
+		configToSet["failsafe_mode"] = *desiredPatroniConfig.FailsafeMode
 	}
 
 	// check if specified slots exist in config and if they differ