minor fix

ironcore-dev · Oct 15, 2024 · 2731536 · 2731536
1 parent 06a11f8
commit 2731536
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/api/v1alpha1/server_types.go b/api/v1alpha1/server_types.go
@@ -5,6 +5,7 @@ package v1alpha1
 
 import (
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -218,7 +219,7 @@ type Storage struct {
 	// Type specifies the type of the storage device.
 	Type string `json:"type,omitempty"`
 	// SizeBytes specifies the size of the storage device in bytes.
-	Capacity string `json:"capacity,omitempty"`
+	Capacity resource.Quantity `json:"capacity,omitempty"`
 	// Vendor specifies the vendor of the storage device.
 	Vendor string `json:"vendor,omitempty"`
 	// Model specifies the model of the storage device.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/metal.ironcore.dev_servers.yaml b/config/crd/bases/metal.ironcore.dev_servers.yaml
@@ -406,9 +406,13 @@ spec:
                   description: Storage defines the details of one storage device
                   properties:
                     capacity:
+                      anyOf:
+                      - type: integer
+                      - type: string
                       description: SizeBytes specifies the size of the storage device
                         in bytes.
-                      type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
                     model:
                       description: Model specifies the model of the storage device.
                       type: string

diff --git a/internal/controller/server_controller.go b/internal/controller/server_controller.go
@@ -394,11 +394,11 @@ func (r *ServerReconciler) updateServerStatus(ctx context.Context, log logr.Logg
 	serverBase := server.DeepCopy()
 	server.Status.Storages = nil
 	for _, storage := range storages {
-		q := resource.NewQuantity(storage.SizeBytes, resource.DecimalSI)
+		q := resource.NewQuantity(storage.SizeBytes, resource.BinarySI)
 		server.Status.Storages = append(server.Status.Storages, metalv1alpha1.Storage{
 			Name:     storage.Name,
 			Model:    storage.Model,
-			Capacity: q.String(),
+			Capacity: *q,
 			Type:     string(storage.Type),
 			Vendor:   storage.Vendor,
 			State:    metalv1alpha1.StorageState(storage.State),

diff --git a/internal/controller/server_controller_test.go b/internal/controller/server_controller_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
 
 	metalv1alpha1 "github.com/ironcore-dev/metal-operator/api/v1alpha1"
 	"github.com/ironcore-dev/metal-operator/internal/controller/testdata"
@@ -90,7 +91,7 @@ var _ = Describe("Server Controller", func() {
 			HaveField("Status.Storages", ContainElement(metalv1alpha1.Storage{
 				Name:       "SATA Bay 1",
 				Rotational: false,
-				Capacity:   "8T",
+				Capacity:   *resource.NewQuantity(8000000000000, resource.BinarySI),
 				Vendor:     "Contoso",
 				Model:      "3000GT8",
 				State:      metalv1alpha1.StorageStateEnabled,