Add DeleteCollection method for Solr (#141)

* Add delete collection method

Signed-off-by: pritamdas99 <[email protected]>

go.mod

@@ -33,7 +33,7 @@ require (
 	k8s.io/klog/v2 v2.130.1
 	kmodules.xyz/client-go v0.30.17
 	kmodules.xyz/custom-resources v0.30.0
-	kubedb.dev/apimachinery v0.48.0
+	kubedb.dev/apimachinery v0.48.1-0.20241003061121-cbe53073e554
 	sigs.k8s.io/controller-runtime v0.18.4
 	xorm.io/xorm v1.3.6
 )

go.sum

@@ -804,8 +804,8 @@ kmodules.xyz/monitoring-agent-api v0.30.1 h1:OdYucfl7OblBqVhCyEcOC3HvUrOKtDh8lcM
 kmodules.xyz/monitoring-agent-api v0.30.1/go.mod h1:oR3tk5O4koYar4cD9N3AjbBFr9XTwBU3sw9qD2NdNQc=
 kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
 kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
-kubedb.dev/apimachinery v0.48.0 h1:gMGqkBRs81wbmGPQIqMGY/MztKg4MYjZ39d9F656V2c=
-kubedb.dev/apimachinery v0.48.0/go.mod h1:TeZW+vt9OLf0Jyb/AZktvOOzf3NV+rFhHDN/zTh1EjA=
+kubedb.dev/apimachinery v0.48.1-0.20241003061121-cbe53073e554 h1:0lvCuDdkmUci+fP1XDtES2aZroO4QpIbiW+qM/YqrqQ=
+kubedb.dev/apimachinery v0.48.1-0.20241003061121-cbe53073e554/go.mod h1:TeZW+vt9OLf0Jyb/AZktvOOzf3NV+rFhHDN/zTh1EjA=
 kubeops.dev/petset v0.0.7 h1:F77BTRfUqRVO7kNc8q2oFSSviDmYBqni/osXqu0kgJ4=
 kubeops.dev/petset v0.0.7/go.mod h1:lt0SZV4ohRy7RiwLNUnMoauG4lCbcRbSqhMg20rdUQg=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=

solr/api.go

@@ -28,6 +28,7 @@ const (
 	Action              = "action"
 	ActionBackup        = "BACKUP"
 	ActionRestore       = "RESTORE"
+	ActionDelete        = "DELETE"
 	ActionCreate        = "CREATE"
 	ActionDeleteBackup  = "DELETEBACKUP"
 	AddRole             = "ADDROLE"
@@ -71,4 +72,5 @@ type SLClient interface {
 	BalanceReplica(async string) (*Response, error)
 	AddRole(role, node string) (*Response, error)
 	RemoveRole(role, node string) (*Response, error)
+	DeleteCollection(name string) (*Response, error)
 }

solr/solrv8.go

@@ -430,3 +430,26 @@ func (sc *SLClientV8) RemoveRole(role, node string) (*Response, error) {
 	}
 	return backupResponse, nil
 }
+
+func (sc *SLClientV8) DeleteCollection(name string) (*Response, error) {
+	sc.Config.log.V(5).Info(fmt.Sprintf("Delete COLLECTION: %s", name))
+	req := sc.Client.R().SetDoNotParseResponse(true)
+	req.SetHeader("Content-Type", "application/json")
+	deleteParams := map[string]string{
+		Action: ActionDelete,
+		Name:   name,
+	}
+	req.SetQueryParams(deleteParams)
+	res, err := req.Delete("/solr/admin/collections")
+	if err != nil {
+		sc.Config.log.Error(err, "Failed to send http request to read a collection")
+		return nil, err
+	}
+
+	deleteResponse := &Response{
+		Code:   res.StatusCode(),
+		header: res.Header(),
+		body:   res.RawBody(),
+	}
+	return deleteResponse, nil
+}

solr/solrv9.go

@@ -145,6 +145,29 @@ func (sc *SLClientV9) ReadCollection() (*Response, error) {
 	return writeResponse, nil
 }
 
+func (sc *SLClientV9) DeleteCollection(name string) (*Response, error) {
+	sc.Config.log.V(5).Info(fmt.Sprintf("Delete COLLECTION: %s", name))
+	req := sc.Client.R().SetDoNotParseResponse(true)
+	req.SetHeader("Content-Type", "application/json")
+	deleteParams := map[string]string{
+		Action: ActionDelete,
+		Name:   name,
+	}
+	req.SetQueryParams(deleteParams)
+	res, err := req.Delete("/solr/admin/collections")
+	if err != nil {
+		sc.Config.log.Error(err, "Failed to send http request to read a collection")
+		return nil, err
+	}
+
+	deleteResponse := &Response{
+		Code:   res.StatusCode(),
+		header: res.Header(),
+		body:   res.RawBody(),
+	}
+	return deleteResponse, nil
+}
+
 func (sc *SLClientV9) BackupCollection(ctx context.Context, collection string, backupName string, location string, repository string) (*Response, error) {
 	sc.Config.log.V(5).Info(fmt.Sprintf("BACKUP COLLECTION: %s", collection))
 	req := sc.Client.R().SetDoNotParseResponse(true).SetContext(ctx)

solr/util.go

@@ -117,6 +117,23 @@ func (sc *Client) DecodeCollectionHealth(responseBody map[string]interface{}) er
 			return errors.New("didn't find health")
 		}
 		if health != "GREEN" {
+			if name == writeCollectionName {
+				response, err := sc.DeleteCollection(name)
+				if err != nil {
+					return err
+				}
+				responseBody, err := sc.DecodeResponse(response)
+				if err != nil {
+					klog.Error(err)
+					return err
+				}
+
+				_, err = sc.GetResponseStatus(responseBody)
+				if err != nil {
+					klog.Error(err)
+					return err
+				}
+			}
 			config := sc.GetConfig()
 			config.log.Error(errors.New(""), fmt.Sprintf("Health of collection %s IS NOT GREEN", name))
 			return errors.New(fmt.Sprintf("health for collection %s is not green", name))

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/solr_version_types.go

@@ -59,6 +59,8 @@ type SolrVersionSpec struct {
 	// +optional
 	Deprecated bool `json:"deprecated,omitempty"`
 	// SecurityContext is for the additional security information for the Solr container
+	// update constraints
+	UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"`
 	// +optional
 	SecurityContext SecurityContext `json:"securityContext"`
 }

vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_helpers.go

@@ -268,12 +268,6 @@ func (s *Solr) SetDefaults() {
 		}
 	}
 
-	if s.Spec.KeystoreSecret == nil {
-		s.Spec.KeystoreSecret = &v1.LocalObjectReference{
-			Name: s.SolrSecretName("keystore-cred"),
-		}
-	}
-
 	if s.Spec.ZookeeperDigestSecret == nil {
 		s.Spec.ZookeeperDigestSecret = &v1.LocalObjectReference{
 			Name: s.SolrSecretName("zk-digest"),

vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_solrversions.yaml

@@ -67,6 +67,17 @@ spec:
                     format: int64
                     type: integer
                 type: object
+              updateConstraints:
+                properties:
+                  allowlist:
+                    items:
+                      type: string
+                    type: array
+                  denylist:
+                    items:
+                      type: string
+                    type: array
+                type: object
               version:
                 type: string
             required:

vendor/modules.txt

@@ -1564,7 +1564,7 @@ kmodules.xyz/offshoot-api/api/v1
 kmodules.xyz/offshoot-api/api/v1/conversion
 kmodules.xyz/offshoot-api/api/v2
 kmodules.xyz/offshoot-api/util
-# kubedb.dev/apimachinery v0.48.0
+# kubedb.dev/apimachinery v0.48.1-0.20241003061121-cbe53073e554
 ## explicit; go 1.22.1
 kubedb.dev/apimachinery/apis
 kubedb.dev/apimachinery/apis/catalog