Refactoring some code...

Author: Francisco Barros

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

@@ -0,0 +1,58 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.4.1
+  creationTimestamp: null
+  name: drupalprojectconfigs.drupal.webservices.cern.ch
+spec:
+  group: drupal.webservices.cern.ch
+  names:
+    kind: DrupalProjectConfig
+    listKind: DrupalProjectConfigList
+    plural: drupalprojectconfigs
+    singular: drupalprojectconfig
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: DrupalProjectConfig is the Schema for the drupalprojectconfigs
+          API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: DrupalProjectConfigSpec defines the desired state of DrupalProjectConfig
+            properties:
+              primarySiteName:
+                description: PrimarySiteName defines the primary DrupalSite instance
+                  of a project
+                type: string
+            type: object
+          status:
+            description: DrupalProjectConfigStatus defines the observed state of DrupalProjectConfig
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

controllers/drupalsite_controller.go

@@ -156,11 +156,12 @@ func (r *DrupalSiteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Watches(&source.Kind{Type: &webservicesv1a1.DrupalProjectConfig{}}, handler.EnqueueRequestsFromMapFunc(
 			// Reconcile every DrupalSite in a given namespace
 			func(a client.Object) []reconcile.Request {
-				req := make([]reconcile.Request, 1)
-				// The DrupalSite has the same name as the DrupalSiteConfigOverride
-				req[0].Name = a.GetName()
-				req[0].Namespace = a.GetNamespace()
-				return req
+				log := r.Log.WithValues("Source", "Namespace event handler", "Namespace", a.GetName())
+				_, exists := a.GetLabels()["drupal.cern.ch/user-project"]
+				if exists {
+					return fetchDrupalSitesInNamespace(mgr, log, a.GetName())
+				}
+				return []reconcile.Request{}
 			}),
 		).
 		WithOptions(controller.Options{
@@ -326,22 +327,22 @@ func (r *DrupalSiteReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 			}
 		}
 	}
-	// Check if Primary DrupalSite HAS a website, and if it does NOT + This DrupalSIte instance is unique -> Become Primary Website
-	if needsUpdate, err, dpc := r.checkIfPrimaryDrupalsiteExists(ctx, drupalSite); err != nil {
+	// Check if DrupalProjectConfig has not a primary website + This DrupalSite instance is unique -> Become Primary Website
+	if updateNeeded, err, dpc := r.checkIfPrimaryDrupalsiteExists(ctx, drupalSite); err != nil {
 		log.Error(err, fmt.Sprintf("%v failed to validate if DrupalSite is Primary", err.Unwrap()))
 		setErrorCondition(drupalSite, err)
 		return r.updateCRStatusOrFailReconcile(ctx, log, drupalSite)
-	} else if needsUpdate {
+	} else if updateNeeded {
 		log.Info("Updating DrupalProjectConfig", "")
 		return r.updateDrupalProjectConfigCRorFailReconcile(ctx, log, dpc)
 	}
 
 	// Check if current instance is the Primary Drupalsite
-	if needsUpdate, err := r.checkIfPrimaryDrupalsite(ctx, drupalSite); err != nil {
+	if updateNeeded, err := r.checkIfPrimaryDrupalsite(ctx, drupalSite); err != nil {
 		log.Error(err, fmt.Sprintf("%v failed to validate if DrupalSite is Primary", err.Unwrap()))
 		setErrorCondition(drupalSite, err)
 		return r.updateCRStatusOrFailReconcile(ctx, log, drupalSite)
-	} else if needsUpdate {
+	} else if updateNeeded {
 		return r.updateCRStatusOrFailReconcile(ctx, log, drupalSite)
 	}