github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #137434 from bart0sh/PR224-fix-upgrade-downgrade-failures

Browse Source 
Fix pull-kubernetes-dra-integration job failures
This commit is contained in:
Kubernetes Prow Robot
2026-03-06 14:40:18 +05:30
committed by GitHub
parent 1f5701a46d ab732b2d6d
commit 4302a06ca9
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
test/e2e_dra/extendedresources_test.go
View File

@@ -119,33 +119,28 @@ func testExtendedResource(tCtx ktesting.TContext, b *drautils.Builder, resourceT
}
}
// createDeviceClassForExtendedResource creates a DeviceClass for testing extended resources.
// It creates the DeviceClass with a unique name, and returns its corresponding resource name.
// createDeviceClassForExtendedResource gets or creates a DeviceClass for testing extended resources.
// For explicit resource type, it creates a DeviceClass with a unique extendedResourceName and returns that name.
// For implicit resource type, it returns the resource name derived from the existing DeviceClass created by the builder.
func createDeviceClassForExtendedResource(tCtx ktesting.TContext, b *drautils.Builder, resourceType string) v1.ResourceName {
var deviceClass *resourceapi.DeviceClass
var resourceName v1.ResourceName
if resourceType == resourceTypeExplicit {
// Framework automatically names it: b.ClassName() + "-explicit"
resourceName = v1.ResourceName(b.ExtendedResourceName(resourceTypeExplicit))
deviceClass = b.ClassWithExtendedResource(string(resourceName))
} else {
// Framework automatically names it
deviceClass = b.Class().DeviceClass
resourceName = v1.ResourceName(fmt.Sprintf("%s%s", resourceapi.ResourceDeviceClassPrefix, deviceClass.Name))
}
createdObjs := b.Create(tCtx, deviceClass)
// Verify ExtendedResourceName is present in the spec when using explicit resource name
if resourceType == resourceTypeExplicit {
switch resourceType {
case resourceTypeExplicit:
resourceName := v1.ResourceName(b.ExtendedResourceName(resourceTypeExplicit))
deviceClass := b.ClassWithExtendedResource(string(resourceName))
// Create the DeviceClass
createdObjs := b.Create(tCtx, deviceClass)
// Verify ExtendedResourceName is present in the spec
deviceClass = createdObjs[0].(*resourceapi.DeviceClass)
tCtx.Expect(deviceClass.Spec.ExtendedResourceName).ToNot(gomega.BeNil(), "DeviceClass.Spec.ExtendedResourceName should be set for explicit resource name")
tCtx.Logf("Created DeviceClass %q with extendedResourceName: %s", deviceClass.Name, resourceName)
return resourceName
case resourceTypeImplicit:
// The device class was already created by the builder, we only need the name.
return v1.ResourceName(fmt.Sprintf("%s%s", resourceapi.ResourceDeviceClassPrefix, b.ClassName()))
default:
tCtx.Fatalf("invalid resource type %q", resourceType)
return ""
}
tCtx.Logf("Created DeviceClass %q with extendedResourceName: %s", deviceClass.Name, resourceName)
return resourceName
}
// createPodWithExtendedResource creates a pod with the given name requesting an extended resource.
@@ -163,7 +158,7 @@ func createPodWithExtendedResource(tCtx ktesting.TContext, b *drautils.Builder,
// verifyPodRunningWithClaim verifies a pod is running and has a valid ResourceClaim.
func verifyPodRunningWithClaim(tCtx ktesting.TContext, b *drautils.Builder, pod *v1.Pod, resourceName v1.ResourceName) {
namespace := tCtx.Namespace()
b.TestPod(tCtx, pod)
b.TestPod(tCtx, pod, "container_0_request_0", "true")
tCtx.Logf("Pod %q is running", pod.Name)
// Get updated pod to check status