Clusterresources refs for other clusters

apis/clusterresources/v1beta1/awssecuritygroupfirewallrule_types.go

@@ -65,6 +65,15 @@ func (fr *AWSSecurityGroupFirewallRule) NewPatch() client.Patch {
 	return client.MergeFrom(old)
 }
 
+func (fr *AWSSecurityGroupFirewallRule) AttachToCluster(id string) {
+	fr.Status.ClusterID = id
+	fr.Status.ResourceState = models.CreatingEvent
+}
+
+func (fr *AWSSecurityGroupFirewallRule) DetachFromCluster() {
+	fr.Status.ResourceState = models.DeletingEvent
+}
+
 func init() {
 	SchemeBuilder.Register(&AWSSecurityGroupFirewallRule{}, &AWSSecurityGroupFirewallRuleList{})
 }

apis/clusterresources/v1beta1/awsvpcpeering_types.go

@@ -71,13 +71,21 @@ func (aws *AWSVPCPeering) NewPatch() client.Patch {
 	return client.MergeFrom(old)
 }
 
+func (aws *AWSVPCPeering) AttachToCluster(id string) {
+	aws.Status.CDCID = id
+	aws.Status.ResourceState = models.CreatingEvent
+}
+
+func (aws *AWSVPCPeering) DetachFromCluster() {
+	aws.Status.ResourceState = models.DeletingEvent
+}
+
 func init() {
 	SchemeBuilder.Register(&AWSVPCPeering{}, &AWSVPCPeeringList{})
 }
 
 type immutableAWSVPCPeeringFields struct {
 	specificFields specificAWSVPCPeeringFields
-	peering        immutablePeeringFields
 }
 
 type specificAWSVPCPeeringFields struct {
@@ -91,9 +99,6 @@ func (aws *AWSVPCPeeringSpec) newImmutableFields() *immutableAWSVPCPeeringFields
 			peerAWSAccountID: aws.PeerAWSAccountID,
 			peerRegion:       aws.PeerRegion,
 		},
-		immutablePeeringFields{
-			DataCentreID: aws.DataCentreID,
-		},
 	}
 }
 
@@ -106,8 +111,7 @@ func (aws *AWSVPCPeeringSpec) ValidateUpdate(oldSpec AWSVPCPeeringSpec) error {
 		return err
 	}
 
-	if newImmutableFields.peering != oldImmutableFields.peering ||
-		newImmutableFields.specificFields != oldImmutableFields.specificFields {
+	if newImmutableFields.specificFields != oldImmutableFields.specificFields {
 		return fmt.Errorf("cannot update immutable fields: old spec: %+v: new spec: %+v", oldSpec, aws)
 	}
 
@@ -125,11 +129,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)

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")
 	}

apis/clusterresources/v1beta1/azurevnetpeering_types.go

@@ -71,19 +71,20 @@ func (azure *AzureVNetPeering) NewPatch() client.Patch {
 	return client.MergeFrom(old)
 }
 
+func (azure *AzureVNetPeering) AttachToCluster(id string) {
+	azure.Status.CDCID = id
+	azure.Status.ResourceState = models.CreatingEvent
+}
+
+func (azure *AzureVNetPeering) DetachFromCluster() {
+	azure.Status.ResourceState = models.DeletingEvent
+}
+
 func init() {
 	SchemeBuilder.Register(&AzureVNetPeering{}, &AzureVNetPeeringList{})
 }
 
 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 {

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")
 	}

apis/clusterresources/v1beta1/clusterbackup_types.go

@@ -27,7 +27,6 @@ import (
 
 // ClusterBackupSpec defines the desired state of ClusterBackup
 type ClusterBackupSpec struct {
-	ClusterID   string `json:"clusterId"`
 	ClusterKind string `json:"clusterKind"`
 }
 
@@ -37,6 +36,7 @@ type ClusterBackupStatus struct {
 	Progress        string `json:"progress,omitempty"`
 	Start           int    `json:"start,omitempty"`
 	End             int    `json:"end,omitempty"`
+	ClusterID       string `json:"clusterId,omitempty"`
 }
 
 //+kubebuilder:object:root=true
@@ -71,6 +71,14 @@ func (cbs *ClusterBackupStatus) UpdateStatus(instBackup *models.BackupEvent) {
 	cbs.Progress = fmt.Sprintf("%f", instBackup.Progress)
 }
 
+func (cb *ClusterBackup) AttachToCluster(id string) {
+	cb.Status.ClusterID = id
+}
+
+func (cb *ClusterBackup) DetachFromCluster() {
+
+}
+
 func init() {
 	SchemeBuilder.Register(&ClusterBackup{}, &ClusterBackupList{})
 }

apis/clusterresources/v1beta1/clusternetworkfirewallrule_types.go

@@ -65,6 +65,15 @@ func (fr *ClusterNetworkFirewallRule) NewPatch() client.Patch {
 	return client.MergeFrom(old)
 }
 
+func (fr *ClusterNetworkFirewallRule) AttachToCluster(id string) {
+	fr.Status.ClusterID = id
+	fr.Status.ResourceState = models.CreatingEvent
+}
+
+func (fr *ClusterNetworkFirewallRule) DetachFromCluster() {
+	fr.Status.ResourceState = models.DeletingEvent
+}
+
 func init() {
 	SchemeBuilder.Register(&ClusterNetworkFirewallRule{}, &ClusterNetworkFirewallRuleList{})
 }

apis/clusterresources/v1beta1/exclusionwindow_types.go

@@ -19,11 +19,12 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/instaclustr/operator/pkg/models"
 )
 
 // ExclusionWindowSpec defines the desired state of ExclusionWindow
 type ExclusionWindowSpec struct {
-	ClusterID string `json:"clusterId"`
 	DayOfWeek string `json:"dayOfWeek"`
 	//+kubebuilder:validation:Minimum:=0
 	//+kubebuilder:validation:Maximum:=23
@@ -36,7 +37,9 @@ type ExclusionWindowSpec struct {
 
 // ExclusionWindowStatus defines the observed state of ExclusionWindow
 type ExclusionWindowStatus struct {
-	ID string `json:"id"`
+	ID            string `json:"id,omitempty"`
+	ClusterID     string `json:"clusterId,omitempty"`
+	ResourceState string `json:"resourceState,omitempty"`
 }
 
 //+kubebuilder:object:root=true
@@ -60,11 +63,20 @@ type ExclusionWindowList struct {
 	Items           []ExclusionWindow `json:"items"`
 }
 
+func (ew *ExclusionWindow) AttachToCluster(id string) {
+	ew.Status.ClusterID = id
+	ew.Status.ResourceState = models.CreatingEvent
+}
+
+func (ew *ExclusionWindow) DetachFromCluster() {
+	ew.Status.ResourceState = models.DeletingEvent
+}
+
 func init() {
 	SchemeBuilder.Register(&ExclusionWindow{}, &ExclusionWindowList{})
 }
 
-func (r *ExclusionWindow) NewPatch() client.Patch {
-	old := r.DeepCopy()
+func (ew *ExclusionWindow) NewPatch() client.Patch {
+	old := ew.DeepCopy()
 	return client.MergeFrom(old)
 }

apis/clusterresources/v1beta1/gcpvpcpeering_types.go

@@ -69,19 +69,20 @@ func (gcp *GCPVPCPeering) NewPatch() client.Patch {
 	return client.MergeFrom(old)
 }
 
+func (gcp *GCPVPCPeering) AttachToCluster(id string) {
+	gcp.Status.CDCID = id
+	gcp.Status.ResourceState = models.CreatingEvent
+}
+
+func (gcp *GCPVPCPeering) DetachFromCluster() {
+	gcp.Status.ResourceState = models.DeletingEvent
+}
+
 func init() {
 	SchemeBuilder.Register(&GCPVPCPeering{}, &GCPVPCPeeringList{})
 }
 
 func (gcp *GCPVPCPeeringSpec) Validate() error {
-	dataCentreIDMatched, err := regexp.Match(models.UUIDStringRegExp, []byte(gcp.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 gcp.PeerSubnets {
 		peerSubnetMatched, err := regexp.Match(models.PeerSubnetsRegExp, []byte(subnet))
 		if err != nil {

apis/clusterresources/v1beta1/gcpvpcpeering_webhook.go

@@ -67,10 +67,6 @@ func (r *GCPVPCPeering) ValidateCreate() error {
 		return fmt.Errorf("peer Project 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")
 	}

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"`
 }
 

apis/clusterresources/v1beta1/structs.go

@@ -21,15 +21,16 @@ import (
 )
 
 type VPCPeeringSpec struct {
-	DataCentreID string   `json:"cdcId"`
-	PeerSubnets  []string `json:"peerSubnets"`
+	PeerSubnets []string `json:"peerSubnets"`
 }
 
 type PeeringStatus struct {
 	ID            string `json:"id,omitempty"`
 	StatusCode    string `json:"statusCode,omitempty"`
 	Name          string `json:"name,omitempty"`
 	FailureReason string `json:"failureReason,omitempty"`
+	CDCID         string `json:"cdcid,omitempty"`
+	ResourceState string `json:"resourceState,omitempty"`
 }
 
 type PatchRequest struct {
@@ -39,18 +40,15 @@ type PatchRequest struct {
 }
 
 type FirewallRuleSpec struct {
-	ClusterID string `json:"clusterId"`
-	Type      string `json:"type"`
+	Type string `json:"type"`
 }
 
 type FirewallRuleStatus struct {
 	ID             string `json:"id,omitempty"`
 	DeferredReason string `json:"deferredReason,omitempty"`
 	Status         string `json:"status,omitempty"`
-}
-
-type immutablePeeringFields struct {
-	DataCentreID string
+	ClusterID      string `json:"clusterId,omitempty"`
+	ResourceState  string `json:"resourceState,omitempty"`
 }
 
 type SecretReference struct {

apis/clusters/v1beta1/cadence_types.go

@@ -73,6 +73,7 @@ type CadenceSpec struct {
 	PackagedProvisioning []*PackagedProvisioning `json:"packagedProvisioning,omitempty"`
 	TargetPrimaryCadence []*TargetCadence        `json:"targetPrimaryCadence,omitempty"`
 	ResizeSettings       []*ResizeSettings       `json:"resizeSettings,omitempty"`
+	ClusterResources     ClusterResourceRefs     `json:"clusterResources,omitempty"`
 }
 
 type AWSArchival struct {

apis/clusters/v1beta1/cassandra_types.go

@@ -63,6 +63,7 @@ type CassandraSpec struct {
 	Spark               []*Spark               `json:"spark,omitempty"`
 	BundledUseOnly      bool                   `json:"bundledUseOnly,omitempty"`
 	UserRefs            References             `json:"userRefs,omitempty"`
+	ClusterResources    ClusterResourceRefs    `json:"clusterResources,omitempty"`
 	//+kubebuilder:validate:MaxItems:=1
 	ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"`
 }
@@ -152,7 +153,6 @@ func (c *Cassandra) NewBackupSpec(startTimestamp int) *clusterresourcesv1beta1.C
 			Finalizers:  []string{models.DeletionFinalizer},
 		},
 		Spec: clusterresourcesv1beta1.ClusterBackupSpec{
-			ClusterID:   c.Status.ID,
 			ClusterKind: models.CassandraClusterKind,
 		},
 	}

apis/clusters/v1beta1/kafka_types.go

@@ -89,6 +89,7 @@ type KafkaSpec struct {
 	KarapaceSchemaRegistry   []*KarapaceSchemaRegistry `json:"karapaceSchemaRegistry,omitempty"`
 	BundledUseOnly           bool                      `json:"bundledUseOnly,omitempty"`
 	UserRefs                 References                `json:"userRefs,omitempty"`
+	ClusterResources         ClusterResourceRefs       `json:"clusterResources,omitempty"`
 	Kraft                    []*Kraft                  `json:"kraft,omitempty"`
 }
 

apis/clusters/v1beta1/kafkaconnect_types.go

@@ -111,6 +111,7 @@ type KafkaConnectSpec struct {
 
 	// CustomConnectors defines the location for custom connector storage and access info.
 	CustomConnectors []*CustomConnectors `json:"customConnectors,omitempty"`
+	ClusterResources ClusterResourceRefs `json:"clusterResources,omitempty"`
 }
 
 // KafkaConnectStatus defines the observed state of KafkaConnect

apis/clusters/v1beta1/opensearch_types.go

@@ -54,6 +54,7 @@ type OpenSearchSpec struct {
 	AlertingPlugin           bool                    `json:"alertingPlugin,omitempty"`
 	BundledUseOnly           bool                    `json:"bundledUseOnly,omitempty"`
 	UserRefs                 References              `json:"userRefs,omitempty"`
+	ClusterResources         ClusterResourceRefs     `json:"clusterResources,omitempty"`
 	//+kubuilder:validation:MaxItems:=1
 	ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"`
 	//+kubuilder:validation:MaxItems:=1
@@ -584,7 +585,6 @@ func (os *OpenSearch) NewBackupSpec(startTimestamp int) *clusterresourcesv1beta1
 			Finalizers:  []string{models.DeletionFinalizer},
 		},
 		Spec: clusterresourcesv1beta1.ClusterBackupSpec{
-			ClusterID:   os.Status.ID,
 			ClusterKind: models.OsClusterKind,
 		},
 	}

apis/clusters/v1beta1/postgresql_types.go

@@ -75,10 +75,11 @@ type PgRestoreFrom struct {
 type PgSpec struct {
 	PgRestoreFrom         *PgRestoreFrom `json:"pgRestoreFrom,omitempty"`
 	Cluster               `json:",inline"`
-	DataCentres           []*PgDataCentre   `json:"dataCentres,omitempty"`
-	ClusterConfigurations map[string]string `json:"clusterConfigurations,omitempty"`
-	SynchronousModeStrict bool              `json:"synchronousModeStrict,omitempty"`
-	UserRefs              []*Reference      `json:"userRefs,omitempty"`
+	DataCentres           []*PgDataCentre     `json:"dataCentres,omitempty"`
+	ClusterConfigurations map[string]string   `json:"clusterConfigurations,omitempty"`
+	SynchronousModeStrict bool                `json:"synchronousModeStrict,omitempty"`
+	UserRefs              []*Reference        `json:"userRefs,omitempty"`
+	ClusterResources      ClusterResourceRefs `json:"clusterResources,omitempty"`
 	//+kubebuilder:validate:MaxItems:=1
 	ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"`
 }
@@ -159,7 +160,6 @@ func (pg *PostgreSQL) NewBackupSpec(startTimestamp int) *clusterresourcesv1beta1
 			Finalizers:  []string{models.DeletionFinalizer},
 		},
 		Spec: clusterresourcesv1beta1.ClusterBackupSpec{
-			ClusterID:   pg.Status.ID,
 			ClusterKind: models.PgClusterKind,
 		},
 	}