First part....

Author: Francisco Barros

api/v1alpha1/drupalsite_types.go

@@ -106,11 +106,12 @@ type Configuration struct {
 	// +optional
 	WebDAVPassword string `json:"webDAVPassword,omitempty"`
 
-	// ScheduledBackups when "true" will enable Scheduled Velero backups for the site and when "false" will disable scheduled backups
-	// +kubebuilder:validation:Enum:=enabled;disabled
-	// +kubebuilder:default=enabled
+	// isPrimary defines if the DrupalSite instance is the "main" one of the project.
+	// Currently, it defines Scheduled backups
+	// When "true" will enable Scheduled Velero backups for the site and when "false" will disable scheduled backups
+	// +kubebuilder:default=true
 	// +optional
-	ScheduledBackups string `json:"scheduledBackups,omitempty"`
+	IsPrimary bool `json:"isPrimary,omitempty"`
 }
 
 // QoSClass specifies the website's performance and availability requirements
@@ -153,6 +154,9 @@ type DrupalSiteStatus struct {
 	// It should be copied to Gitlab.
 	// +optional
 	GitlabWebhookURL string `json:"gitlabWebhookURL,omitempty"`
+
+	// IsPrimary states if the Drupalsite is the main instance of the project
+	IsPrimary bool `json:"isPrimary,omitempty"`
 }
 
 // ReleaseID reports the actual release of CERN Drupal Distribution that is being used in the deployment.

config/crd/bases/drupal.webservices.cern.ch_drupalsites.yaml

@@ -76,6 +76,13 @@ spec:
                       through a Git repo, following these docs
                     pattern: '[(http(s)?):\/\/(www\.)?a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)'
                     type: string
+                  isPrimary:
+                    default: true
+                    description: isPrimary defines if the DrupalSite instance is the
+                      "main" one of the project. Currently, it defines Scheduled backups
+                      When "true" will enable Scheduled Velero backups for the site
+                      and when "false" will disable scheduled backups
+                    type: boolean
                   qosClass:
                     default: standard
                     description: QoSClass specifies the website's performance and
@@ -85,15 +92,6 @@ spec:
                     - test
                     - standard
                     type: string
-                  scheduledBackups:
-                    default: enabled
-                    description: ScheduledBackups when "true" will enable Scheduled
-                      Velero backups for the site and when "false" will disable scheduled
-                      backups
-                    enum:
-                    - enabled
-                    - disabled
-                    type: string
                   webDAVPassword:
                     description: WebDAVPassword sets the HTTP basic auth password
                       for WebDAV file access. A default is auto-generated if a value
@@ -213,6 +211,10 @@ spec:
                   of the site's image after changes on its source Gitlab "extraConfigurationRepo".
                   It should be copied to Gitlab.
                 type: string
+              isPrimary:
+                description: IsPrimary states if the Drupalsite is the main instance
+                  of the project
+                type: boolean
               releaseID:
                 description: ReleaseID reports the actual release of CERN Drupal Distribution
                   that is being used in the deployment.

controllers/drupalsite_controller.go

@@ -235,13 +235,14 @@ func (r *DrupalSiteReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	// 1. Init: Check if finalizer is set. If not, set it, validate and update CR status
 
-	if update, err := r.ensureSpecFinalizer(ctx, drupalSite, log); err != nil {
+	if update, err, site := r.ensureSpecFinalizer(ctx, drupalSite, log); err != nil {
 		log.Error(err, fmt.Sprintf("%v failed to ensure DrupalSite spec defaults", err.Unwrap()))
 		setErrorCondition(drupalSite, err)
-		return r.updateCRStatusOrFailReconcile(ctx, log, drupalSite)
+		return r.updateCRSpecAndStatusOrFailReconcile(ctx, log, site)
 	} else if update {
 		log.V(3).Info("Initializing DrupalSite Spec")
-		return r.updateCRorFailReconcile(ctx, log, drupalSite)
+		return r.updateCRSpecAndStatusOrFailReconcile(ctx, log, site)
+		//return r.updateCRorFailReconcile(ctx, log, drupalSite)
 	}
 	if err := validateSpec(drupalSite.Spec); err != nil {
 		log.Error(err, fmt.Sprintf("%v failed to validate DrupalSite spec", err.Unwrap()))
@@ -512,7 +513,7 @@ func validateSpec(drpSpec webservicesv1a1.DrupalSiteSpec) reconcileError {
 
 // ensureSpecFinalizer ensures that the spec is valid, adding extra info if necessary, and that the finalizer is there,
 // then returns if it needs to be updated.
-func (r *DrupalSiteReconciler) ensureSpecFinalizer(ctx context.Context, drp *webservicesv1a1.DrupalSite, log logr.Logger) (update bool, err reconcileError) {
+func (r *DrupalSiteReconciler) ensureSpecFinalizer(ctx context.Context, drp *webservicesv1a1.DrupalSite, log logr.Logger) (update bool, err reconcileError, site *webservicesv1a1.DrupalSite) {
 	if !controllerutil.ContainsFinalizer(drp, finalizerStr) {
 		log.V(3).Info("Adding finalizer")
 		controllerutil.AddFinalizer(drp, finalizerStr)
@@ -528,9 +529,9 @@ func (r *DrupalSiteReconciler) ensureSpecFinalizer(ctx context.Context, drp *web
 		err := r.Get(ctx, types.NamespacedName{Name: string(drp.Spec.Configuration.CloneFrom), Namespace: drp.Namespace}, &sourceSite)
 		switch {
 		case k8sapierrors.IsNotFound(err):
-			return false, newApplicationError(fmt.Errorf("CloneFrom DrupalSite doesn't exist"), ErrInvalidSpec)
+			return false, newApplicationError(fmt.Errorf("CloneFrom DrupalSite doesn't exist"), ErrInvalidSpec), drp
 		case err != nil:
-			return false, newApplicationError(err, ErrClientK8s)
+			return false, newApplicationError(err, ErrClientK8s), drp
 		}
 		// The destination disk size must be at least as large as the source
 		if drp.Spec.Configuration.DiskSize < sourceSite.Spec.Configuration.DiskSize {
@@ -546,13 +547,23 @@ func (r *DrupalSiteReconciler) ensureSpecFinalizer(ctx context.Context, drp *web
 		}
 		update = true
 	}
-
 	// Initialize 'Spec.Configuration.ScheduledBackups' if empty
-	if len(drp.Spec.Configuration.ScheduledBackups) == 0 {
-		drp.Spec.Configuration.ScheduledBackups = "enabled"
+	if drp.Spec.Configuration.IsPrimary {
+		drupalsiteList := &webservicesv1a1.DrupalSiteList{}
+		r.Client.List(ctx, drupalsiteList, &client.ListOptions{Namespace: drp.Namespace})
+		drp.Status.IsPrimary = drp.Spec.IsPrimary
+		for _, site := range drupalsiteList.Items {
+			//if site.Spec.IsPrimary && site.Name != drp.Name {
+			if site.Spec.IsPrimary {
+				update = true
+				site.Spec.IsPrimary = false
+				return update, nil, &site
+			}
+		}
+		//drp.Status.IsPrimary = drp.Spec.IsPrimary
 		update = true
 	}
-	return update, nil
+	return update, nil, drp
 }
 
 // getRunningdeployment fetches the running drupal deployment

controllers/drupalsite_resources.go

@@ -287,7 +287,7 @@ func (r *DrupalSiteReconciler) ensureResources(drp *webservicesv1a1.DrupalSite,
 	}
 
 	// 5. Cluster-scoped: Backup schedule, Tekton RBAC
-	if drp.Spec.Configuration.ScheduledBackups == "enabled" {
+	if drp.Spec.Configuration.IsPrimary {
 		if transientErr := r.ensureResourceX(ctx, drp, "backup_schedule", log); transientErr != nil {
 			transientErrs = append(transientErrs, transientErr.Wrap("%v: for Velero Schedule"))
 		}

controllers/reconciler_utils.go

@@ -148,6 +148,21 @@ func (r *DrupalSiteReconciler) updateCRStatusOrFailReconcile(ctx context.Context
 	return reconcile.Result{}, nil
 }
 
+// updateCRStatusOrFailReconcile tries to update the Custom Resource Status and logs any error
+func (r *DrupalSiteReconciler) updateCRSpecAndStatusOrFailReconcile(ctx context.Context, log logr.Logger, drp *webservicesv1a1.DrupalSite) (
+	reconcile.Result, error) {
+	if err := r.Client.Patch(ctx, drp, nil); err != nil {
+		//if err := r.Status().Update(ctx, drp); err != nil {
+		if k8sapierrors.IsConflict(err) {
+			log.V(4).Info("Object changed while reconciling. Requeuing.")
+			return reconcile.Result{Requeue: true}, nil
+		}
+		log.Error(err, fmt.Sprintf("%v failed to update the application status", ErrClientK8s))
+		return reconcile.Result{}, err
+	}
+	return reconcile.Result{}, nil
+}
+
 // getBuildStatus gets the build status from one of the builds for a given resources
 func (r *DrupalSiteReconciler) getBuildStatus(ctx context.Context, resource string, drp *webservicesv1a1.DrupalSite) (buildv1.BuildPhase, error) {
 	buildList := &buildv1.BuildList{}