From 4f647b3f3df3c2d749108227ded5b3dd34069d32 Mon Sep 17 00:00:00 2001 From: yliao Date: Fri, 24 Oct 2025 21:34:31 +0000 Subject: [PATCH] removed BlockOwnerDeletion --- pkg/controller/resourceclaim/controller.go | 11 ++- .../resourceclaim/controller_test.go | 12 ++- .../dynamicresources/dynamicresources.go | 11 ++- .../dynamicresources/dynamicresources_test.go | 77 +++++++++---------- 4 files changed, 50 insertions(+), 61 deletions(-) diff --git a/pkg/controller/resourceclaim/controller.go b/pkg/controller/resourceclaim/controller.go index 946934fa68f..b997406812b 100644 --- a/pkg/controller/resourceclaim/controller.go +++ b/pkg/controller/resourceclaim/controller.go @@ -659,12 +659,11 @@ func (ec *Controller) handleClaim(ctx context.Context, pod *v1.Pod, podClaim v1. GenerateName: generateName, OwnerReferences: []metav1.OwnerReference{ { - APIVersion: "v1", - Kind: "Pod", - Name: pod.Name, - UID: pod.UID, - Controller: &isTrue, - BlockOwnerDeletion: &isTrue, + APIVersion: "v1", + Kind: "Pod", + Name: pod.Name, + UID: pod.UID, + Controller: &isTrue, }, }, Annotations: annotations, diff --git a/pkg/controller/resourceclaim/controller_test.go b/pkg/controller/resourceclaim/controller_test.go index b8b465245e1..36fc152d081 100644 --- a/pkg/controller/resourceclaim/controller_test.go +++ b/pkg/controller/resourceclaim/controller_test.go @@ -931,14 +931,12 @@ func claimKey(claim *resourceapi.ResourceClaim) string { } func makeOwnerReference(pod *v1.Pod, isController bool) *metav1.OwnerReference { - isTrue := true return &metav1.OwnerReference{ - APIVersion: "v1", - Kind: "Pod", - Name: pod.Name, - UID: pod.UID, - Controller: &isController, - BlockOwnerDeletion: &isTrue, + APIVersion: "v1", + Kind: "Pod", + Name: pod.Name, + UID: pod.UID, + Controller: &isController, } } diff --git a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go index 90de7543c08..9b3965e9a7d 100644 --- a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go +++ b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go @@ -506,12 +506,11 @@ func (pl *DynamicResources) preFilterExtendedResources(pod *v1.Pod, logger klog. GenerateName: pod.Name + "-extended-resources-", OwnerReferences: []metav1.OwnerReference{ { - APIVersion: "v1", - Kind: "Pod", - Name: pod.Name, - UID: pod.UID, - Controller: ptr.To(true), - BlockOwnerDeletion: ptr.To(true), + APIVersion: "v1", + Kind: "Pod", + Name: pod.Name, + UID: pod.UID, + Controller: ptr.To(true), }, }, Annotations: map[string]string{ diff --git a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go index 8646d45b77d..6f6efd7f9bc 100644 --- a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go +++ b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go @@ -358,12 +358,11 @@ var ( Annotations(map[string]string{"resource.kubernetes.io/extended-resource-claim": "true"}). OwnerRef( metav1.OwnerReference{ - APIVersion: "v1", - Kind: "Pod", - Name: podName, - UID: types.UID(podUID), - Controller: ptr.To(true), - BlockOwnerDeletion: ptr.To(true), + APIVersion: "v1", + Kind: "Pod", + Name: podName, + UID: types.UID(podUID), + Controller: ptr.To(true), }). RequestWithName("container-0-request-0", className). Allocation(extendedResourceAllocationResult). @@ -375,12 +374,11 @@ var ( Annotations(map[string]string{"resource.kubernetes.io/extended-resource-claim": "true"}). OwnerRef( metav1.OwnerReference{ - APIVersion: "v1", - Kind: "Pod", - Name: podName, - UID: types.UID(podUID), - Controller: ptr.To(true), - BlockOwnerDeletion: ptr.To(true), + APIVersion: "v1", + Kind: "Pod", + Name: podName, + UID: types.UID(podUID), + Controller: ptr.To(true), }). RequestWithName("container-0-request-0", className). Allocation(extendedResourceAllocationResult). @@ -392,12 +390,11 @@ var ( Annotations(map[string]string{"resource.kubernetes.io/extended-resource-claim": "true"}). OwnerRef( metav1.OwnerReference{ - APIVersion: "v1", - Kind: "Pod", - Name: podName, - UID: types.UID(podUID), - Controller: ptr.To(true), - BlockOwnerDeletion: ptr.To(true), + APIVersion: "v1", + Kind: "Pod", + Name: podName, + UID: types.UID(podUID), + Controller: ptr.To(true), }). RequestWithName("container-0-request-0", className). RequestWithNameCount("container-0-request-1", className, 2). @@ -410,12 +407,11 @@ var ( Annotations(map[string]string{"resource.kubernetes.io/extended-resource-claim": "true"}). OwnerRef( metav1.OwnerReference{ - APIVersion: "v1", - Kind: "Pod", - Name: podName, - UID: types.UID(podUID), - Controller: ptr.To(true), - BlockOwnerDeletion: ptr.To(true), + APIVersion: "v1", + Kind: "Pod", + Name: podName, + UID: types.UID(podUID), + Controller: ptr.To(true), }). RequestWithName("container-0-request-0", className). RequestWithNameCount("container-0-request-1", className, 2). @@ -428,12 +424,11 @@ var ( Annotations(map[string]string{"resource.kubernetes.io/extended-resource-claim": "true"}). OwnerRef( metav1.OwnerReference{ - APIVersion: "v1", - Kind: "Pod", - Name: podName, - UID: types.UID(podUID), - Controller: ptr.To(true), - BlockOwnerDeletion: ptr.To(true), + APIVersion: "v1", + Kind: "Pod", + Name: podName, + UID: types.UID(podUID), + Controller: ptr.To(true), }). RequestWithName("container-0-request-0", className). RequestWithNameCount("container-1-request-0", className, 2). @@ -446,12 +441,11 @@ var ( Annotations(map[string]string{"resource.kubernetes.io/extended-resource-claim": "true"}). OwnerRef( metav1.OwnerReference{ - APIVersion: "v1", - Kind: "Pod", - Name: podName, - UID: types.UID(podUID), - Controller: ptr.To(true), - BlockOwnerDeletion: ptr.To(true), + APIVersion: "v1", + Kind: "Pod", + Name: podName, + UID: types.UID(podUID), + Controller: ptr.To(true), }). RequestWithName("container-0-request-0", className). RequestWithNameCount("container-1-request-0", className, 2). @@ -464,12 +458,11 @@ var ( Annotations(map[string]string{"resource.kubernetes.io/extended-resource-claim": "true"}). OwnerRef( metav1.OwnerReference{ - APIVersion: "v1", - Kind: "Pod", - Name: podName, - UID: types.UID(podUID), - Controller: ptr.To(true), - BlockOwnerDeletion: ptr.To(true), + APIVersion: "v1", + Kind: "Pod", + Name: podName, + UID: types.UID(podUID), + Controller: ptr.To(true), }). RequestWithName("container-0-request-0", className). Allocation(extendedResourceAllocationResultNode2).