Merge pull request kubernetes#130653 from yliaog/master

kubelet and scheduler for extended resource backed by DRA

Author: k8s-ci-robot

api/openapi-spec/swagger.json

@@ -1009,6 +1009,10 @@ func dropDisabledPodStatusFields(podStatus, oldPodStatus *api.PodStatus, podSpec
 		podStatus.ResourceClaimStatuses = nil
 	}
 
+	if !utilfeature.DefaultFeatureGate.Enabled(features.DRAExtendedResource) && !draExendedResourceInUse(oldPodStatus) {
+		podStatus.ExtendedResourceClaimStatus = nil
+	}
+
 	if !utilfeature.DefaultFeatureGate.Enabled(features.RecursiveReadOnlyMounts) && !rroInUse(oldPodSpec) {
 		for i := range podStatus.ContainerStatuses {
 			podStatus.ContainerStatuses[i].VolumeMounts = nil
@@ -1064,15 +1068,21 @@ func dropDisabledDynamicResourceAllocationFields(podSpec, oldPodSpec *api.PodSpe
 	}
 }
 
-func dynamicResourceAllocationInUse(podSpec *api.PodSpec) bool {
-	if podSpec == nil {
-		return false
+func draExendedResourceInUse(podStatus *api.PodStatus) bool {
+	if podStatus != nil && podStatus.ExtendedResourceClaimStatus != nil {
+		return true
 	}
+	return false
+}
 
+func dynamicResourceAllocationInUse(podSpec *api.PodSpec) bool {
 	// We only need to check this field because the containers cannot have
 	// resource requirements entries for claims without a corresponding
 	// entry at the pod spec level.
-	return len(podSpec.ResourceClaims) > 0
+	if podSpec != nil && len(podSpec.ResourceClaims) > 0 {
+		return true
+	}
+	return false
 }
 
 func dropResourceClaimRequests(containers []api.Container) {

api/openapi-spec/v3/api__v1_openapi.json

@@ -895,15 +895,35 @@ func TestDropDynamicResourceAllocation(t *testing.T) {
 			EphemeralContainers: []api.EphemeralContainer{{}},
 		},
 	}
+	podWithExtendedResource := &api.Pod{
+		Spec: api.PodSpec{
+			Containers:          []api.Container{{}},
+			InitContainers:      []api.Container{{}},
+			EphemeralContainers: []api.EphemeralContainer{{}},
+		},
+		Status: api.PodStatus{
+			ExtendedResourceClaimStatus: &api.PodExtendedResourceClaimStatus{
+				ResourceClaimName: "resource-claim-name",
+				RequestMappings: []api.ContainerExtendedResourceRequest{
+					{
+						ContainerName: "c",
+						ResourceName:  "e",
+						RequestName:   "c-0-r-0",
+					},
+				},
+			},
+		},
+	}
 
 	var noPod *api.Pod
 
 	testcases := []struct {
-		description string
-		enabled     bool
-		oldPod      *api.Pod
-		newPod      *api.Pod
-		wantPod     *api.Pod
+		description     string
+		enabled         bool
+		extendedEnabled bool
+		oldPod          *api.Pod
+		newPod          *api.Pod
+		wantPod         *api.Pod
 	}{
 		{
 			description: "old with claims / new with claims / disabled",
@@ -986,11 +1006,60 @@ func TestDropDynamicResourceAllocation(t *testing.T) {
 			newPod:      podWithoutClaims,
 			wantPod:     podWithoutClaims,
 		},
+		{
+			description:     "extended resource / no old pod/ new with extended resource / disabled",
+			enabled:         false,
+			extendedEnabled: false,
+			oldPod:          noPod,
+			newPod:          podWithExtendedResource,
+			wantPod:         podWithoutClaims,
+		},
+		{
+			description:     "extended resource / old without claim / new with extended resource / disabled",
+			enabled:         false,
+			extendedEnabled: false,
+			oldPod:          podWithoutClaims,
+			newPod:          podWithExtendedResource,
+			wantPod:         podWithoutClaims,
+		},
+		{
+			description:     "extended resource / no old pod/ new with extended resource / extended disabled only",
+			enabled:         true,
+			extendedEnabled: false,
+			oldPod:          noPod,
+			newPod:          podWithExtendedResource,
+			wantPod:         podWithoutClaims,
+		},
+		{
+			description:     "extended resource / old without claim / new with extended resource / extended disabled only",
+			enabled:         true,
+			extendedEnabled: false,
+			oldPod:          podWithoutClaims,
+			newPod:          podWithExtendedResource,
+			wantPod:         podWithoutClaims,
+		},
+		{
+			description:     "extended resource / no old pod/ new with extended resource / enabled",
+			enabled:         true,
+			extendedEnabled: true,
+			oldPod:          noPod,
+			newPod:          podWithExtendedResource,
+			wantPod:         podWithExtendedResource,
+		},
+		{
+			description:     "extended resource / old without claim / new with extended resource / enabled",
+			enabled:         true,
+			extendedEnabled: true,
+			oldPod:          podWithoutClaims,
+			newPod:          podWithExtendedResource,
+			wantPod:         podWithExtendedResource,
+		},
 	}
 
 	for _, tc := range testcases {
 		t.Run(tc.description, func(t *testing.T) {
 			featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.DynamicResourceAllocation, tc.enabled)
+			featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.DRAExtendedResource, tc.extendedEnabled)
 
 			oldPod := tc.oldPod.DeepCopy()
 			newPod := tc.newPod.DeepCopy()

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

@@ -3934,6 +3934,28 @@ type PodResourceClaimStatus struct {
 	ResourceClaimName *string
 }
 
+// PodExtendedResourceClaimStatus is stored in the PodStatus for the extended
+// resource requests backed by DRA. It stores the generated name for
+// the corresponding special ResourceClaim created by the scheduler.
+type PodExtendedResourceClaimStatus struct {
+	// RequestMapping identifies the mapping of <container, extended resource backed by DRA> to  device request
+	// in the generated ResourceClaim.
+	RequestMappings []ContainerExtendedResourceRequest
+
+	// ResourceClaimName is the name of the ResourceClaim that was
+	// generated for the Pod in the namespace of the Pod.
+	ResourceClaimName string
+}
+
+type ContainerExtendedResourceRequest struct {
+	// The name of the container requesting resources.
+	ContainerName string
+	// The name of the extended resource in that container which gets backed by DRA.
+	ResourceName string
+	// The name of the request in the special ResourceClaim which corresponds to the extended resource.
+	RequestName string
+}
+
 // OSName is the set of OS'es that can be used in OS.
 type OSName string
 
@@ -4535,6 +4557,11 @@ type PodStatus struct {
 	// +featureGate=DynamicResourceAllocation
 	// +optional
 	ResourceClaimStatuses []PodResourceClaimStatus
+
+	// Status of claim of extended resource backed by DRA.
+	// +featureGate=DRAExtendedResource
+	// +optional
+	ExtendedResourceClaimStatus *PodExtendedResourceClaimStatus
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object