Added logic for provisioning On-premises Cassandra cluster

instaclustr · Sep 30, 2023 · 29686af · 29686af
1 parent ffc2a11
commit 29686af
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/apis/clusterresources/v1beta1/postgresqluser_types.go b/apis/clusterresources/v1beta1/postgresqluser_types.go
@@ -40,11 +40,6 @@ type ClusterInfo struct {
 	Event                       string         `json:"event,omitempty"`
 }
 
-type NamespacedName struct {
-	Namespace string `json:"namespace"`
-	Name      string `json:"name"`
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

diff --git a/apis/clusterresources/v1beta1/structs.go b/apis/clusterresources/v1beta1/structs.go
@@ -57,3 +57,8 @@ type SecretReference struct {
 	Namespace string `json:"namespace"`
 	Name      string `json:"name"`
 }
+
+type NamespacedName struct {
+	Namespace string `json:"namespace"`
+	Name      string `json:"name"`
+}
diff --git a/apis/clusters/v1beta1/cassandra_types.go b/apis/clusters/v1beta1/cassandra_types.go
@@ -55,7 +55,8 @@ type CassandraRestoreFrom struct {
 
 // CassandraSpec defines the desired state of Cassandra
 type CassandraSpec struct {
-	RestoreFrom         *CassandraRestoreFrom `json:"restoreFrom,omitempty"`
+	OnPremisesSpec      *CassandraOnPremisesSpec `json:"onPremisesSpec,omitempty"`
+	RestoreFrom         *CassandraRestoreFrom    `json:"restoreFrom,omitempty"`
 	Cluster             `json:",inline"`
 	DataCentres         []*CassandraDataCentre `json:"dataCentres,omitempty"`
 	LuceneEnabled       bool                   `json:"luceneEnabled,omitempty"`
@@ -67,6 +68,19 @@ type CassandraSpec struct {
 	ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"`
 }
 
+type CassandraOnPremisesSpec struct {
+	DeleteDisksWithVM             bool            `json:"deleteDisksWithVM,omitempty"`
+	StorageClassName              string          `json:"storageClassName"`
+	SystemDiskSize                string          `json:"systemDiskSize"`
+	DataDiskSize                  string          `json:"dataDiskSize"`
+	SSHGatewayCPU                 int64           `json:"sshGatewayCPU"`
+	SSHGatewayMemory              string          `json:"sshGatewayMemory"`
+	NodeCPU                       int64           `json:"nodeCPU"`
+	NodeMemory                    string          `json:"nodeMemory"`
+	OSImageURL                    string          `json:"osImageURL"`
+	CloudInitScriptNamespacedName *NamespacedName `json:"cloudInitScriptNamespacedName"`
+}
+
 // CassandraStatus defines the observed state of Cassandra
 type CassandraStatus struct {
 	ClusterStatus `json:",inline"`

diff --git a/apis/clusters/v1beta1/structs.go b/apis/clusters/v1beta1/structs.go
@@ -143,6 +143,11 @@ type privateLinkStatus struct {
 	EndPointServiceName string `json:"endPointServiceName,omitempty"`
 }
 
+type NamespacedName struct {
+	Namespace string `json:"namespace"`
+	Name      string `json:"name"`
+}
+
 type PrivateLinkStatuses []*privateLinkStatus
 
 func (p1 PrivateLinkStatuses) Equal(p2 PrivateLinkStatuses) bool {

diff --git a/controllers/clusters/cassandra_controller.go b/controllers/clusters/cassandra_controller.go
@@ -43,10 +43,6 @@ import (
 	"github.com/instaclustr/operator/pkg/scheduler"
 )
 
-const (
-	StatusRUNNING = "RUNNING"
-)
-
 // CassandraReconciler reconciles a Cassandra object
 type CassandraReconciler struct {
 	client.Client

diff --git a/controllers/clusters/kafka_controller.go b/controllers/clusters/kafka_controller.go
@@ -206,7 +206,7 @@ func (r *KafkaReconciler) handleUpdateCluster(
 		return models.ExitReconcile
 	}
 
-	if iKafka.Status.ClusterStatus.State != StatusRUNNING {
+	if iKafka.Status.ClusterStatus.State != models.RunningStatus {
 		l.Error(instaclustr.ClusterNotRunning, "Unable to update cluster, cluster still not running",
 			"cluster name", k.Spec.Name,
 			"cluster state", iKafka.Status.ClusterStatus.State)