Add autoscaler api for solr (#1330)

* Update autoscaler api for solr Signed-off-by: pritamdas99 <[email protected]>
kubedb · Nov 7, 2024 · 51975b8 · 51975b8
1 parent 3a305bf
commit 51975b8
Show file tree

Hide file tree

Showing 7 changed files with 368 additions and 13 deletions.
diff --git a/apis/autoscaling/v1alpha1/openapi_generated.go b/apis/autoscaling/v1alpha1/openapi_generated.go
diff --git a/apis/autoscaling/v1alpha1/solr_types.go b/apis/autoscaling/v1alpha1/solr_types.go
@@ -71,11 +71,20 @@ type SolrComputeAutoscalerSpec struct {
 	// +optional
 	NodeTopology *NodeTopology `json:"nodeTopology,omitempty"`
 
-	Solr *ComputeAutoscalerSpec `json:"solr,omitempty"`
+	Node        *ComputeAutoscalerSpec `json:"node,omitempty"`
+	Overseer    *ComputeAutoscalerSpec `json:"overseer,omitempty"`
+	Data        *ComputeAutoscalerSpec `json:"data,omitempty"`
+	Coordinator *ComputeAutoscalerSpec `json:"coordinator,omitempty"`
 }
 
 type SolrStorageAutoscalerSpec struct {
-	Solr *StorageAutoscalerSpec `json:"solr,omitempty"`
+	// +optional
+	NodeTopology *NodeTopology `json:"nodeTopology,omitempty"`
+
+	Node        *StorageAutoscalerSpec `json:"node,omitempty"`
+	Overseer    *StorageAutoscalerSpec `json:"overseer,omitempty"`
+	Data        *StorageAutoscalerSpec `json:"data,omitempty"`
+	Coordinator *StorageAutoscalerSpec `json:"coordinator,omitempty"`
 }
 
 type SolrOpsRequestOptions struct {

diff --git a/apis/autoscaling/v1alpha1/solr_webhook.go b/apis/autoscaling/v1alpha1/solr_webhook.go
@@ -56,11 +56,17 @@ func (r *SolrAutoscaler) setDefaults() {
 	r.setOpsReqOptsDefaults()
 
 	if r.Spec.Storage != nil {
-		setDefaultStorageValues(r.Spec.Storage.Solr)
+		setDefaultStorageValues(r.Spec.Storage.Node)
+		setDefaultStorageValues(r.Spec.Storage.Overseer)
+		setDefaultStorageValues(r.Spec.Storage.Data)
+		setDefaultStorageValues(r.Spec.Storage.Coordinator)
 	}
 
 	if r.Spec.Compute != nil {
-		setDefaultComputeValues(r.Spec.Compute.Solr)
+		setDefaultStorageValues(r.Spec.Storage.Node)
+		setDefaultStorageValues(r.Spec.Storage.Overseer)
+		setDefaultStorageValues(r.Spec.Storage.Data)
+		setDefaultStorageValues(r.Spec.Storage.Coordinator)
 	}
 }
 

diff --git a/apis/autoscaling/v1alpha1/zz_generated.deepcopy.go b/apis/autoscaling/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/kubedb/v1alpha2/solr_helpers.go b/apis/kubedb/v1alpha2/solr_helpers.go
@@ -256,6 +256,22 @@ func (s *Solr) PVCName(alias string) string {
 	return meta_util.NameWithSuffix(s.Name, alias)
 }
 
+func (s Solr) NodeRoleSpecificLabelKey(roleType SolrNodeRoleType) string {
+	return kubedb.GroupName + "/role-" + string(roleType)
+}
+
+func (s Solr) OverseerSelectors() map[string]string {
+	return s.OffshootSelectors(map[string]string{string(SolrNodeRoleOverseer): SolrNodeRoleSet})
+}
+
+func (s Solr) DataSelectors() map[string]string {
+	return s.OffshootSelectors(map[string]string{string(SolrNodeRoleData): SolrNodeRoleSet})
+}
+
+func (s Solr) CoordinatorSelectors() map[string]string {
+	return s.OffshootSelectors(map[string]string{string(SolrNodeRoleCoordinator): SolrNodeRoleSet})
+}
+
 func (s *Solr) SetDefaults() {
 	if s.Spec.DeletionPolicy == "" {
 		s.Spec.DeletionPolicy = TerminationPolicyDelete

diff --git a/apis/kubedb/v1alpha2/solr_types.go b/apis/kubedb/v1alpha2/solr_types.go
@@ -180,6 +180,7 @@ const (
 	SolrNodeRoleOverseer    SolrNodeRoleType = "overseer"
 	SolrNodeRoleData        SolrNodeRoleType = "data"
 	SolrNodeRoleCoordinator SolrNodeRoleType = "coordinator"
+	SolrNodeRoleCombined    SolrNodeRoleType = "combined"
 	SolrNodeRoleSet                          = "set"
 )