Defaulting internal zookeper (#1398)

Signed-off-by: pritamdas99 <pritam@appscode.com>
kubedb · Feb 14, 2025 · 4713902 · 4713902
1 parent 2f6d49a
commit 4713902
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 5 deletions.
diff --git a/apis/kubedb/v1alpha2/openapi_generated.go b/apis/kubedb/v1alpha2/openapi_generated.go
diff --git a/apis/kubedb/v1alpha2/solr_helpers.go b/apis/kubedb/v1alpha2/solr_helpers.go
@@ -272,6 +272,34 @@ func (s Solr) CoordinatorSelectors() map[string]string {
 	return s.OffshootSelectors(map[string]string{string(SolrNodeRoleCoordinator): SolrNodeRoleSet})
 }
 
+func (s *Solr) SetDefaultsToZooKeeperRef() {
+	if s.Spec.ZookeeperRef == nil {
+		s.Spec.ZookeeperRef = &ZookeeperRef{}
+	}
+	s.SetZooKeeperObjectRef()
+	if s.Spec.ZookeeperRef.Version == nil {
+		defaultVersion := "3.7.2"
+		s.Spec.ZookeeperRef.Version = &defaultVersion
+	}
+}
+
+func (s *Solr) GetZooKeeperName() string {
+	return s.OffshootName() + "-zk"
+}
+
+func (s *Solr) SetZooKeeperObjectRef() {
+	if s.Spec.ZookeeperRef.ObjectReference == nil {
+		s.Spec.ZookeeperRef.ObjectReference = &kmapi.ObjectReference{}
+	}
+	if s.Spec.ZookeeperRef.Name == "" {
+		s.Spec.ZookeeperRef.ExternallyManaged = false
+		s.Spec.ZookeeperRef.Name = s.GetZooKeeperName()
+	}
+	if s.Spec.ZookeeperRef.Namespace == "" {
+		s.Spec.ZookeeperRef.Namespace = s.Namespace
+	}
+}
+
 func (s *Solr) SetDefaults() {
 	if s.Spec.DeletionPolicy == "" {
 		s.Spec.DeletionPolicy = DeletionPolicyDelete
@@ -285,6 +313,9 @@ func (s *Solr) SetDefaults() {
 		s.Spec.StorageType = StorageTypeDurable
 	}
 
+	s.SetDefaultsToZooKeeperRef()
+	s.SetZooKeeperObjectRef()
+
 	if s.Spec.ZookeeperDigestSecret == nil {
 		s.Spec.ZookeeperDigestSecret = &v1.LocalObjectReference{
 			Name: s.SolrSecretName("zk-digest"),

diff --git a/apis/kubedb/v1alpha2/solr_types.go b/apis/kubedb/v1alpha2/solr_types.go
@@ -72,7 +72,7 @@ type SolrSpec struct {
 	Storage *core.PersistentVolumeClaimSpec `json:"storage,omitempty"`
 
 	// 	// ZooKeeper contains information for Solr to store configurations for collections
-	ZookeeperRef *kmapi.ObjectReference `json:"zookeeperRef,omitempty"`
+	ZookeeperRef *ZookeeperRef `json:"zookeeperRef,omitempty"`
 
 	// +optional
 	SolrModules []string `json:"solrModules,omitempty"`

diff --git a/apis/kubedb/v1alpha2/zz_generated.deepcopy.go b/apis/kubedb/v1alpha2/zz_generated.deepcopy.go
diff --git a/crds/kubedb.com_solrs.yaml b/crds/kubedb.com_solrs.yaml
@@ -13158,10 +13158,16 @@ spec:
                 x-kubernetes-map-type: atomic
               zookeeperRef:
                 properties:
+                  externallyManaged:
+                    type: boolean
                   name:
                     type: string
                   namespace:
                     type: string
+                  pathsBase:
+                    type: string
+                  version:
+                    type: string
                 required:
                 - name
                 type: object