File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ PROG := cluster-image-registry-operator
4
4
5
5
GOLANGCI_LINT = _output/tools/golangci-lint
6
6
GOLANGCI_LINT_CACHE = $(PWD ) /_output/golangci-lint-cache
7
- GOLANGCI_LINT_VERSION = v1.56.2
7
+ GOLANGCI_LINT_VERSION = v1.64.8
8
8
9
9
GO_REQUIRED_MIN_VERSION = 1.16
10
10
Original file line number Diff line number Diff line change 1
1
package operator
2
2
3
3
import (
4
+ "errors"
4
5
"fmt"
5
6
"strings"
6
7
"time"
@@ -221,7 +222,7 @@ func (c *ImagePrunerController) syncPrunerStatus(cr *imageregistryv1.ImagePruner
221
222
// checkRoutesStatus verifies the Admitted condition type for all provided routes,
222
223
// returns an error if any of them was not admitted.
223
224
func (c * Controller ) checkRoutesStatus (routes []* routev1.Route ) error {
224
- var errors []string
225
+ var errs []string
225
226
for _ , route := range routes {
226
227
for _ , ingress := range route .Status .Ingress {
227
228
for _ , condition := range ingress .Conditions {
@@ -231,8 +232,8 @@ func (c *Controller) checkRoutesStatus(routes []*routev1.Route) error {
231
232
if condition .Status == corev1 .ConditionTrue {
232
233
continue
233
234
}
234
- errors = append (
235
- errors ,
235
+ errs = append (
236
+ errs ,
236
237
fmt .Sprintf (
237
238
"route %s (host %s, router %s) not admitted: %s" ,
238
239
route .Name ,
@@ -244,8 +245,8 @@ func (c *Controller) checkRoutesStatus(routes []*routev1.Route) error {
244
245
}
245
246
}
246
247
}
247
- if len (errors ) > 0 {
248
- return fmt . Errorf (strings .Join (errors , "," ))
248
+ if len (errs ) > 0 {
249
+ return errors . New (strings .Join (errs , "," ))
249
250
}
250
251
return nil
251
252
}
You can’t perform that action at this time.
0 commit comments