Merge branch 'master' into arbiter

kubedb · Dec 11, 2024 · c159b01 · c159b01
2 parents 0427a35 + 5c754b0
commit c159b01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/apis/kubedb/v1/postgres_helpers.go b/apis/kubedb/v1/postgres_helpers.go
@@ -199,7 +199,9 @@ func (p *Postgres) SetDefaults(postgresVersion *catalog.PostgresVersion) {
 	if p == nil {
 		return
 	}
-
+	if p.Spec.StandbyMode == nil {
+		p.Spec.StandbyMode = ptr.To(HotPostgresStandbyMode)
+	}
 	if p.Spec.StorageType == "" {
 		p.Spec.StorageType = StorageTypeDurable
 	}

diff --git a/apis/kubedb/v1alpha2/postgres_helpers.go b/apis/kubedb/v1alpha2/postgres_helpers.go
@@ -189,6 +189,9 @@ func (p *Postgres) SetDefaults(postgresVersion *catalog.PostgresVersion, topolog
 	if p == nil {
 		return
 	}
+	if p.Spec.StandbyMode == nil {
+		p.Spec.StandbyMode = ptr.To(HotPostgresStandbyMode)
+	}
 
 	if p.Spec.StorageType == "" {
 		p.Spec.StorageType = StorageTypeDurable

diff --git a/apis/ops/v1alpha1/constant.go b/apis/ops/v1alpha1/constant.go
@@ -159,9 +159,10 @@ const (
 
 // Elasticsearch Constant
 const (
-	PrepareCustomConfig       = "PrepareCustomConfig"
-	PrepareSecureCustomConfig = "PrepareSecureCustomConfig"
-	ReconfigureSecurityAdmin  = "ReconfigureSecurityAdmin"
+	PrepareCustomConfig               = "PrepareCustomConfig"
+	PrepareSecureCustomConfig         = "PrepareSecureCustomConfig"
+	ReconfigureSecurityAdmin          = "ReconfigureSecurityAdmin"
+	DisabledMasterNodeShardAllocation = "DisabledMasterNodeShardAllocation"
 
 	HorizontalScaleMasterNode       = "HorizontalScaleMasterNode"
 	HorizontalScaleDataNode         = "HorizontalScaleDataNode"