Merge pull request #406 from openshift-cherrypick-robot/cherry-pick-400-to-cert-manager-1.19

openshift-merge-bot[bot] · web-flow · commit f39103748bb6 · 2026-04-14T11:53:58.000Z
[cert-manager-1.19] CNF-22833: Replace fmt.Errorf("%s") with errors.New()
diff --git a/pkg/controller/istiocsr/utils.go b/pkg/controller/istiocsr/utils.go
@@ -2,6 +2,7 @@ package istiocsr
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"maps"
 	"reflect"
@@ -498,7 +499,7 @@ func (r *Reconciler) disallowMultipleIstioCSRInstances(istiocsr *v1alpha1.IstioC
 		if istiocsr.Status.SetCondition(v1alpha1.Ready, metav1.ConditionFalse, v1alpha1.ReasonFailed, statusMessage) {
 			updateErr = r.updateCondition(istiocsr, nil)
 		}
-		return common.NewMultipleInstanceError(utilerrors.NewAggregate([]error{fmt.Errorf("%s", statusMessage), updateErr}))
+		return common.NewMultipleInstanceError(utilerrors.NewAggregate([]error{errors.New(statusMessage), updateErr}))
 	}
 
 	istiocsrList := &v1alpha1.IstioCSRList{}
@@ -544,5 +545,5 @@ func (r *Reconciler) disallowMultipleIstioCSRInstances(istiocsr *v1alpha1.IstioC
 		return utilerrors.NewAggregate([]error{condUpdateErr, annUpdateErr})
 	}
 
-	return common.NewMultipleInstanceError(fmt.Errorf("%s", statusMessage))
+	return common.NewMultipleInstanceError(errors.New(statusMessage))
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package istiocsr`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "errors"`
`5`	`6`	`"fmt"`
`6`	`7`	`"maps"`
`7`	`8`	`"reflect"`
`@@ -498,7 +499,7 @@ func (r Reconciler) disallowMultipleIstioCSRInstances(istiocsr v1alpha1.IstioC`
`498`	`499`	`if istiocsr.Status.SetCondition(v1alpha1.Ready, metav1.ConditionFalse, v1alpha1.ReasonFailed, statusMessage) {`
`499`	`500`	`updateErr = r.updateCondition(istiocsr, nil)`
`500`	`501`	`}`
`501`		`- return common.NewMultipleInstanceError(utilerrors.NewAggregate([]error{fmt.Errorf("%s", statusMessage), updateErr}))`
	`502`	`+ return common.NewMultipleInstanceError(utilerrors.NewAggregate([]error{errors.New(statusMessage), updateErr}))`
`502`	`503`	`}`
`503`	`504`
`504`	`505`	`istiocsrList := &v1alpha1.IstioCSRList{}`
`@@ -544,5 +545,5 @@ func (r Reconciler) disallowMultipleIstioCSRInstances(istiocsr v1alpha1.IstioC`
`544`	`545`	`return utilerrors.NewAggregate([]error{condUpdateErr, annUpdateErr})`
`545`	`546`	`}`
`546`	`547`
`547`		`- return common.NewMultipleInstanceError(fmt.Errorf("%s", statusMessage))`
	`548`	`+ return common.NewMultipleInstanceError(errors.New(statusMessage))`
`548`	`549`	`}`