Merge branch 'master' into git-sync

kubedb · Aug 18, 2023 · 47d6f89 · 47d6f89
2 parents 92a94b3 + eec599f
commit 47d6f89
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 1 deletion.
diff --git a/apis/kubedb/v1alpha2/constants.go b/apis/kubedb/v1alpha2/constants.go
@@ -621,7 +621,6 @@ const (
 	KafkaTransactionSateLogMinISR        = "transaction.state.log.min.isr"
 	KafkaLogCleanerMinLagSec             = "log.cleaner.min.compaction.lag.ms"
 	KafkaLogCleanerBackoffMS             = "log.cleaner.backoff.ms"
-	KafkaListenerNameRackRaft            = "listener.name.internal.rack-raft.enabled"
 
 	KafkaCCKubernetesMode                 = "cruise.control.metrics.reporter.kubernetes.mode"
 	KafkaCCBootstrapServers               = "cruise.control.metrics.reporter.bootstrap.servers"

diff --git a/apis/kubedb/v1alpha2/elasticsearch_helpers.go b/apis/kubedb/v1alpha2/elasticsearch_helpers.go
@@ -33,6 +33,7 @@ import (
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
 	"kmodules.xyz/client-go/apiextensions"
@@ -412,6 +413,9 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
 		if e.Spec.Topology.Ingest.Replicas == nil {
 			e.Spec.Topology.Ingest.Replicas = pointer.Int32P(1)
 		}
+		if e.Spec.Topology.Ingest.MaxUnavailable == nil && *e.Spec.Topology.Ingest.Replicas > 1 {
+			e.Spec.Topology.Ingest.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+		}
 
 		// Required nodes, must exist!
 		// Default to "master"
@@ -422,6 +426,9 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
 		if e.Spec.Topology.Master.Replicas == nil {
 			e.Spec.Topology.Master.Replicas = pointer.Int32P(1)
 		}
+		if e.Spec.Topology.Master.MaxUnavailable == nil && *e.Spec.Topology.Master.Replicas > 1 {
+			e.Spec.Topology.Master.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+		}
 
 		// Optional nodes, when other type of data nodes are not empty.
 		// Otherwise required nodes.
@@ -434,6 +441,9 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
 			if e.Spec.Topology.Data.Replicas == nil {
 				e.Spec.Topology.Data.Replicas = pointer.Int32P(1)
 			}
+			if e.Spec.Topology.Data.MaxUnavailable == nil && *e.Spec.Topology.Data.Replicas > 1 {
+				e.Spec.Topology.Data.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+			}
 		}
 
 		// Optional, can be empty
@@ -446,6 +456,9 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
 			if e.Spec.Topology.DataHot.Replicas == nil {
 				e.Spec.Topology.DataHot.Replicas = pointer.Int32P(1)
 			}
+			if e.Spec.Topology.DataHot.MaxUnavailable == nil && *e.Spec.Topology.DataHot.Replicas > 1 {
+				e.Spec.Topology.DataHot.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+			}
 		}
 
 		// Optional, can be empty
@@ -458,6 +471,9 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
 			if e.Spec.Topology.DataWarm.Replicas == nil {
 				e.Spec.Topology.DataWarm.Replicas = pointer.Int32P(1)
 			}
+			if e.Spec.Topology.DataWarm.MaxUnavailable == nil && *e.Spec.Topology.DataWarm.Replicas > 1 {
+				e.Spec.Topology.DataWarm.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+			}
 		}
 
 		// Optional, can be empty
@@ -470,6 +486,9 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
 			if e.Spec.Topology.DataCold.Replicas == nil {
 				e.Spec.Topology.DataCold.Replicas = pointer.Int32P(1)
 			}
+			if e.Spec.Topology.DataCold.MaxUnavailable == nil && *e.Spec.Topology.DataCold.Replicas > 1 {
+				e.Spec.Topology.DataCold.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+			}
 		}
 
 		// Optional, can be empty
@@ -482,6 +501,9 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
 			if e.Spec.Topology.DataFrozen.Replicas == nil {
 				e.Spec.Topology.DataFrozen.Replicas = pointer.Int32P(1)
 			}
+			if e.Spec.Topology.DataFrozen.MaxUnavailable == nil && *e.Spec.Topology.DataFrozen.Replicas > 1 {
+				e.Spec.Topology.DataFrozen.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+			}
 		}
 
 		// Optional, can be empty
@@ -494,6 +516,9 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
 			if e.Spec.Topology.DataContent.Replicas == nil {
 				e.Spec.Topology.DataContent.Replicas = pointer.Int32P(1)
 			}
+			if e.Spec.Topology.DataContent.MaxUnavailable == nil && *e.Spec.Topology.DataContent.Replicas > 1 {
+				e.Spec.Topology.DataContent.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+			}
 		}
 
 		// Optional, can be empty
@@ -506,6 +531,9 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
 			if e.Spec.Topology.ML.Replicas == nil {
 				e.Spec.Topology.ML.Replicas = pointer.Int32P(1)
 			}
+			if e.Spec.Topology.ML.MaxUnavailable == nil && *e.Spec.Topology.ML.Replicas > 1 {
+				e.Spec.Topology.ML.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+			}
 		}
 
 		// Optional, can be empty
@@ -518,13 +546,19 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
 			if e.Spec.Topology.Transform.Replicas == nil {
 				e.Spec.Topology.Transform.Replicas = pointer.Int32P(1)
 			}
+			if e.Spec.Topology.Transform.MaxUnavailable == nil && *e.Spec.Topology.Transform.Replicas > 1 {
+				e.Spec.Topology.Transform.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+			}
 		}
 
 	} else {
 		apis.SetDefaultResourceLimits(&e.Spec.PodTemplate.Spec.Resources, DefaultResourcesElasticSearch)
 		if e.Spec.Replicas == nil {
 			e.Spec.Replicas = pointer.Int32P(1)
 		}
+		if e.Spec.MaxUnavailable == nil && *e.Spec.Replicas > 1 {
+			e.Spec.MaxUnavailable = &intstr.IntOrString{IntVal: 1}
+		}
 	}
 
 	// set default kernel settings

diff --git a/apis/kubedb/v1alpha2/kafka_webhook.go b/apis/kubedb/v1alpha2/kafka_webhook.go
@@ -193,6 +193,8 @@ var availableVersions = []string{
 	"3.3.0",
 	"3.3.2",
 	"3.4.0",
+	"3.4.1",
+	"3.5.1",
 }
 
 func validateVersion(db *Kafka) error {

diff --git a/apis/postgres/v1alpha1/publisher_types.go b/apis/postgres/v1alpha1/publisher_types.go
@@ -126,6 +126,10 @@ const (
 	PublisherMessageAllTablesNotFound    PublisherMessage       = "All tables are not found"
 	PublisherMessageAllTablesFound       PublisherMessage       = "All tables are found"
 
+	PublisherConditionTypeReplicaIdentityFound PublisherConditionType = "ReplicaIdentityFound"
+	PublisherMessageReplicaIdentityNotFound    PublisherMessage       = "Replica identity is not found"
+	PublisherMessageReplicaIdentityFound       PublisherMessage       = "Replica identity is found"
+
 	PublisherConditionTypePublicationSuccessful PublisherConditionType = "PublicationSuccessful"
 	PublisherMessagePublicationIsSuccessful     PublisherMessage       = "Publication is successful"
 	PublisherMessagePublicationIsNotSuccessful  PublisherMessage       = "Publication is not successful"