diff --git a/pkg/webhook/server/generic/pod/gracedelete/webhook.go b/pkg/webhook/server/generic/pod/gracedelete/webhook.go index 5bcfc384..2b4aa9f5 100644 --- a/pkg/webhook/server/generic/pod/gracedelete/webhook.go +++ b/pkg/webhook/server/generic/pod/gracedelete/webhook.go @@ -101,10 +101,10 @@ func (gd *GraceDelete) Validating(ctx context.Context, c client.Client, oldPod, } if len(finalizers) == 0 { - return fmt.Errorf("this Pod's deletion process is underway and being managed by PodOpsLifecycle") + return fmt.Errorf("pod 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) + return fmt.Errorf("pod 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 { diff --git a/pkg/webhook/server/generic/pod/gracedelete/webhook_test.go b/pkg/webhook/server/generic/pod/gracedelete/webhook_test.go index d2f7ae8f..5416d1cf 100644 --- a/pkg/webhook/server/generic/pod/gracedelete/webhook_test.go +++ b/pkg/webhook/server/generic/pod/gracedelete/webhook_test.go @@ -119,7 +119,7 @@ func TestGraceDelete(t *testing.T) { expectedLabels: map[string]string{ appsv1alpha1.PodDeletionIndicationLabelKey: "true", }, - keyWords: "podOpsLifecycle denied", + keyWords: "pod deletion process is underway", reqOperation: admissionv1.Delete, }, { @@ -148,7 +148,7 @@ func TestGraceDelete(t *testing.T) { expectedLabels: map[string]string{ appsv1alpha1.PodDeletionIndicationLabelKey: "true", }, - keyWords: "podOpsLifecycle denied", + keyWords: "pod deletion process is underway", reqOperation: admissionv1.Delete, }, {