clusterreference for clusterresources were implemented

apis/clusterresources/v1beta1/awsendpointserviceprincipal_types.go

@@ -24,7 +24,8 @@ import (
 // AWSEndpointServicePrincipalSpec defines the desired state of AWSEndpointServicePrincipal
 type AWSEndpointServicePrincipalSpec struct {
 	// The ID of the cluster data center
-	ClusterDataCenterID string `json:"clusterDataCenterId"`
+	ClusterDataCenterID string      `json:"clusterDataCenterId,omitempty"`
+	ClusterRef          *ClusterRef `json:"clusterRef,omitempty"`
 
 	// The Instaclustr ID of the AWS endpoint service
 	EndPointServiceID string `json:"endPointServiceId,omitempty"`
@@ -36,7 +37,8 @@ type AWSEndpointServicePrincipalSpec struct {
 // AWSEndpointServicePrincipalStatus defines the observed state of AWSEndpointServicePrincipal
 type AWSEndpointServicePrincipalStatus struct {
 	// The Instaclustr ID of the IAM Principal ARN
-	ID string `json:"id,omitempty"`
+	ID    string `json:"id,omitempty"`
+	CDCID string `json:"cdcId,omitempty"`
 
 	// The Instaclustr ID of the AWS endpoint service
 	EndPointServiceID string `json:"endPointServiceId,omitempty"`

apis/clusterresources/v1beta1/awsendpointserviceprincipal_webhook.go

@@ -45,9 +45,9 @@ var principalArnPattern, _ = regexp.Compile(`^arn:aws:iam::[0-9]{12}:(root$|user
 func (r *AWSEndpointServicePrincipal) ValidateCreate() error {
 	awsendpointserviceprincipallog.Info("validate create", "name", r.Name)
 
-	if r.Spec.ClusterDataCenterID == "" ||
-		r.Spec.PrincipalARN == "" {
-		return fmt.Errorf("spec.clusterDataCenterId and spec.principalArn should be filled")
+	if (r.Spec.ClusterDataCenterID == "" && r.Spec.ClusterRef == nil) ||
+		(r.Spec.ClusterDataCenterID != "" && r.Spec.ClusterRef != nil) {
+		return fmt.Errorf("only one of the following fields should be specified: dataCentreId, clusterRef")
 	}
 
 	if !principalArnPattern.MatchString(r.Spec.PrincipalARN) {

apis/clusterresources/v1beta1/awssecuritygroupfirewallrule_webhook.go

@@ -65,6 +65,11 @@ func (r *AWSSecurityGroupFirewallRule) ValidateCreate() error {
 			r.Spec.Type, models.BundleTypes)
 	}
 
+	if (r.Spec.ClusterID == "" && r.Spec.ClusterRef == nil) ||
+		(r.Spec.ClusterID != "" && r.Spec.ClusterRef != nil) {
+		return fmt.Errorf("only one of dataCenter ID and cluster reference fields should be specified")
+	}
+
 	return nil
 }
 

apis/clusterresources/v1beta1/awsvpcpeering_types.go

@@ -29,7 +29,7 @@ import (
 
 // AWSVPCPeeringSpec defines the desired state of AWSVPCPeering
 type AWSVPCPeeringSpec struct {
-	VPCPeeringSpec   `json:",inline"`
+	PeeringSpec      `json:",inline"`
 	PeerAWSAccountID string `json:"peerAwsAccountId"`
 	PeerVPCID        string `json:"peerVpcId"`
 	PeerRegion       string `json:"peerRegion,omitempty"`
@@ -128,9 +128,11 @@ 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 aws.DataCentreID != "" {
+		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) {

apis/clusterresources/v1beta1/awsvpcpeering_webhook.go

@@ -67,8 +67,9 @@ 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.DataCentreID == "" && r.Spec.ClusterRef == nil) ||
+		(r.Spec.DataCentreID != "" && r.Spec.ClusterRef != nil) {
+		return fmt.Errorf("only one of the following fields should be specified: dataCentreId, clusterRef")
 	}
 
 	if r.Spec.PeerSubnets == nil {

apis/clusterresources/v1beta1/azurevnetpeering_types.go

@@ -28,7 +28,7 @@ import (
 
 // AzureVNetPeeringSpec defines the desired state of AzureVNetPeering
 type AzureVNetPeeringSpec struct {
-	VPCPeeringSpec         `json:",inline"`
+	PeeringSpec            `json:",inline"`
 	PeerResourceGroup      string `json:"peerResourceGroup"`
 	PeerSubscriptionID     string `json:"peerSubscriptionId"`
 	PeerADObjectID         string `json:"peerAdObjectId,omitempty"`

apis/clusterresources/v1beta1/azurevnetpeering_webhook.go

@@ -71,8 +71,9 @@ 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.DataCentreID == "" && r.Spec.ClusterRef == nil) ||
+		(r.Spec.DataCentreID != "" && r.Spec.ClusterRef != nil) {
+		return fmt.Errorf("only one of the following fields should be specified: dataCentreId, clusterRef")
 	}
 
 	if r.Spec.PeerSubnets == nil {

apis/clusterresources/v1beta1/clusterbackup_types.go

@@ -27,12 +27,13 @@ import (
 
 // ClusterBackupSpec defines the desired state of ClusterBackup
 type ClusterBackupSpec struct {
-	ClusterID   string `json:"clusterId"`
-	ClusterKind string `json:"clusterKind"`
+	ClusterID  string      `json:"clusterId,omitempty"`
+	ClusterRef *ClusterRef `json:"clusterRef,omitempty"`
 }
 
 // ClusterBackupStatus defines the observed state of ClusterBackup
 type ClusterBackupStatus struct {
+	ClusterID       string `json:"clusterId,omitempty"`
 	OperationStatus string `json:"operationStatus,omitempty"`
 	Progress        string `json:"progress,omitempty"`
 	Start           int    `json:"start,omitempty"`

apis/clusterresources/v1beta1/clusterbackup_webhook.go

@@ -54,11 +54,19 @@ var _ webhook.Validator = &ClusterBackup{}
 func (r *ClusterBackup) ValidateCreate() error {
 	clusterbackuplog.Info("validate create", "name", r.Name)
 
-	_, ok := models.ClusterKindsMap[r.Spec.ClusterKind]
+	_, ok := models.ClusterKindsMap[r.Spec.ClusterRef.ClusterKind]
 	if !ok {
 		return models.ErrUnsupportedBackupClusterKind
 	}
 
+	if r.Spec.ClusterRef.Name != "" && r.Spec.ClusterRef.Namespace == "" {
+		return models.ErrEmptyNamespace
+	}
+
+	if r.Spec.ClusterRef.Namespace != "" && r.Spec.ClusterRef.Name == "" {
+		return models.ErrEmptyName
+	}
+
 	return nil
 }
 

apis/clusterresources/v1beta1/clusternetworkfirewallrule_webhook.go

@@ -65,6 +65,11 @@ func (fr *ClusterNetworkFirewallRule) ValidateCreate() error {
 			fr.Spec.Type, models.BundleTypes)
 	}
 
+	if (fr.Spec.ClusterID == "" && fr.Spec.ClusterRef == nil) ||
+		(fr.Spec.ClusterID != "" && fr.Spec.ClusterRef != nil) {
+		return fmt.Errorf("only one of the following fields should be specified: clusterId, clusterRef")
+	}
+
 	return nil
 }
 

apis/clusterresources/v1beta1/exclusionwindow_types.go

@@ -23,8 +23,9 @@ import (
 
 // ExclusionWindowSpec defines the desired state of ExclusionWindow
 type ExclusionWindowSpec struct {
-	ClusterID string `json:"clusterId"`
-	DayOfWeek string `json:"dayOfWeek"`
+	ClusterID  string      `json:"clusterId,omitempty"`
+	ClusterRef *ClusterRef `json:"clusterRef,omitempty"`
+	DayOfWeek  string      `json:"dayOfWeek"`
 	//+kubebuilder:validation:Minimum:=0
 	//+kubebuilder:validation:Maximum:=23
 	StartHour int32 `json:"startHour"`
@@ -36,7 +37,8 @@ type ExclusionWindowSpec struct {
 
 // ExclusionWindowStatus defines the observed state of ExclusionWindow
 type ExclusionWindowStatus struct {
-	ID string `json:"id"`
+	ClusterID string `json:"clusterId,omitempty"`
+	ID        string `json:"id"`
 }
 
 //+kubebuilder:object:root=true
@@ -70,3 +72,17 @@ func (r *ExclusionWindow) NewPatch() client.Patch {
 	old := r.DeepCopy()
 	return client.MergeFrom(old)
 }
+
+func (e *ExclusionWindowSpec) validateUpdate(old ExclusionWindowSpec) bool {
+	if e.DayOfWeek != old.DayOfWeek ||
+		e.ClusterID != old.ClusterID ||
+		e.DurationInHours != old.DurationInHours ||
+		e.StartHour != old.StartHour ||
+		(e.ClusterRef != nil && old.ClusterRef == nil) ||
+		(e.ClusterRef == nil && old.ClusterRef != nil) ||
+		(e.ClusterRef != nil && *e.ClusterRef != *old.ClusterRef) {
+		return false
+	}
+
+	return true
+}

apis/clusterresources/v1beta1/exclusionwindow_webhook.go

@@ -55,6 +55,11 @@ var _ webhook.Validator = &ExclusionWindow{}
 func (r *ExclusionWindow) ValidateCreate() error {
 	exclusionwindowlog.Info("validate create", "name", r.Name)
 
+	if (r.Spec.ClusterID == "" && r.Spec.ClusterRef == nil) ||
+		(r.Spec.ClusterID != "" && r.Spec.ClusterRef != nil) {
+		return fmt.Errorf("only one of the following fields should be specified: clusterId, clusterRef")
+	}
+
 	if !validation.Contains(r.Spec.DayOfWeek, models.DaysOfWeek) {
 		return fmt.Errorf("%v, available values: %v",
 			models.ErrIncorrectDayOfWeek, models.DaysOfWeek)
@@ -67,7 +72,7 @@ func (r *ExclusionWindow) ValidateUpdate(old runtime.Object) error {
 	exclusionwindowlog.Info("validate update", "name", r.Name)
 	oldWindow := old.(*ExclusionWindow)
 
-	if r.Spec != oldWindow.Spec {
+	if !r.Spec.validateUpdate(oldWindow.Spec) {
 		return models.ErrImmutableSpec
 	}
 

apis/clusterresources/v1beta1/gcpvpcpeering_types.go

@@ -28,7 +28,7 @@ import (
 
 // GCPVPCPeeringSpec defines the desired state of GCPVPCPeering
 type GCPVPCPeeringSpec struct {
-	VPCPeeringSpec     `json:",inline"`
+	PeeringSpec        `json:",inline"`
 	PeerVPCNetworkName string `json:"peerVpcNetworkName"`
 	PeerProjectID      string `json:"peerProjectId"`
 }

apis/clusterresources/v1beta1/gcpvpcpeering_webhook.go

@@ -67,8 +67,9 @@ 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.DataCentreID == "" && r.Spec.ClusterRef == nil) ||
+		(r.Spec.DataCentreID != "" && r.Spec.ClusterRef != nil) {
+		return fmt.Errorf("only one of the following fields should be specified: dataCentreId, clusterRef")
 	}
 
 	if r.Spec.PeerSubnets == nil {

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/opensearchegressrules_types.go

@@ -22,14 +22,16 @@ import (
 )
 
 type OpenSearchEgressRulesSpec struct {
-	ClusterID           string `json:"clusterId"`
-	OpenSearchBindingID string `json:"openSearchBindingId"`
-	Source              string `json:"source"`
-	Type                string `json:"type,omitempty"`
+	ClusterID           string      `json:"clusterId,omitempty"`
+	ClusterRef          *ClusterRef `json:"clusterRef,omitempty"`
+	OpenSearchBindingID string      `json:"openSearchBindingId"`
+	Source              string      `json:"source"`
+	Type                string      `json:"type,omitempty"`
 }
 
 type OpenSearchEgressRulesStatus struct {
-	ID string `json:"id,omitempty"`
+	ID        string `json:"id,omitempty"`
+	ClusterID string `json:"clusterId,omitempty"`
 }
 
 //+kubebuilder:object:root=true

apis/clusterresources/v1beta1/opensearchegressrules_webhook.go

@@ -65,6 +65,11 @@ func (r *OpenSearchEgressRules) ValidateCreate() error {
 		return fmt.Errorf("the type should be equal to one of the options: %q , got: %q", destinationTypes, r.Spec.Type)
 	}
 
+	if (r.Spec.ClusterID == "" && r.Spec.ClusterRef == nil) ||
+		(r.Spec.ClusterID != "" && r.Spec.ClusterRef != nil) {
+		return fmt.Errorf("only one of the following fields should be specified: clusterId, clusterRef")
+	}
+
 	return nil
 }
 
@@ -78,7 +83,7 @@ func (r *OpenSearchEgressRules) ValidateUpdate(old runtime.Object) error {
 		return r.ValidateCreate()
 	}
 
-	if r.Spec != oldRules.Spec {
+	if r.Spec != oldRules.Spec && r.Generation != oldRules.Generation {
 		return models.ErrImmutableSpec
 	}
 

apis/clusterresources/v1beta1/structs.go

@@ -20,18 +20,22 @@ import (
 	"encoding/json"
 
 	"github.com/instaclustr/operator/pkg/apiextensions"
+
+	"k8s.io/apimachinery/pkg/types"
 )
 
-type VPCPeeringSpec struct {
-	DataCentreID string   `json:"cdcId"`
-	PeerSubnets  []string `json:"peerSubnets"`
+type PeeringSpec struct {
+	DataCentreID string      `json:"cdcId,omitempty"`
+	PeerSubnets  []string    `json:"peerSubnets"`
+	ClusterRef   *ClusterRef `json:"clusterRef,omitempty"`
 }
 
 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"`
 }
 
 type PatchRequest struct {
@@ -41,14 +45,16 @@ type PatchRequest struct {
 }
 
 type FirewallRuleSpec struct {
-	ClusterID string `json:"clusterId"`
-	Type      string `json:"type"`
+	ClusterID  string      `json:"clusterId,omitempty"`
+	Type       string      `json:"type"`
+	ClusterRef *ClusterRef `json:"clusterRef,omitempty"`
 }
 
 type FirewallRuleStatus struct {
 	ID             string `json:"id,omitempty"`
 	DeferredReason string `json:"deferredReason,omitempty"`
 	Status         string `json:"status,omitempty"`
+	ClusterID      string `json:"clusterId,omitempty"`
 }
 
 type immutablePeeringFields struct {
@@ -57,3 +63,17 @@ type immutablePeeringFields struct {
 
 // +kubebuilder:object:generate:=false
 type SecretReference = apiextensions.ObjectReference
+
+type ClusterRef struct {
+	Name        string `json:"name,omitempty"`
+	Namespace   string `json:"namespace,omitempty"`
+	ClusterKind string `json:"clusterKind,omitempty"`
+	CDCName     string `json:"cdcName,omitempty"`
+}
+
+func (r *ClusterRef) AsNamespacedName() types.NamespacedName {
+	return types.NamespacedName{
+		Name:      r.Name,
+		Namespace: r.Namespace,
+	}
+}