feat: change to spec instead of status

Author: n3rdc4ptn

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

@@ -40,14 +40,8 @@ spec:
             type: object
           spec:
             description: MCPUsageSpec defines the desired state of MCPUsage.
-            type: object
-          status:
-            description: MCPUsageStatus defines the observed state of MCPUsage.
             properties:
               charging_target:
-                description: |-
-                  INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-                  Important: Run "make" to regenerate code after modifying this file
                 type: string
               daily_usage:
                 items:
@@ -86,6 +80,9 @@ spec:
             - project
             - workspace
             type: object
+          status:
+            description: MCPUsageStatus defines the observed state of MCPUsage.
+            type: object
         type: object
     served: true
     storage: true

api/usage/v1/mcpusage_types.go

@@ -27,23 +27,23 @@ import (
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 // MCPUsageSpec defines the desired state of MCPUsage.
-type MCPUsageSpec struct{}
+type MCPUsageSpec struct {
+	ChargingTarget    string       `json:"charging_target"`
+	Project           string       `json:"project"`
+	Workspace         string       `json:"workspace"`
+	MCP               string       `json:"mcp"`
+	Usage             []DailyUsage `json:"daily_usage"`
+	LastUsageCaptured metav1.Time  `json:"last_usage_captured,omitempty"`
+	MCPCreatedAt      metav1.Time  `json:"mcp_created_at,omitempty"`
+	MCPDeletedAt      metav1.Time  `json:"mcp_deleted_at,omitempty"`
+
+	Message string `json:"message,omitempty"`
+}
 
 // MCPUsageStatus defines the observed state of MCPUsage.
 type MCPUsageStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	ChargingTarget string       `json:"charging_target"`
-	Project        string       `json:"project"`
-	Workspace      string       `json:"workspace"`
-	MCP            string       `json:"mcp"`
-	Usage          []DailyUsage `json:"daily_usage"`
-
-	LastUsageCaptured metav1.Time `json:"last_usage_captured,omitempty"`
-	MCPCreatedAt      metav1.Time `json:"mcp_created_at,omitempty"`
-	MCPDeletedAt      metav1.Time `json:"mcp_deleted_at,omitempty"`
-
-	Message string `json:"message,omitempty"`
 }
 
 type DailyUsage struct {

api/usage/v1/zz_generated.deepcopy.go

@@ -55,40 +55,33 @@ func (u *UsageTracker) CreateOrUpdateEvent(ctx context.Context, project string,
 	if k8serrors.IsNotFound(err) { // element does not exist, we need to create it
 		log.Debug("no mcp usage element found. Creating a new one", "objectKey", objectKey)
 
+		now := metav1.NewTime(time.Now().UTC())
 		mcpUsage = v1.MCPUsage{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      objectKey.Name,
 				Namespace: objectKey.Namespace,
 			},
-			Spec: v1.MCPUsageSpec{},
+			Spec: v1.MCPUsageSpec{
+				Project:           project,
+				Workspace:         workspace,
+				MCP:               mcp_name,
+				Usage:             []v1.DailyUsage{},
+				LastUsageCaptured: now,
+				MCPCreatedAt:      now,
+			},
 		}
 
 		err = u.client.Create(ctx, &mcpUsage)
 		if err != nil {
 			return fmt.Errorf("error when creating MCPUsage resource: %w", err)
 		}
-
-		now := metav1.NewTime(time.Now().UTC())
-		mcpUsage.Status = v1.MCPUsageStatus{
-			Project:           project,
-			Workspace:         workspace,
-			MCP:               mcp_name,
-			Usage:             []v1.DailyUsage{},
-			LastUsageCaptured: now,
-			MCPCreatedAt:      now,
-		}
-
-		err = u.client.Status().Update(ctx, &mcpUsage)
-		if err != nil {
-			return fmt.Errorf("error when updating status for MCPUsage resource: %w", err)
-		}
 	} else {
 		// check if mcpUsage element wants to be deleted
-		if !mcpUsage.Status.MCPDeletedAt.IsZero() {
+		if !mcpUsage.Spec.MCPDeletedAt.IsZero() {
 			log.Debug("mcp was deleted in the past, update last usage captured and proceed")
 			// MCP was deleted, now created with the same name, update lastUsageCapture
-			mcpUsage.Status.LastUsageCaptured = metav1.NewTime(time.Now().UTC())
-			err = u.client.Status().Update(ctx, &mcpUsage)
+			mcpUsage.Spec.LastUsageCaptured = metav1.NewTime(time.Now().UTC())
+			err = u.client.Update(ctx, &mcpUsage)
 			if err != nil {
 				return fmt.Errorf("error when updating status for MCPUsage resource: %w", err)
 			}
@@ -110,22 +103,22 @@ func (u *UsageTracker) CreateOrUpdateEvent(ctx context.Context, project string,
 }
 
 func (u *UsageTracker) UpdateChargingTarget(ctx context.Context, mcpUsage *v1.MCPUsage) error {
-	var project, workspace, mcp_name = mcpUsage.Status.Project, mcpUsage.Status.Workspace, mcpUsage.Status.MCP
+	var project, workspace, mcp_name = mcpUsage.Spec.Project, mcpUsage.Spec.Workspace, mcpUsage.Spec.MCP
 	log := u.initLogger("update-charging-target", project, workspace, mcp_name)
 
 	chargingTarget, err := helper.ResolveChargingTarget(ctx, u.client, project, workspace, mcp_name)
 	if err != nil {
 		log.Error(err, fmt.Sprintf("error when resolving charging target %s %s %s", project, workspace, mcp_name))
-		mcpUsage.Status.Message = fmt.Sprintf("error when resolving charging target: %v", err.Error())
+		mcpUsage.Spec.Message = "error when resolving charging target"
 		chargingTarget = "missing"
 	}
 	if chargingTarget == "" {
 		chargingTarget = "missing"
-		mcpUsage.Status.Message = "no charging target specified"
+		mcpUsage.Spec.Message = "no charging target specified"
 	}
-	mcpUsage.Status.ChargingTarget = chargingTarget
+	mcpUsage.Spec.ChargingTarget = chargingTarget
 
-	err = u.client.Status().Update(ctx, mcpUsage)
+	err = u.client.Update(ctx, mcpUsage)
 	if err != nil {
 		return fmt.Errorf("error at updating MCPUsage status resource for %s %s %s: %w", project, workspace, mcp_name, err)
 	}
@@ -142,11 +135,11 @@ func (u *UsageTracker) DeletionEvent(ctx context.Context, project string, worksp
 			Name:      objectKey.Name,
 			Namespace: objectKey.Namespace,
 		},
-		Status: v1.MCPUsageStatus{
+		Spec: v1.MCPUsageSpec{
 			MCPDeletedAt: metav1.NewTime(time.Now().UTC()),
 		},
 	}
-	err := u.client.Status().Patch(ctx, &mcpUsage, client.Merge)
+	err := u.client.Patch(ctx, &mcpUsage, client.Merge)
 	if k8serrors.IsNotFound(err) {
 		return nil
 	}
@@ -169,24 +162,24 @@ func (u *UsageTracker) ScheduledEvent(ctx context.Context) error {
 
 	var errs error
 	for _, mcpUsage := range mcpUsages.Items {
-		if !mcpUsage.Status.MCPDeletedAt.IsZero() {
+		if !mcpUsage.Spec.MCPDeletedAt.IsZero() {
 			// mcp does not exist anymore
 			continue
 		}
 
-		var project, workspace, mcp_name = mcpUsage.Status.Project, mcpUsage.Status.Workspace, mcpUsage.Status.MCP
+		var project, workspace, mcp_name = mcpUsage.Spec.Project, mcpUsage.Spec.Workspace, mcpUsage.Spec.MCP
 		log = log.WithValues(
 			"project", project,
 			"workspace", workspace,
 			"mcp", mcp_name,
 		)
 
-		usages := calculateUsage(now, mcpUsage.Status.LastUsageCaptured.Time)
-		usages = MergeDailyUsages(usages, mcpUsage.Status.Usage)
+		usages := calculateUsage(now, mcpUsage.Spec.LastUsageCaptured.Time)
+		usages = MergeDailyUsages(usages, mcpUsage.Spec.Usage)
 
-		mcpUsage.Status.Usage = usages
-		mcpUsage.Status.LastUsageCaptured = metav1.NewTime(now)
-		err = u.client.Status().Update(ctx, &mcpUsage)
+		mcpUsage.Spec.Usage = usages
+		mcpUsage.Spec.LastUsageCaptured = metav1.NewTime(now)
+		err = u.client.Update(ctx, &mcpUsage)
 		errs = errors.Join(errs, err)
 	}