Merge pull request #129536 from pacoxu/fix-lint

fix dra test lint
This commit is contained in:
Kubernetes Prow Robot 2025-01-08 19:58:30 -08:00 committed by GitHub
commit a32f69590a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -59,7 +59,6 @@ var (
resourceName = "my-resource" resourceName = "my-resource"
resourceName2 = resourceName + "-2" resourceName2 = resourceName + "-2"
claimName = podName + "-" + resourceName claimName = podName + "-" + resourceName
claimName2 = podName + "-" + resourceName + "-2"
className = "my-resource-class" className = "my-resource-class"
namespace = "default" namespace = "default"
attrName = resourceapi.QualifiedName("healthy") // device attribute only available on non-default node attrName = resourceapi.QualifiedName("healthy") // device attribute only available on non-default node
@ -88,11 +87,6 @@ var (
} }
return pod return pod
}() }()
podWithTwoClaimNames = st.MakePod().Name(podName).Namespace(namespace).
UID(podUID).
PodResourceClaims(v1.PodResourceClaim{Name: resourceName, ResourceClaimName: &claimName}).
PodResourceClaims(v1.PodResourceClaim{Name: resourceName2, ResourceClaimName: &claimName2}).
Obj()
podWithTwoClaimTemplates = st.MakePod().Name(podName).Namespace(namespace). podWithTwoClaimTemplates = st.MakePod().Name(podName).Namespace(namespace).
UID(podUID). UID(podUID).
PodResourceClaims(v1.PodResourceClaim{Name: resourceName, ResourceClaimTemplateName: &claimName}). PodResourceClaims(v1.PodResourceClaim{Name: resourceName, ResourceClaimTemplateName: &claimName}).
@ -123,15 +117,9 @@ var (
Namespace(namespace). Namespace(namespace).
Request(className). Request(className).
Obj() Obj()
deleteClaim = st.FromResourceClaim(claim).
OwnerReference(podName, podUID, podKind).
Deleting(metav1.Now()).Obj()
pendingClaim = st.FromResourceClaim(claim). pendingClaim = st.FromResourceClaim(claim).
OwnerReference(podName, podUID, podKind). OwnerReference(podName, podUID, podKind).
Obj() Obj()
pendingClaim2 = st.FromResourceClaim(pendingClaim).
Name(claimName2).
Obj()
allocationResult = &resourceapi.AllocationResult{ allocationResult = &resourceapi.AllocationResult{
Devices: resourceapi.DeviceAllocationResult{ Devices: resourceapi.DeviceAllocationResult{
Results: []resourceapi.DeviceRequestAllocationResult{{ Results: []resourceapi.DeviceRequestAllocationResult{{
@ -167,9 +155,6 @@ var (
otherAllocatedClaim = st.FromResourceClaim(otherClaim). otherAllocatedClaim = st.FromResourceClaim(otherClaim).
Allocation(allocationResult). Allocation(allocationResult).
Obj() Obj()
resourceSlice = st.MakeResourceSlice(nodeName, driver).Device("instance-1", nil).Obj()
resourceSliceUpdated = st.FromResourceSlice(resourceSlice).Device("instance-1", map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{attrName: {BoolValue: ptr.To(true)}}).Obj()
) )
func reserve(claim *resourceapi.ResourceClaim, pod *v1.Pod) *resourceapi.ResourceClaim { func reserve(claim *resourceapi.ResourceClaim, pod *v1.Pod) *resourceapi.ResourceClaim {