github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-08-08 23:37:11 +00:00
Code Issues Projects Releases Wiki Activity

removed BlockOwnerDeletion

Browse Source
This commit is contained in:
yliao
2025-10-24 21:34:31 +00:00
parent fb10a29954
commit 4f647b3f3d
4 changed files with 50 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/controller/resourceclaim/controller.go
View File

@@ -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,

12
pkg/controller/resourceclaim/controller_test.go
View File

@@ -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,
}
}

11
pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go
View File

@@ -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{

77
pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go
View File

@@ -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).