DRA: remove "sharable" from claim allocation result

Now all claims are shareable up to the limit imposed by the size of the
"reserverFor" array.

This is one of the agreed simplifications for 1.31.

Author: pohly

api/openapi-spec/swagger.json

@@ -109,10 +109,6 @@
             },
             "type": "array",
             "x-kubernetes-list-type": "atomic"
-          },
-          "shareable": {
-            "description": "Shareable determines whether the resource supports more than one consumer at a time.",
-            "type": "boolean"
           }
         },
         "type": "object"
@@ -656,10 +652,6 @@
             ],
             "default": {},
             "description": "Standard object metadata"
-          },
-          "shareable": {
-            "description": "Shareable indicates whether the allocated claim is meant to be shareable by multiple consumers at the same time.",
-            "type": "boolean"
           }
         },
         "type": "object",

api/openapi-spec/v3/apis__resource.k8s.io__v1alpha2_openapi.json

@@ -130,11 +130,6 @@ type AllocationResult struct {
 	// everywhere.
 	// +optional
 	AvailableOnNodes *core.NodeSelector
-
-	// Shareable determines whether the resource supports more
-	// than one consumer at a time.
-	// +optional
-	Shareable bool
 }
 
 // AllocationResultResourceHandlesMaxSize represents the maximum number of
@@ -509,10 +504,6 @@ type ResourceClaimParameters struct {
 	// to some unknown type.
 	GeneratedFrom *ResourceClaimParametersReference
 
-	// Shareable indicates whether the allocated claim is meant to be shareable
-	// by multiple consumers at the same time.
-	Shareable bool
-
 	// DriverRequests describes all resources that are needed for the
 	// allocated claim. A single claim may use resources coming from
 	// different drivers. For each driver, this array has at most one

pkg/apis/resource/types.go

@@ -170,9 +170,6 @@ func ValidateClaimStatusUpdate(resourceClaim, oldClaim *resource.ResourceClaim)
 		if resourceClaim.Status.Allocation == nil {
 			allErrs = append(allErrs, field.Forbidden(fldPath.Child("reservedFor"), "may not be specified when `allocated` is not set"))
 		} else {
-			if !resourceClaim.Status.Allocation.Shareable && len(resourceClaim.Status.ReservedFor) > 1 {
-				allErrs = append(allErrs, field.Forbidden(fldPath.Child("reservedFor"), "may not be reserved more than once"))
-			}
 			// Items may be removed from ReservedFor while the claim is meant to be deallocated,
 			// but not added.
 			if resourceClaim.DeletionTimestamp != nil || resourceClaim.Status.DeallocationRequested {

pkg/apis/resource/v1alpha2/zz_generated.conversion.go

@@ -336,7 +336,6 @@ func TestValidateClaimStatusUpdate(t *testing.T) {
 				}
 				return handles
 			}(),
-			Shareable: true,
 		},
 	}
 
@@ -584,25 +583,6 @@ func TestValidateClaimStatusUpdate(t *testing.T) {
 				return claim
 			},
 		},
-		"invalid-reserved-for-not-shared": {
-			wantFailures: field.ErrorList{field.Forbidden(field.NewPath("status", "reservedFor"), "may not be reserved more than once")},
-			oldClaim: func() *resource.ResourceClaim {
-				claim := validAllocatedClaim.DeepCopy()
-				claim.Status.Allocation.Shareable = false
-				return claim
-			}(),
-			update: func(claim *resource.ResourceClaim) *resource.ResourceClaim {
-				for i := 0; i < 2; i++ {
-					claim.Status.ReservedFor = append(claim.Status.ReservedFor,
-						resource.ResourceClaimConsumerReference{
-							Resource: "pods",
-							Name:     fmt.Sprintf("foo-%d", i),
-							UID:      types.UID(fmt.Sprintf("%d", i)),
-						})
-				}
-				return claim
-			},
-		},
 		"invalid-reserved-for-no-allocation": {
 			wantFailures: field.ErrorList{field.Forbidden(field.NewPath("status", "reservedFor"), "may not be specified when `allocated` is not set")},
 			oldClaim:     validClaim,

pkg/apis/resource/validation/validation.go

@@ -559,9 +559,7 @@ func makeGeneratedClaim(podClaimName, generateName, namespace, classname string,
 
 func allocateClaim(claim *resourcev1alpha2.ResourceClaim) *resourcev1alpha2.ResourceClaim {
 	claim = claim.DeepCopy()
-	claim.Status.Allocation = &resourcev1alpha2.AllocationResult{
-		Shareable: true,
-	}
+	claim.Status.Allocation = &resourcev1alpha2.AllocationResult{}
 	return claim
 }
 

pkg/apis/resource/validation/validation_resourceclaim_test.go

@@ -1051,7 +1051,6 @@ func (pl *dynamicResources) lookupClassParameters(logger klog.Logger, class *res
 
 func (pl *dynamicResources) lookupClaimParameters(logger klog.Logger, class *resourcev1alpha2.ResourceClass, claim *resourcev1alpha2.ResourceClaim) (*resourcev1alpha2.ResourceClaimParameters, *framework.Status) {
 	defaultClaimParameters := resourcev1alpha2.ResourceClaimParameters{
-		Shareable: true,
 		DriverRequests: []resourcev1alpha2.DriverRequests{
 			{
 				DriverName: class.DriverName,

pkg/controller/resourceclaim/controller_test.go

@@ -105,10 +105,6 @@ var (
 				UID(podUID).
 				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, ResourceClaimName: &claimName}).
 				Obj()
-	otherPodWithClaimName = st.MakePod().Name(podName).Namespace(namespace).
-				UID(podUID + "-II").
-				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, ResourceClaimName: &claimName}).
-				Obj()
 	podWithClaimTemplate = st.MakePod().Name(podName).Namespace(namespace).
 				UID(podUID).
 				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, ResourceClaimTemplateName: &claimName}).
@@ -134,7 +130,6 @@ var (
 
 	claimParameters = st.MakeClaimParameters().Name(claimName).Namespace(namespace).
 			NamedResourcesRequests("some-driver", "true").
-			Shareable(true).
 			GeneratedFrom(&resourcev1alpha2.ResourceClaimParametersReference{
 			Name:     claimName,
 			Kind:     "ResourceClaimParameters",
@@ -143,7 +138,6 @@ var (
 		Obj()
 	claimParametersOtherNamespace = st.MakeClaimParameters().Name(claimName).Namespace(namespace+"-2").
 					NamedResourcesRequests("some-driver", "true").
-					Shareable(true).
 					GeneratedFrom(&resourcev1alpha2.ResourceClaimParametersReference{
 			Name:     claimName,
 			Kind:     "ResourceClaimParameters",
@@ -946,22 +940,6 @@ func TestPlugin(t *testing.T) {
 				},
 			},
 		},
-		"in-use-by-other": {
-			nodes:       []*v1.Node{},
-			pod:         otherPodWithClaimName,
-			claims:      []*resourcev1alpha2.ResourceClaim{inUseClaim},
-			classes:     []*resourcev1alpha2.ResourceClass{},
-			schedulings: []*resourcev1alpha2.PodSchedulingContext{},
-			prepare:     prepare{},
-			want: want{
-				prefilter: result{
-					status: framework.NewStatus(framework.UnschedulableAndUnresolvable, `resourceclaim in use`),
-				},
-				postfilter: result{
-					status: framework.NewStatus(framework.Unschedulable, `no new claims to deallocate`),
-				},
-			},
-		},
 		"wrong-topology": {
 			// PostFilter tries to get the pod scheduleable by
 			// deallocating the claim.