Add Solr ops for vertical scaling and volume expansion (#1261)

Signed-off-by: pritamdas99 <[email protected]>
kubedb · Aug 2, 2024 · 1d9ee37 · 1d9ee37
1 parent 45c637c
commit 1d9ee37
Show file tree

Hide file tree

Showing 9 changed files with 672 additions and 18 deletions.
diff --git a/apis/kubedb/constants.go b/apis/kubedb/constants.go
@@ -689,6 +689,10 @@ const (
 	DatabaseWriteAccess = "DatabaseWriteAccess"
 	// check dependencies are ready
 	DatabaseDependencyReady = "DatabaseDependencyReady"
+	// update config secret for backup in solr
+	PatchConfigSecretUpdateForBackup = "PatchConfigSecretUpdatesForBackup"
+	// sync db to update configuration
+	SyncDatabaseForConfigurationUpdate = "SyncDatabaseForConfigurationUpdate"
 
 	// Condition reasons
 	DataRestoreStartedByExternalInitializer    = "DataRestoreStartedByExternalInitializer"
@@ -923,6 +927,15 @@ const (
 	SolrConfAllowPathsValue        = ""
 	SolrConfSolrCloudKey           = "solrcloud"
 	SolrConfShardHandlerFactoryKey = "shardHandlerFactory"
+
+	ProxyDeploymentName = "s3proxy"
+	ProxyServiceName    = "proxy-svc"
+	ProxySecretName     = "proxy-env"
+	ProxyImage          = "andrewgaul/s3proxy"
+	ProxyPortName       = "http"
+	ProxyPortNumber     = 80
+	ProxyContainerName  = "proxy"
+	ProxyLabelsApp      = "app"
 )
 
 // =========================== Druid Constants ============================

diff --git a/apis/kubedb/v1alpha2/solr_helpers.go b/apis/kubedb/v1alpha2/solr_helpers.go
@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha2
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -30,6 +31,8 @@ import (
 	v1 "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/klog/v2"
 	"kmodules.xyz/client-go/apiextensions"
 	coreutil "kmodules.xyz/client-go/core/v1"
 	meta_util "kmodules.xyz/client-go/meta"
@@ -230,7 +233,7 @@ func (s *Solr) PVCName(alias string) string {
 	return meta_util.NameWithSuffix(s.Name, alias)
 }
 
-func (s *Solr) SetDefaults(slVersion *catalog.SolrVersion) {
+func (s *Solr) SetDefaults() {
 	if s.Spec.DeletionPolicy == "" {
 		s.Spec.DeletionPolicy = TerminationPolicyDelete
 	}
@@ -263,6 +266,15 @@ func (s *Solr) SetDefaults(slVersion *catalog.SolrVersion) {
 		}
 	}
 
+	var slVersion catalog.SolrVersion
+	err := DefaultClient.Get(context.TODO(), types.NamespacedName{
+		Name: s.Spec.Version,
+	}, &slVersion)
+	if err != nil {
+		klog.Errorf("can't get the solr version object %s for %s \n", err.Error(), s.Spec.Version)
+		return
+	}
+
 	if s.Spec.Topology != nil {
 		if s.Spec.Topology.Data != nil {
 			if s.Spec.Topology.Data.Suffix == "" {
@@ -275,7 +287,7 @@ func (s *Solr) SetDefaults(slVersion *catalog.SolrVersion) {
 				s.Spec.Topology.Data.PodTemplate.Spec.SecurityContext = &v1.PodSecurityContext{}
 			}
 			s.Spec.Topology.Data.PodTemplate.Spec.SecurityContext.FSGroup = slVersion.Spec.SecurityContext.RunAsUser
-			s.setDefaultContainerSecurityContext(slVersion, &s.Spec.Topology.Data.PodTemplate)
+			s.setDefaultContainerSecurityContext(&slVersion, &s.Spec.Topology.Data.PodTemplate)
 			s.setDefaultContainerResourceLimits(&s.Spec.Topology.Data.PodTemplate)
 
 		}
@@ -291,7 +303,7 @@ func (s *Solr) SetDefaults(slVersion *catalog.SolrVersion) {
 				s.Spec.Topology.Overseer.PodTemplate.Spec.SecurityContext = &v1.PodSecurityContext{}
 			}
 			s.Spec.Topology.Overseer.PodTemplate.Spec.SecurityContext.FSGroup = slVersion.Spec.SecurityContext.RunAsUser
-			s.setDefaultContainerSecurityContext(slVersion, &s.Spec.Topology.Overseer.PodTemplate)
+			s.setDefaultContainerSecurityContext(&slVersion, &s.Spec.Topology.Overseer.PodTemplate)
 			s.setDefaultContainerResourceLimits(&s.Spec.Topology.Overseer.PodTemplate)
 		}
 
@@ -306,7 +318,7 @@ func (s *Solr) SetDefaults(slVersion *catalog.SolrVersion) {
 				s.Spec.Topology.Coordinator.PodTemplate.Spec.SecurityContext = &v1.PodSecurityContext{}
 			}
 			s.Spec.Topology.Coordinator.PodTemplate.Spec.SecurityContext.FSGroup = slVersion.Spec.SecurityContext.RunAsUser
-			s.setDefaultContainerSecurityContext(slVersion, &s.Spec.Topology.Coordinator.PodTemplate)
+			s.setDefaultContainerSecurityContext(&slVersion, &s.Spec.Topology.Coordinator.PodTemplate)
 			s.setDefaultContainerResourceLimits(&s.Spec.Topology.Coordinator.PodTemplate)
 		}
 	} else {
@@ -317,7 +329,7 @@ func (s *Solr) SetDefaults(slVersion *catalog.SolrVersion) {
 			s.Spec.PodTemplate.Spec.SecurityContext = &v1.PodSecurityContext{}
 		}
 		s.Spec.PodTemplate.Spec.SecurityContext.FSGroup = slVersion.Spec.SecurityContext.RunAsUser
-		s.setDefaultContainerSecurityContext(slVersion, &s.Spec.PodTemplate)
+		s.setDefaultContainerSecurityContext(&slVersion, &s.Spec.PodTemplate)
 		s.setDefaultContainerResourceLimits(&s.Spec.PodTemplate)
 	}
 

diff --git a/apis/kubedb/v1alpha2/solr_webhook.go b/apis/kubedb/v1alpha2/solr_webhook.go
@@ -30,7 +30,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	"k8s.io/klog/v2"
 	ofst "kmodules.xyz/offshoot-api/api/v2"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
@@ -49,14 +48,7 @@ func (s *Solr) Default() {
 	}
 	solrlog.Info("default", "name", s.Name)
 
-	slVersion := catalog.SolrVersion{}
-	err := DefaultClient.Get(context.TODO(), types.NamespacedName{Name: s.Spec.Version}, &slVersion)
-	if err != nil {
-		klog.Errorf("Version does not exist.")
-		return
-	}
-
-	s.SetDefaults(&slVersion)
+	s.SetDefaults()
 }
 
 var _ webhook.Validator = &Solr{}

diff --git a/apis/ops/v1alpha1/constant.go b/apis/ops/v1alpha1/constant.go
@@ -169,6 +169,8 @@ const (
 	VolumeExpansionMLNode           = "VolumeExpansionMLNode"
 	VolumeExpansionTransformNode    = "VolumeExpansionTransformNode"
 	VolumeExpansionCoordinatingNode = "VolumeExpansionCoordinatingNode"
+	VolumeExpansionOverseerNode     = "VolumeExpansionOverseerNode"
+	VolumeExpansionCoordinatorNode  = "VolumeExpansionCoordinatorNode"
 )
 
 // Kafka Constants

diff --git a/apis/ops/v1alpha1/openapi_generated.go b/apis/ops/v1alpha1/openapi_generated.go