fix: hardened mcpusage update to tackle race condition errors

Author: n3rdc4ptn

api/crds/manifests/usage.openmcp.cloud_mcpusages.yaml

@@ -13,10 +13,22 @@ spec:
     kind: MCPUsage
     listKind: MCPUsageList
     plural: mcpusages
+    shortNames:
+    - mcpu
     singular: mcpusage
-  scope: Namespaced
+  scope: Cluster
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - jsonPath: .spec.project
+      name: Project
+      type: string
+    - jsonPath: .spec.workspace
+      name: Workspace
+      type: string
+    - jsonPath: .spec.mcp
+      name: MCP
+      type: string
+    name: v1
     schema:
       openAPIV3Schema:
         description: MCPUsage is the Schema for the mcpdailies API.

api/usage/v1/mcpusage_types.go

@@ -74,7 +74,11 @@ func NewDailyUsage(date time.Time, hours int) (DailyUsage, error) {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster,shortName=mcpu
 // +kubebuilder:metadata:labels="openmcp.cloud/cluster=onboarding"
+// +kubebuilder:printcolumn:name="Project",type=string,JSONPath=`.spec.project`
+// +kubebuilder:printcolumn:name="Workspace",type=string,JSONPath=`.spec.workspace`
+// +kubebuilder:printcolumn:name="MCP",type=string,JSONPath=`.spec.mcp`
 
 // MCPUsage is the Schema for the mcpdailies API.
 type MCPUsage struct {

go.mod

@@ -3,6 +3,7 @@ module github.com/openmcp-project/usage-operator
 go 1.24.4
 
 require (
+	github.com/google/uuid v1.6.0
 	github.com/onsi/ginkgo/v2 v2.23.4
 	github.com/onsi/gomega v1.37.0
 	github.com/openmcp-project/controller-utils v0.10.0
@@ -45,7 +46,6 @@ require (
 	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect

internal/controller/managedcontrolplane_controller.go

@@ -93,18 +93,6 @@ func (r *ManagedControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	// if mcp.Status.ObservedGeneration == 0 {
-	// 	log.Info("mcp '" + mcp.Name + "' was created.")
-	// 	return ctrl.Result{}, nil
-	// }
-
-	// if mcp.Status.ObservedGeneration != mcp.Generation {
-	// 	log.Info("mcp '" + mcp.Name + "' was updated.")
-	// 	return ctrl.Result{}, nil
-	// }
-
-	// log.Info("mcp '" + mcp.Name + "' got just a status update.")
-
 	return ctrl.Result{}, nil
 }
 

internal/helper/clusteraccess.go

@@ -49,14 +49,18 @@ func GetOnboardingCluster(ctx context.Context, log logging.Logger, client client
 				Rules: []rbacv1.PolicyRule{
 					{
 						APIGroups: []string{"core.openmcp.cloud"},
-						Resources: []string{"managedcontrolplanes", "managedcontrolplanes/status"},
-						Verbs:     []string{"get", "list"},
+						Resources: []string{
+							"managedcontrolplanes", "managedcontrolplanes/status",
+							"projects", "projects/status",
+							"workspaces", "workspaces/status",
+						},
+						Verbs: []string{"get", "list", "watch"},
 					},
 					{
 						APIGroups:     []string{"apiextensions.k8s.io"},
 						Resources:     []string{"customresourcedefinitions"},
-						Verbs:         []string{"create", "update", "delete"},
-						ResourceNames: []string{"mcpusage"},
+						Verbs:         []string{"get", "patch", "create", "update", "delete"},
+						ResourceNames: []string{"mcpusages.usage.openmcp.cloud"},
 					},
 					{
 						APIGroups: []string{"usage.openmcp.cloud"},

internal/usage/helper.go

@@ -1,12 +1,15 @@
 package usage
 
 import (
+	"errors"
 	"sort"
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/google/uuid"
+
 	v1 "github.com/openmcp-project/usage-operator/api/usage/v1"
 )
 
@@ -52,11 +55,17 @@ func GetNamespacedName(project, workspace string) string {
 	return "project-" + project + "--ws-" + workspace
 }
 
-func GetObjectKey(project, workspace, mcp string) client.ObjectKey {
-	return client.ObjectKey{
-		Name:      mcp,
-		Namespace: GetNamespacedName(project, workspace),
+func GetObjectKey(project, workspace, mcp string) (client.ObjectKey, error) {
+	name := GetNamespacedName(project, workspace) + "-" + mcp
+	id := uuid.NewSHA1(uuid.Nil, []byte(name))
+
+	if id.String() == "" {
+		return client.ObjectKey{}, errors.New("can't generate uuid from input")
 	}
+
+	return client.ObjectKey{
+		Name: id.String(),
+	}, nil
 }
 
 // merges two DailyUsages where no Date is double