adjust grace delete webhook message

wu8685 · shaofan-hs · commit 1256a9a6050d · 2024-03-28T15:32:21.000+08:00
diff --git a/pkg/webhook/server/generic/pod/gracedelete/webhook.go b/pkg/webhook/server/generic/pod/gracedelete/webhook.go
@@ -99,7 +99,12 @@ func (gd *GraceDelete) Validating(ctx context.Context, c client.Client, oldPod,
 			finalizers = append(finalizers, f)
 		}
 	}
-	return fmt.Errorf("podOpsLifecycle denied delete request, since related resources and finalizers have not been processed. Waiting for removing finalizers: %v", finalizers)
+
+	if len(finalizers) == 0 {
+		return fmt.Errorf("this Pod's deletion process is underway and being managed by PodOpsLifecycle")
+	}
+
+	return fmt.Errorf("this Pod's deletion process is underway and being managed by PodOpsLifecycle with finalizers: %v", finalizers)
 }
 
 func (gd *GraceDelete) Mutating(ctx context.Context, c client.Client, oldPod, newPod *corev1.Pod, operation admissionv1.Operation) error {

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,12 @@ func (gd *GraceDelete) Validating(ctx context.Context, c client.Client, oldPod,`
`99`	`99`	`finalizers = append(finalizers, f)`
`100`	`100`	`}`
`101`	`101`	`}`
`102`		`- return fmt.Errorf("podOpsLifecycle denied delete request, since related resources and finalizers have not been processed. Waiting for removing finalizers: %v", finalizers)`
	`102`	`+`
	`103`	`+ if len(finalizers) == 0 {`
	`104`	`+ return fmt.Errorf("this Pod's deletion process is underway and being managed by PodOpsLifecycle")`
	`105`	`+ }`
	`106`	`+`
	`107`	`+ return fmt.Errorf("this Pod's deletion process is underway and being managed by PodOpsLifecycle with finalizers: %v", finalizers)`
`103`	`108`	`}`
`104`	`109`
`105`	`110`	`func (gd GraceDelete) Mutating(ctx context.Context, c client.Client, oldPod, newPod corev1.Pod, operation admissionv1.Operation) error {`