cluster backup and cluster restore were migrated to APIv2 for postgre…

…s cassandra redis and opensearch
instaclustr · Sep 14, 2023 · cbeaace · cbeaace
1 parent 7c0608c
commit cbeaace
Show file tree

Hide file tree

Showing 24 changed files with 207 additions and 240 deletions.
diff --git a/apis/clusters/v1beta1/cassandra_types.go b/apis/clusters/v1beta1/cassandra_types.go
@@ -33,22 +33,15 @@ type Spark struct {
 	Version string `json:"version"`
 }
 
-type CassandraRestoreDC struct {
-	CDCID            string `json:"cdcId,omitempty"`
-	RestoreToSameVPC bool   `json:"restoreToSameVpc,omitempty"`
-	CustomVPCID      string `json:"customVpcId,omitempty"`
-	CustomVPCNetwork string `json:"customVpcNetwork,omitempty"`
-}
-
 type CassandraRestoreFrom struct {
 	// Original cluster ID. Backup from that cluster will be used for restore
 	ClusterID string `json:"clusterID"`
 
 	// The display name of the restored cluster.
-	ClusterNameOverride string `json:"clusterNameOverride,omitempty"`
+	RestoredClusterName string `json:"restoredClusterName,omitempty"`
 
 	// An optional list of cluster data centres for which custom VPC settings will be used.
-	CDCInfos []CassandraRestoreDC `json:"cdcInfos,omitempty"`
+	CDCConfigs []*RestoreCDCConfigs `json:"cdcConfigs,omitempty"`
 
 	// Timestamp in milliseconds since epoch. All backed up data will be restored for this point in time.
 	PointInTime int64 `json:"pointInTime,omitempty"`

diff --git a/apis/clusters/v1beta1/opensearch_types.go b/apis/clusters/v1beta1/opensearch_types.go
@@ -459,26 +459,16 @@ type OpenSearchRestoreFrom struct {
 	ClusterID string `json:"clusterId"`
 
 	// The display name of the restored cluster.
-	ClusterNameOverride string `json:"clusterNameOverride,omitempty"`
+	RestoredClusterName string `json:"restoredClusterName,omitempty"`
 
 	// An optional list of cluster data centres for which custom VPC settings will be used.
-	CDCInfos []*OpenSearchRestoreCDCInfo `json:"cdcInfos,omitempty"`
+	CDCConfigs []*RestoreCDCConfigs `json:"cdcConfigs,omitempty"`
 
 	// Timestamp in milliseconds since epoch. All backed up data will be restored for this point in time.
 	PointInTime int64 `json:"pointInTime,omitempty"`
 
 	// Only data for the specified indices will be restored, for the point in time.
 	IndexNames string `json:"indexNames,omitempty"`
-
-	// The cluster network for this cluster to be restored to.
-	ClusterNetwork string `json:"clusterNetwork,omitempty"`
-}
-
-type OpenSearchRestoreCDCInfo struct {
-	CDCID            string `json:"cdcId,omitempty"`
-	RestoreToSameVPC bool   `json:"restoreToSameVpc,omitempty"`
-	CustomVPCID      string `json:"customVpcId,omitempty"`
-	CustomVPCNetwork string `json:"customVpcNetwork,omitempty"`
 }
 
 // OpenSearchStatus defines the observed state of OpenSearch

diff --git a/apis/clusters/v1beta1/postgresql_types.go b/apis/clusters/v1beta1/postgresql_types.go
@@ -62,23 +62,13 @@ type PgRestoreFrom struct {
 	ClusterID string `json:"clusterId"`
 
 	// The display name of the restored cluster.
-	ClusterNameOverride string `json:"clusterNameOverride,omitempty"`
+	RestoredClusterName string `json:"restoredClusterName,omitempty"`
 
 	// An optional list of cluster data centres for which custom VPC settings will be used.
-	CDCInfos []*PgRestoreCDCInfo `json:"cdcInfos,omitempty"`
+	CDCConfigs []*RestoreCDCConfigs `json:"cdsConfigs,omitempty"`
 
 	// Timestamp in milliseconds since epoch. All backed up data will be restored for this point in time.
 	PointInTime int64 `json:"pointInTime,omitempty"`
-
-	// The cluster network for this cluster to be restored to.
-	ClusterNetwork string `json:"clusterNetwork,omitempty"`
-}
-
-type PgRestoreCDCInfo struct {
-	CDCID            string `json:"cdcId,omitempty"`
-	RestoreToSameVPC bool   `json:"restoreToSameVpc,omitempty"`
-	CustomVPCID      string `json:"customVpcId,omitempty"`
-	CustomVPCNetwork string `json:"customVpcNetwork,omitempty"`
 }
 
 // PgSpec defines the desired state of PostgreSQL

diff --git a/apis/clusters/v1beta1/redis_types.go b/apis/clusters/v1beta1/redis_types.go
@@ -46,26 +46,16 @@ type RedisRestoreFrom struct {
 	ClusterID string `json:"clusterId"`
 
 	// The display name of the restored cluster.
-	ClusterNameOverride string `json:"clusterNameOverride,omitempty"`
+	RestoredClusterName string `json:"restoredClusterName,omitempty"`
 
 	// An optional list of cluster data centres for which custom VPC settings will be used.
-	CDCInfos []*RedisRestoreCDCInfo `json:"cdcInfos,omitempty"`
+	CDCConfigs []*RestoreCDCConfigs `json:"cdcConfigs,omitempty"`
 
 	// Timestamp in milliseconds since epoch. All backed up data will be restored for this point in time.
 	PointInTime int64 `json:"pointInTime,omitempty"`
 
 	// Only data for the specified indices will be restored, for the point in time.
 	IndexNames string `json:"indexNames,omitempty"`
-
-	// The cluster network for this cluster to be restored to.
-	ClusterNetwork string `json:"clusterNetwork,omitempty"`
-}
-
-type RedisRestoreCDCInfo struct {
-	CDCID            string `json:"cdcId,omitempty"`
-	RestoreToSameVPC bool   `json:"restoreToSameVpc,omitempty"`
-	CustomVPCID      string `json:"customVpcId,omitempty"`
-	CustomVPCNetwork string `json:"customVpcNetwork,omitempty"`
 }
 
 // RedisSpec defines the desired state of Redis

diff --git a/apis/clusters/v1beta1/structs.go b/apis/clusters/v1beta1/structs.go
@@ -50,6 +50,17 @@ type DataCentreStatus struct {
 	PrivateLink     PrivateLinkStatuses `json:"privateLink,omitempty"`
 }
 
+type RestoreCDCConfigs struct {
+	CustomVPCSettings *RestoreCustomVPCSettings `json:"customVpcSettings,omitempty"`
+	RestoreMode       string                    `json:"restoreMode,omitempty"`
+	CDCID             string                    `json:"cdcId,omitempty"`
+}
+
+type RestoreCustomVPCSettings struct {
+	VpcID   string `json:"vpcId,omitempty"`
+	Network string `json:"network,omitempty"`
+}
+
 type Node struct {
 	ID             string   `json:"id,omitempty"`
 	Size           string   `json:"size,omitempty"`

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
@@ -108,28 +108,28 @@ spec:
                 type: boolean
               restoreFrom:
                 properties:
-                  cdcInfos:
+                  cdcConfigs:
                     description: An optional list of cluster data centres for which
                       custom VPC settings will be used.
                     items:
                       properties:
                         cdcId:
                           type: string
-                        customVpcId:
-                          type: string
-                        customVpcNetwork:
+                        customVpcSettings:
+                          properties:
+                            network:
+                              type: string
+                            vpcId:
+                              type: string
+                          type: object
+                        restoreMode:
                           type: string
-                        restoreToSameVpc:
-                          type: boolean
                       type: object
                     type: array
                   clusterID:
                     description: Original cluster ID. Backup from that cluster will
                       be used for restore
                     type: string
-                  clusterNameOverride:
-                    description: The display name of the restored cluster.
-                    type: string
                   clusterNetwork:
                     description: The cluster network for this cluster to be restored
                       to.
@@ -143,6 +143,9 @@ spec:
                       up data will be restored for this point in time.
                     format: int64
                     type: integer
+                  restoredClusterName:
+                    description: The display name of the restored cluster.
+                    type: string
                 required:
                 - clusterID
                 type: object