generic on-premises cluster provisioning

instaclustr · Nov 10, 2023 · eaf4f64 · eaf4f64
1 parent 9302179
commit eaf4f64
Show file tree

Hide file tree

Showing 7 changed files with 988 additions and 1,123 deletions.
diff --git a/apis/clusters/v1beta1/cassandra_types.go b/apis/clusters/v1beta1/cassandra_types.go
@@ -21,7 +21,9 @@ import (
 	"fmt"
 	"strconv"
 
+	k8scorev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -55,8 +57,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"`
+	OnPremisesSpec      *OnPremisesSpec       `json:"onPremisesSpec,omitempty"`
 	Cluster             `json:",inline"`
 	DataCentres         []*CassandraDataCentre `json:"dataCentres,omitempty"`
 	LuceneEnabled       bool                   `json:"luceneEnabled,omitempty"`
@@ -68,16 +70,16 @@ type CassandraSpec struct {
 	ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"`
 }
 
-type CassandraOnPremisesSpec struct {
-	StorageClassName              string          `json:"storageClassName"`
-	OSDiskSize                    string          `json:"osDiskSize"`
-	DataDiskSize                  string          `json:"dataDiskSize"`
-	SSHGatewayCPU                 int64           `json:"sshGatewayCPU,omitempty"`
-	SSHGatewayMemory              string          `json:"sshGatewayMemory,omitempty"`
-	NodeCPU                       int64           `json:"nodeCPU"`
-	NodeMemory                    string          `json:"nodeMemory"`
-	OSImageURL                    string          `json:"osImageURL"`
-	CloudInitScriptNamespacedName *NamespacedName `json:"cloudInitScriptNamespacedName"`
+type OnPremisesSpec struct {
+	StorageClassName   string          `json:"storageClassName"`
+	OSDiskSize         string          `json:"osDiskSize"`
+	DataDiskSize       string          `json:"dataDiskSize"`
+	SSHGatewayCPU      int64           `json:"sshGatewayCPU,omitempty"`
+	SSHGatewayMemory   string          `json:"sshGatewayMemory,omitempty"`
+	NodeCPU            int64           `json:"nodeCPU"`
+	NodeMemory         string          `json:"nodeMemory"`
+	OSImageURL         string          `json:"osImageURL"`
+	CloudInitScriptRef *NamespacedName `json:"cloudInitScriptRef"`
 }
 
 // CassandraStatus defines the observed state of Cassandra
@@ -170,6 +172,85 @@ func (c *Cassandra) NewBackupSpec(startTimestamp int) *clusterresourcesv1beta1.C
 	}
 }
 
+func (c *Cassandra) NewExposePorts() []k8scorev1.ServicePort {
+	var ports []k8scorev1.ServicePort
+	ports = []k8scorev1.ServicePort{{
+		Name: models.SSH,
+		Port: models.Port22,
+		TargetPort: intstr.IntOrString{
+			Type:   intstr.Int,
+			IntVal: models.Port22,
+		},
+	},
+	}
+
+	if !c.Spec.PrivateNetworkCluster {
+		additionalPorts := []k8scorev1.ServicePort{
+			{
+				Name: models.InterNode,
+				Port: models.Port7000,
+				TargetPort: intstr.IntOrString{
+					Type:   intstr.Int,
+					IntVal: models.Port7000,
+				},
+			},
+			{
+				Name: models.CQLSH,
+				Port: models.Port9042,
+				TargetPort: intstr.IntOrString{
+					Type:   intstr.Int,
+					IntVal: models.Port9042,
+				},
+			},
+			{
+				Name: models.JMX,
+				Port: models.Port7199,
+				TargetPort: intstr.IntOrString{
+					Type:   intstr.Int,
+					IntVal: models.Port7199,
+				},
+			},
+		}
+		if c.Spec.DataCentres[0].ClientToClusterEncryption {
+			sslPort := k8scorev1.ServicePort{
+				Name: models.SSL,
+				Port: models.Port7001,
+				TargetPort: intstr.IntOrString{
+					Type:   intstr.Int,
+					IntVal: models.Port7001,
+				},
+			}
+			additionalPorts = append(additionalPorts, sslPort)
+		}
+		ports = append(ports, additionalPorts...)
+	}
+
+	return ports
+}
+
+func (c *Cassandra) NewHeadlessPorts() []k8scorev1.ServicePort {
+	ports := []k8scorev1.ServicePort{
+		{
+			Name: models.InterNode,
+			Port: models.Port7000,
+			TargetPort: intstr.IntOrString{
+				Type:   intstr.Int,
+				IntVal: models.Port7000,
+			},
+		},
+		{
+			Name: models.CQLSH,
+			Port: models.Port9042,
+			TargetPort: intstr.IntOrString{
+				Type:   intstr.Int,
+				IntVal: models.Port9042,
+			},
+		},
+	}
+
+	return ports
+}
+
 func (c *Cassandra) FromInstAPI(iData []byte) (*Cassandra, error) {
 	iCass := &models.CassandraCluster{}
 	err := json.Unmarshal(iData, iCass)

diff --git a/apis/clusters/v1beta1/zz_generated.deepcopy.go b/apis/clusters/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/clusters.instaclustr.com_cassandras.yaml b/config/crd/bases/clusters.instaclustr.com_cassandras.yaml
@@ -111,7 +111,7 @@ spec:
                 type: string
               onPremisesSpec:
                 properties:
-                  cloudInitScriptNamespacedName:
+                  cloudInitScriptRef:
                     properties:
                       name:
                         type: string
@@ -140,7 +140,7 @@ spec:
                   storageClassName:
                     type: string
                 required:
-                - cloudInitScriptNamespacedName
+                - cloudInitScriptRef
                 - dataDiskSize
                 - nodeCPU
                 - nodeMemory

diff --git a/config/samples/clusters_v1beta1_cassandra.yaml b/config/samples/clusters_v1beta1_cassandra.yaml
@@ -15,7 +15,7 @@ spec:
     nodeCPU: 2
     nodeMemory: 8192Mi
     osImageURL: "https://s3.amazonaws.com/debian-bucket/debian-11-generic-amd64-20230601-1398.raw"
-    cloudInitScriptNamespacedName:
+    cloudInitScriptRef:
       namespace: default
       name: instaclustr-cloud-init-secret
   dataCentres: