Merge pull request #1196 from flavianmissi/art-consistency-openshift-4.19-ose-cluster-image-registry-operator

OCPBUGS-45409: Updating ose-cluster-image-registry-operator-container image to be consistent with ART for 4.19

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.22-openshift-4.18
+  tag: rhel-9-release-golang-1.23-openshift-4.19

Dockerfile

@@ -1,11 +1,11 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-image-registry-operator
 COPY . .
 RUN make build
 WORKDIR /go/src/github.com/openshift/cluster-image-registry-operator/cmd/move-blobs
 RUN go build -o ../../tmp/_output/bin/move-blobs
 
-FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
 COPY images/bin/entrypoint.sh /usr/bin/
 COPY manifests/image-references manifests/0* /manifests/
 COPY vendor/github.com/openshift/api/imageregistry/v1/**/*.crd.yaml /manifests/

Makefile

@@ -4,7 +4,7 @@ PROG  := cluster-image-registry-operator
 
 GOLANGCI_LINT = _output/tools/golangci-lint
 GOLANGCI_LINT_CACHE = $(PWD)/_output/golangci-lint-cache
-GOLANGCI_LINT_VERSION = v1.56.2
+GOLANGCI_LINT_VERSION = v1.64.8
 
 GO_REQUIRED_MIN_VERSION = 1.16
 

pkg/operator/status.go

@@ -1,6 +1,7 @@
 package operator
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -221,7 +222,7 @@ func (c *ImagePrunerController) syncPrunerStatus(cr *imageregistryv1.ImagePruner
 // checkRoutesStatus verifies the Admitted condition type for all provided routes,
 // returns an error if any of them was not admitted.
 func (c *Controller) checkRoutesStatus(routes []*routev1.Route) error {
-	var errors []string
+	var errs []string
 	for _, route := range routes {
 		for _, ingress := range route.Status.Ingress {
 			for _, condition := range ingress.Conditions {
@@ -231,8 +232,8 @@ func (c *Controller) checkRoutesStatus(routes []*routev1.Route) error {
 				if condition.Status == corev1.ConditionTrue {
 					continue
 				}
-				errors = append(
-					errors,
+				errs = append(
+					errs,
 					fmt.Sprintf(
 						"route %s (host %s, router %s) not admitted: %s",
 						route.Name,
@@ -244,8 +245,8 @@ func (c *Controller) checkRoutesStatus(routes []*routev1.Route) error {
 			}
 		}
 	}
-	if len(errors) > 0 {
-		return fmt.Errorf(strings.Join(errors, ","))
+	if len(errs) > 0 {
+		return errors.New(strings.Join(errs, ","))
 	}
 	return nil
 }