Merge pull request #123938 from pohly/dra-structured-parameters-tests

DRA: test for structured parameters
kubernetes · Apr 18, 2024 · d2ce87e · d2ce87e
2 parents c016b0b + 6f5696b
commit d2ce87e
Show file tree

Hide file tree

Showing 10 changed files with 2,623 additions and 59 deletions.
diff --git a/pkg/controller/resourceclaim/controller_test.go b/pkg/controller/resourceclaim/controller_test.go
@@ -293,6 +293,31 @@ func TestSyncHandler(t *testing.T) {
 			}(),
 			expectedMetrics: expectedMetrics{0, 0},
 		},
+		{
+			name:   "clear-reserved-delayed-allocation-structured",
+			pods:   []*v1.Pod{},
+			key:    claimKey(testClaimReserved),
+			claims: []*resourcev1alpha2.ResourceClaim{structuredParameters(testClaimReserved)},
+			expectedClaims: func() []resourcev1alpha2.ResourceClaim {
+				claim := testClaimAllocated.DeepCopy()
+				claim.Finalizers = []string{}
+				claim.Status.Allocation = nil
+				return []resourcev1alpha2.ResourceClaim{*claim}
+			}(),
+			expectedMetrics: expectedMetrics{0, 0},
+		},
+		{
+			name: "dont-clear-reserved-delayed-allocation-structured",
+			pods: []*v1.Pod{testPodWithResource},
+			key:  claimKey(testClaimReserved),
+			claims: func() []*resourcev1alpha2.ResourceClaim {
+				claim := structuredParameters(testClaimReserved)
+				claim = reserveClaim(claim, otherTestPod)
+				return []*resourcev1alpha2.ResourceClaim{claim}
+			}(),
+			expectedClaims:  []resourcev1alpha2.ResourceClaim{*structuredParameters(testClaimReserved)},
+			expectedMetrics: expectedMetrics{0, 0},
+		},
 		{
 			name: "clear-reserved-immediate-allocation",
 			pods: []*v1.Pod{},
@@ -309,6 +334,62 @@ func TestSyncHandler(t *testing.T) {
 			}(),
 			expectedMetrics: expectedMetrics{0, 0},
 		},
+		{
+			name: "clear-reserved-immediate-allocation-structured",
+			pods: []*v1.Pod{},
+			key:  claimKey(testClaimReserved),
+			claims: func() []*resourcev1alpha2.ResourceClaim {
+				claim := structuredParameters(testClaimReserved.DeepCopy())
+				claim.Spec.AllocationMode = resourcev1alpha2.AllocationModeImmediate
+				return []*resourcev1alpha2.ResourceClaim{claim}
+			}(),
+			expectedClaims: func() []resourcev1alpha2.ResourceClaim {
+				claim := structuredParameters(testClaimAllocated.DeepCopy())
+				claim.Spec.AllocationMode = resourcev1alpha2.AllocationModeImmediate
+				return []resourcev1alpha2.ResourceClaim{*claim}
+			}(),
+			expectedMetrics: expectedMetrics{0, 0},
+		},
+		{
+			name: "clear-reserved-immediate-allocation-structured-deleted",
+			pods: []*v1.Pod{},
+			key:  claimKey(testClaimReserved),
+			claims: func() []*resourcev1alpha2.ResourceClaim {
+				claim := structuredParameters(testClaimReserved.DeepCopy())
+				claim.Spec.AllocationMode = resourcev1alpha2.AllocationModeImmediate
+				claim.DeletionTimestamp = &metav1.Time{}
+				return []*resourcev1alpha2.ResourceClaim{claim}
+			}(),
+			expectedClaims: func() []resourcev1alpha2.ResourceClaim {
+				claim := structuredParameters(testClaimAllocated.DeepCopy())
+				claim.Spec.AllocationMode = resourcev1alpha2.AllocationModeImmediate
+				claim.DeletionTimestamp = &metav1.Time{}
+				claim.Finalizers = []string{}
+				claim.Status.Allocation = nil
+				return []resourcev1alpha2.ResourceClaim{*claim}
+			}(),
+			expectedMetrics: expectedMetrics{0, 0},
+		},
+		{
+			name: "immediate-allocation-structured-deleted",
+			pods: []*v1.Pod{},
+			key:  claimKey(testClaimReserved),
+			claims: func() []*resourcev1alpha2.ResourceClaim {
+				claim := structuredParameters(testClaimAllocated.DeepCopy())
+				claim.Spec.AllocationMode = resourcev1alpha2.AllocationModeImmediate
+				claim.DeletionTimestamp = &metav1.Time{}
+				return []*resourcev1alpha2.ResourceClaim{claim}
+			}(),
+			expectedClaims: func() []resourcev1alpha2.ResourceClaim {
+				claim := structuredParameters(testClaimAllocated.DeepCopy())
+				claim.Spec.AllocationMode = resourcev1alpha2.AllocationModeImmediate
+				claim.DeletionTimestamp = &metav1.Time{}
+				claim.Finalizers = []string{}
+				claim.Status.Allocation = nil
+				return []resourcev1alpha2.ResourceClaim{*claim}
+			}(),
+			expectedMetrics: expectedMetrics{0, 0},
+		},
 		{
 			name: "clear-reserved-when-done-delayed-allocation",
 			pods: func() []*v1.Pod {
@@ -546,6 +627,14 @@ func allocateClaim(claim *resourcev1alpha2.ResourceClaim) *resourcev1alpha2.Reso
 	return claim
 }
 
+func structuredParameters(claim *resourcev1alpha2.ResourceClaim) *resourcev1alpha2.ResourceClaim {
+	claim = claim.DeepCopy()
+	// As far the controller is concerned, a claim was allocated by us if it has
+	// this finalizer. For testing we don't need to update the allocation result.
+	claim.Finalizers = append(claim.Finalizers, resourcev1alpha2.Finalizer)
+	return claim
+}
+
 func reserveClaim(claim *resourcev1alpha2.ResourceClaim, pod *v1.Pod) *resourcev1alpha2.ResourceClaim {
 	claim = claim.DeepCopy()
 	claim.Status.ReservedFor = append(claim.Status.ReservedFor,

diff --git a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go
@@ -1218,7 +1218,7 @@ func (pl *dynamicResources) PostFilter(ctx context.Context, cs *framework.CycleS
 			// Then we can simply clear the allocation. Once the
 			// claim informer catches up, the controllers will
 			// be notified about this change.
-			clearAllocation := state.informationsForClaim[index].controller != nil
+			clearAllocation := state.informationsForClaim[index].structuredParameters
 
 			// Before we tell a driver to deallocate a claim, we
 			// have to stop telling it to allocate. Otherwise,
@@ -1237,6 +1237,7 @@ func (pl *dynamicResources) PostFilter(ctx context.Context, cs *framework.CycleS
 			claim := claim.DeepCopy()
 			claim.Status.ReservedFor = nil
 			if clearAllocation {
+				claim.Status.DriverName = ""
 				claim.Status.Allocation = nil
 			} else {
 				claim.Status.DeallocationRequested = true
@@ -1419,7 +1420,11 @@ func (pl *dynamicResources) Reserve(ctx context.Context, cs *framework.CycleStat
 		}
 		state.informationsForClaim[index].allocation = allocation
 		state.informationsForClaim[index].allocationDriverName = driverName
+		// Strictly speaking, we don't need to store the full modified object.
+		// The allocation would be enough. The full object is useful for
+		// debugging and testing, so let's make it realistic.
 		claim = claim.DeepCopy()
+		claim.Finalizers = append(claim.Finalizers, resourcev1alpha2.Finalizer)
 		claim.Status.DriverName = driverName
 		claim.Status.Allocation = allocation
 		pl.inFlightAllocations.Store(claim.UID, claim)