clusterresources for postgres were migrated to reference pattern

instaclustr · Oct 18, 2023 · 8d6411a · 8d6411a
1 parent 4d5d744
commit 8d6411a
Show file tree

Hide file tree

Showing 43 changed files with 828 additions and 134 deletions.
diff --git a/apis/clusterresources/v1beta1/awsvpcpeering_types.go b/apis/clusterresources/v1beta1/awsvpcpeering_types.go
@@ -91,9 +91,7 @@ func (aws *AWSVPCPeeringSpec) newImmutableFields() *immutableAWSVPCPeeringFields
 			peerAWSAccountID: aws.PeerAWSAccountID,
 			peerRegion:       aws.PeerRegion,
 		},
-		immutablePeeringFields{
-			DataCentreID: aws.DataCentreID,
-		},
+		immutablePeeringFields{},
 	}
 }
 
@@ -125,11 +123,6 @@ func (aws *AWSVPCPeeringSpec) Validate(availableRegions []string) error {
 		return fmt.Errorf("VPC ID must begin with 'vpc-' and fit pattern: %s. %v", models.PeerVPCIDRegExp, err)
 	}
 
-	dataCentreIDMatched, err := regexp.Match(models.UUIDStringRegExp, []byte(aws.DataCentreID))
-	if !dataCentreIDMatched || err != nil {
-		return fmt.Errorf("data centre ID is a UUID formated string. It must fit the pattern: %s. %v", models.UUIDStringRegExp, err)
-	}
-
 	if !validation.Contains(aws.PeerRegion, availableRegions) {
 		return fmt.Errorf("AWS Region to peer: %s is unavailable, available regions: %v",
 			aws.PeerRegion, availableRegions)

diff --git a/apis/clusterresources/v1beta1/awsvpcpeering_webhook.go b/apis/clusterresources/v1beta1/awsvpcpeering_webhook.go
@@ -67,10 +67,6 @@ func (r *AWSVPCPeering) ValidateCreate() error {
 		return fmt.Errorf("peer AWS Account Region is empty")
 	}
 
-	if r.Spec.DataCentreID == "" {
-		return fmt.Errorf("dataCentre ID is empty")
-	}
-
 	if r.Spec.PeerSubnets == nil {
 		return fmt.Errorf("peer Subnets list is empty")
 	}

diff --git a/apis/clusterresources/v1beta1/azurevnetpeering_types.go b/apis/clusterresources/v1beta1/azurevnetpeering_types.go
@@ -76,14 +76,6 @@ func init() {
 }
 
 func (azure *AzureVNetPeeringSpec) Validate() error {
-	dataCentreIDMatched, err := regexp.Match(models.UUIDStringRegExp, []byte(azure.DataCentreID))
-	if err != nil {
-		return err
-	}
-	if !dataCentreIDMatched {
-		return fmt.Errorf("data centre ID is a UUID formated string. It must fit the pattern: %s", models.UUIDStringRegExp)
-	}
-
 	for _, subnet := range azure.PeerSubnets {
 		peerSubnetMatched, err := regexp.Match(models.PeerSubnetsRegExp, []byte(subnet))
 		if err != nil {

diff --git a/apis/clusterresources/v1beta1/azurevnetpeering_webhook.go b/apis/clusterresources/v1beta1/azurevnetpeering_webhook.go
@@ -71,10 +71,6 @@ func (r *AzureVNetPeering) ValidateCreate() error {
 		return fmt.Errorf("peer Subscription ID is empty")
 	}
 
-	if r.Spec.DataCentreID == "" {
-		return fmt.Errorf("dataCentre ID is empty")
-	}
-
 	if r.Spec.PeerSubnets == nil {
 		return fmt.Errorf("peer Subnets list is empty")
 	}

diff --git a/apis/clusterresources/v1beta1/clusterbackup_types.go b/apis/clusterresources/v1beta1/clusterbackup_types.go
@@ -27,7 +27,7 @@ import (
 
 // ClusterBackupSpec defines the desired state of ClusterBackup
 type ClusterBackupSpec struct {
-	ClusterID   string `json:"clusterId"`
+	ClusterID   string `json:"clusterId,omitempty"`
 	ClusterKind string `json:"clusterKind"`
 }
 

diff --git a/apis/clusterresources/v1beta1/clusterbackup_webhook.go b/apis/clusterresources/v1beta1/clusterbackup_webhook.go
@@ -21,7 +21,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
-
+	
 	"github.com/instaclustr/operator/pkg/models"
 )
 

diff --git a/apis/clusterresources/v1beta1/exclusionwindow_types.go b/apis/clusterresources/v1beta1/exclusionwindow_types.go
@@ -23,7 +23,7 @@ import (
 
 // ExclusionWindowSpec defines the desired state of ExclusionWindow
 type ExclusionWindowSpec struct {
-	ClusterID string `json:"clusterId"`
+	ClusterID string `json:"clusterId,omitempty"`
 	DayOfWeek string `json:"dayOfWeek"`
 	//+kubebuilder:validation:Minimum:=0
 	//+kubebuilder:validation:Maximum:=23

diff --git a/apis/clusterresources/v1beta1/maintenanceevents_types.go b/apis/clusterresources/v1beta1/maintenanceevents_types.go
@@ -23,7 +23,6 @@ import (
 
 // MaintenanceEventsSpec defines the desired state of MaintenanceEvents
 type MaintenanceEventsSpec struct {
-	ClusterID                    string                        `json:"clusterId"`
 	MaintenanceEventsReschedules []*MaintenanceEventReschedule `json:"maintenanceEventsReschedule"`
 }
 

diff --git a/apis/clusterresources/v1beta1/structs.go b/apis/clusterresources/v1beta1/structs.go
@@ -21,7 +21,7 @@ import (
 )
 
 type VPCPeeringSpec struct {
-	DataCentreID string   `json:"cdcId"`
+	DataCentreID string   `json:"cdcId,omitempty"`
 	PeerSubnets  []string `json:"peerSubnets"`
 }
 
@@ -39,7 +39,7 @@ type PatchRequest struct {
 }
 
 type FirewallRuleSpec struct {
-	ClusterID string `json:"clusterId"`
+	ClusterID string `json:"clusterId,omitempty"`
 	Type      string `json:"type"`
 }
 

diff --git a/apis/clusters/v1beta1/postgresql_types.go b/apis/clusters/v1beta1/postgresql_types.go
@@ -79,10 +79,21 @@ type PgSpec struct {
 	ClusterConfigurations map[string]string `json:"clusterConfigurations,omitempty"`
 	SynchronousModeStrict bool              `json:"synchronousModeStrict,omitempty"`
 	UserRefs              []*UserReference  `json:"userRefs,omitempty"`
+	ClusterResourceRefs   *ClusterResourceRefs `json:"clusterResourceRefs,omitempty"`
 	//+kubebuilder:validate:MaxItems:=1
 	ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"`
 }
 
+type ClusterResourceRefs struct {
+	ClusterBackups                []*UserReference `json:"clusterBackups,omitempty"`
+	ClusterNetworkFirewallRules   []*UserReference `json:"clusterNetworkFirewallRules,omitempty"`
+	AWSVPCPeerings                []*UserReference `json:"awsVPCPeerings,omitempty"`
+	AWSSecurityGroupFirewallRules []*UserReference `json:"awsSecurityGroupFirewallRules,omitempty"`
+	ExclusionWindows              []*UserReference `json:"exclusionWindows,omitempty"`
+	GCPVPCPeerings                []*UserReference `json:"gcpVPCPeerings,omitempty"`
+	AzureVNetPeerings             []*UserReference `json:"azureVNetPeerings,omitempty"`
+}
+
 // PgStatus defines the observed state of PostgreSQL
 type PgStatus struct {
 	ClusterStatus `json:",inline"`
@@ -154,12 +165,11 @@ func (pg *PostgreSQL) NewBackupSpec(startTimestamp int) *clusterresourcesv1beta1
 		ObjectMeta: ctrl.ObjectMeta{
 			Name:        models.PgBackupPrefix + pg.Status.ID + "-" + strconv.Itoa(startTimestamp),
 			Namespace:   pg.Namespace,
-			Annotations: map[string]string{models.StartTimestampAnnotation: strconv.Itoa(startTimestamp)},
+			Annotations: map[string]string{models.StartTimestampAnnotation: strconv.Itoa(startTimestamp), models.ClusterIDAnnotation: pg.Status.ID},
 			Labels:      map[string]string{models.ClusterIDLabel: pg.Status.ID},
 			Finalizers:  []string{models.DeletionFinalizer},
 		},
 		Spec: clusterresourcesv1beta1.ClusterBackupSpec{
-			ClusterID:   pg.Status.ID,
 			ClusterKind: models.PgClusterKind,
 		},
 	}
@@ -195,7 +205,6 @@ func (pgs *PgSpec) ToInstAPI() *models.PGCluster {
 		PostgreSQLVersion:     pgs.Version,
 		DataCentres:           pgs.DCsToInstAPI(),
 		SynchronousModeStrict: pgs.SynchronousModeStrict,
-		Description:           pgs.Description,
 		PrivateNetworkCluster: pgs.PrivateNetworkCluster,
 		SLATier:               pgs.SLATier,
 		TwoFactorDelete:       pgs.TwoFactorDeletesToInstAPI(),
@@ -555,7 +564,6 @@ func (pgs *PgSpec) FromInstAPI(iPg *models.PGCluster) PgSpec {
 			Version:               iPg.PostgreSQLVersion,
 			PCICompliance:         iPg.PCIComplianceMode,
 			PrivateNetworkCluster: iPg.PrivateNetworkCluster,
-			Description:           iPg.Description,
 			SLATier:               iPg.SLATier,
 			TwoFactorDelete:       pgs.Cluster.TwoFactorDeleteFromInstAPI(iPg.TwoFactorDelete),
 		},

diff --git a/apis/clusters/v1beta1/zz_generated.deepcopy.go b/apis/clusters/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/clusterresources.instaclustr.com_awssecuritygroupfirewallrules.yaml b/config/crd/bases/clusterresources.instaclustr.com_awssecuritygroupfirewallrules.yaml
@@ -44,7 +44,6 @@ spec:
               type:
                 type: string
             required:
-            - clusterId
             - securityGroupId
             - type
             type: object

diff --git a/config/crd/bases/clusterresources.instaclustr.com_awsvpcpeerings.yaml b/config/crd/bases/clusterresources.instaclustr.com_awsvpcpeerings.yaml
@@ -48,7 +48,6 @@ spec:
               peerVpcId:
                 type: string
             required:
-            - cdcId
             - peerAwsAccountId
             - peerSubnets
             - peerVpcId

diff --git a/config/crd/bases/clusterresources.instaclustr.com_azurevnetpeerings.yaml b/config/crd/bases/clusterresources.instaclustr.com_azurevnetpeerings.yaml
@@ -50,7 +50,6 @@ spec:
               peerVirtualNetworkName:
                 type: string
             required:
-            - cdcId
             - peerResourceGroup
             - peerSubnets
             - peerSubscriptionId

diff --git a/config/crd/bases/clusterresources.instaclustr.com_clusterbackups.yaml b/config/crd/bases/clusterresources.instaclustr.com_clusterbackups.yaml
@@ -40,7 +40,6 @@ spec:
               clusterKind:
                 type: string
             required:
-            - clusterId
             - clusterKind
             type: object
           status:

diff --git a/config/crd/bases/clusterresources.instaclustr.com_clusternetworkfirewallrules.yaml b/config/crd/bases/clusterresources.instaclustr.com_clusternetworkfirewallrules.yaml
@@ -44,7 +44,6 @@ spec:
               type:
                 type: string
             required:
-            - clusterId
             - network
             - type
             type: object

diff --git a/config/crd/bases/clusterresources.instaclustr.com_exclusionwindows.yaml b/config/crd/bases/clusterresources.instaclustr.com_exclusionwindows.yaml
@@ -49,7 +49,6 @@ spec:
                 minimum: 0
                 type: integer
             required:
-            - clusterId
             - dayOfWeek
             - durationInHours
             - startHour

diff --git a/config/crd/bases/clusterresources.instaclustr.com_gcpvpcpeerings.yaml b/config/crd/bases/clusterresources.instaclustr.com_gcpvpcpeerings.yaml
@@ -46,7 +46,6 @@ spec:
               peerVpcNetworkName:
                 type: string
             required:
-            - cdcId
             - peerProjectId
             - peerSubnets
             - peerVpcNetworkName

diff --git a/config/crd/bases/clusterresources.instaclustr.com_maintenanceevents.yaml b/config/crd/bases/clusterresources.instaclustr.com_maintenanceevents.yaml
@@ -35,8 +35,6 @@ spec:
           spec:
             description: MaintenanceEventsSpec defines the desired state of MaintenanceEvents
             properties:
-              clusterId:
-                type: string
               maintenanceEventsReschedule:
                 items:
                   properties:
@@ -50,7 +48,6 @@ spec:
                   type: object
                 type: array
             required:
-            - clusterId
             - maintenanceEventsReschedule
             type: object
           status: