fixup! DRA: new API for 1.31

Capacity is now a map from string to resource.Quantity.
pohly · Jul 8, 2024 · d273800 · d273800
1 parent cc07aa2
commit d273800
Show file tree

Hide file tree

Showing 17 changed files with 199 additions and 594 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/api/openapi-spec/v3/apis__resource.k8s.io__v1alpha3_openapi.json b/api/openapi-spec/v3/apis__resource.k8s.io__v1alpha3_openapi.json
@@ -158,12 +158,7 @@
           },
           "capacity": {
             "additionalProperties": {
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/io.k8s.api.resource.v1alpha3.DeviceCapacity"
-                }
-              ],
-              "default": {}
+              "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.api.resource.Quantity"
             },
             "description": "Capacity defines the set of capacities for this device. The name of each capacity must be unique in that set.\n\nThe maximum number of attributes and capacities combined is 32.",
             "type": "object"
@@ -265,20 +260,6 @@
         },
         "type": "object"
       },
-      "io.k8s.api.resource.v1alpha3.DeviceCapacity": {
-        "description": "DeviceCapacity must have exactly one field set.",
-        "properties": {
-          "quantity": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.api.resource.Quantity"
-              }
-            ],
-            "description": "Quantity determines the size of the capacity."
-          }
-        },
-        "type": "object"
-      },
       "io.k8s.api.resource.v1alpha3.DeviceClaim": {
         "description": "DeviceClaim defines how to request devices with a ResourceClaim.",
         "properties": {

diff --git a/pkg/apis/resource/types.go b/pkg/apis/resource/types.go
@@ -197,7 +197,7 @@ type Device struct {
 	// The maximum number of attributes and capacities combined is 32.
 	//
 	// +optional
-	Capacity map[QualifiedName]DeviceCapacity
+	Capacity map[QualifiedName]resource.Quantity
 }
 
 // Limit for the sum of the number of entries in both ResourceSlices.
@@ -255,14 +255,6 @@ type DeviceAttribute struct {
 	VersionValue *string
 }
 
-// DeviceCapacity must have exactly one field set.
-type DeviceCapacity struct {
-	// Quantity determines the size of the capacity.
-	//
-	// +optional
-	Quantity *resource.Quantity
-}
-
 // DeviceAttributeMaxValueLength is the maximum length of a string or version attribute value.
 const DeviceAttributeMaxValueLength = 64
 

diff --git a/pkg/apis/resource/v1alpha3/zz_generated.conversion.go b/pkg/apis/resource/v1alpha3/zz_generated.conversion.go
diff --git a/pkg/apis/resource/zz_generated.deepcopy.go b/pkg/apis/resource/zz_generated.deepcopy.go
diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go