Merge pull request #630 from mbaldessari/better-err-message

openshift-merge-bot[bot] · web-flow · commit 0cef932841c8 · 2026-05-18T13:48:22.000Z
Better webhook error
diff --git a/api/v1alpha1/pattern_webhook.go b/api/v1alpha1/pattern_webhook.go
@@ -91,8 +91,8 @@ func (r *PatternValidator) ValidateDelete(_ context.Context, obj runtime.Object)
 	patternlog.Info("validate delete", "name", p.Name)
 
 	if !strings.EqualFold(p.Annotations[PruneAnnotation], "true") {
-		return nil, fmt.Errorf("deletion denied: set annotation %s=\"true\" on %s/%s before deleting",
-			PruneAnnotation, p.Namespace, p.Name)
+		return nil, fmt.Errorf("deletion denied: set the annotation %s=\"true\" on the pattern \"%s\" CR in the \"%s\" namespace before deleting",
+			PruneAnnotation, p.Name, p.Namespace)
 	}
 
 	return nil, nil

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ func (r *PatternValidator) ValidateDelete(_ context.Context, obj runtime.Object)`
`91`	`91`	`patternlog.Info("validate delete", "name", p.Name)`
`92`	`92`
`93`	`93`	`if !strings.EqualFold(p.Annotations[PruneAnnotation], "true") {`
`94`		`- return nil, fmt.Errorf("deletion denied: set annotation %s=\"true\" on %s/%s before deleting",`
`95`		`- PruneAnnotation, p.Namespace, p.Name)`
	`94`	`+ return nil, fmt.Errorf("deletion denied: set the annotation %s=\"true\" on the pattern \"%s\" CR in the \"%s\" namespace before deleting",`
	`95`	`+ PruneAnnotation, p.Name, p.Namespace)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`return nil, nil`