Migrate DraSnapshot off PodOwnsClaim/ClaimOwningPod to DRA API IsForPod

Author: mtrqq

cluster-autoscaler/simulator/dynamicresources/snapshot/snapshot.go

@@ -152,7 +152,7 @@ func (s *Snapshot) RemovePodOwnedClaims(pod *apiv1.Pod) {
 
 	for _, claim := range claims {
 		claimId := GetClaimId(claim)
-		if drautils.PodOwnsClaim(pod, claim) {
+		if err := resourceclaim.IsForPod(pod, claim); err == nil {
 			s.resourceClaims.DeleteCurrent(claimId)
 			continue
 		}
@@ -201,7 +201,7 @@ func (s *Snapshot) UnreservePodClaims(pod *apiv1.Pod) error {
 		claimId := GetClaimId(claim)
 		claim := s.ensureClaimWritable(claim)
 		drautils.ClearPodReservationInPlace(claim, pod)
-		if drautils.PodOwnsClaim(pod, claim) || !drautils.ClaimInUse(claim) {
+		if err := resourceclaim.IsForPod(pod, claim); err == nil || !drautils.ClaimInUse(claim) {
 			drautils.DeallocateClaimInPlace(claim)
 		}
 

cluster-autoscaler/simulator/dynamicresources/utils/resource_claims.go

@@ -22,29 +22,10 @@ import (
 	apiv1 "k8s.io/api/core/v1"
 	resourceapi "k8s.io/api/resource/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/component-helpers/scheduling/corev1"
 	"k8s.io/dynamic-resource-allocation/resourceclaim"
-	"k8s.io/utils/ptr"
 )
 
-// ClaimOwningPod returns the name and UID of the Pod owner of the provided claim. If the claim isn't
-// owned by a Pod, empty strings are returned.
-func ClaimOwningPod(claim *resourceapi.ResourceClaim) (string, types.UID) {
-	for _, owner := range claim.OwnerReferences {
-		if ptr.Deref(owner.Controller, false) && owner.APIVersion == "v1" && owner.Kind == "Pod" {
-			return owner.Name, owner.UID
-		}
-	}
-	return "", ""
-}
-
-// PodOwnsClaim determines if the provided pod is the controller of the given claim.
-func PodOwnsClaim(pod *apiv1.Pod, claim *resourceapi.ResourceClaim) bool {
-	ownerPodName, ownerPodUid := ClaimOwningPod(claim)
-	return ownerPodName == pod.Name && ownerPodUid == pod.UID
-}
-
 // ClaimAllocated returns whether the provided claim is allocated.
 func ClaimAllocated(claim *resourceapi.ResourceClaim) bool {
 	return claim.Status.Allocation != nil