feat: BREAKING moved business service to cluster scoped

mattgialelis · Jul 3, 2024 · 53a4f0d · 53a4f0d
1 parent 542e471
commit 53a4f0d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/PROJECT b/PROJECT
@@ -10,7 +10,6 @@ repo: github.com/mattgialelis/dutycontroller
 resources:
 - api:
     crdVersion: v1
-    namespaced: true
   controller: true
   domain: dutycontroller.io
   group: pagerduty

diff --git a/api/v1beta1/businessservice_types.go b/api/v1beta1/businessservice_types.go
@@ -37,6 +37,8 @@ type BusinessServiceStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster
+
 // BusinessService is the Schema for the businessservices API
 type BusinessService struct {
 	metav1.TypeMeta   `json:",inline"`

diff --git a/config/crd/bases/pagerduty.dutycontroller.io_businessservices.yaml b/config/crd/bases/pagerduty.dutycontroller.io_businessservices.yaml
@@ -12,7 +12,7 @@ spec:
     listKind: BusinessServiceList
     plural: businessservices
     singular: businessservice
-  scope: Namespaced
+  scope: Cluster
   versions:
   - name: v1beta1
     schema:

diff --git a/config/samples/pagerduty_v1beta1_services.yaml b/config/samples/pagerduty_v1beta1_services.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   acknowledgeTimeout: 300
   autoResolveTimeout: 600
-  businessService: "example-businessservice"
+  businessService: "businessservice-sample"
   description: "My services"
   escalationPolicy: "test1-ep"
   status: "Active"
diff --git a/pkg/controller/pagerduty/businessservice/businessservice_controller.go b/pkg/controller/pagerduty/businessservice/businessservice_controller.go
@@ -93,13 +93,15 @@ func (r *BusinessServiceReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		}
 
 		businesService.Status.ID = id
+		log.Info("Created BusinessService", "ID", id, "Name", businesService.Name)
 		return ctrl.Result{}, nil
 	}
 
 	err = r.PagerClient.UpdateBusinessService(pagerbusinesService)
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("could not update business service: %w", err)
 	}
+	log.Info("Updated BusinessService", "ID", businesService.Status.ID, "Name", businesService.Name)
 
 	// Check if the BusinessService instance is marked for deletion
 	if businesService.DeletionTimestamp.IsZero() {

diff --git a/pkg/controller/pagerduty/services/services_controller.go b/pkg/controller/pagerduty/services/services_controller.go
@@ -171,8 +171,7 @@ func (r *ServicesReconciler) getBusinessServiceId(ctx context.Context, service *
 	if service.Spec.BusinessService != "" {
 		var businessService pagerdutyv1beta1.BusinessService
 		if err := r.Get(ctx, client.ObjectKey{
-			Namespace: service.Namespace,
-			Name:      service.Spec.BusinessService,
+			Name: service.Spec.BusinessService,
 		}, &businessService); err != nil {
 			if apierrors.IsNotFound(err) {
 				log.Info("BusinessService not found in cluster, fetching from PagerDuty", "namespace", service.Namespace, "name", service.Spec.BusinessService)