Adjust code

Author: ingvagabund

.ci-operator.yaml

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 as builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24 as builder
 WORKDIR /go/src/github.com/openshift/cluster-kube-descheduler-operator
 COPY . .
 RUN make build --warn-undefined-variables

Dockerfile.rhel7

@@ -1,9 +1,9 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-kube-descheduler-operator
 COPY . .
 RUN make build --warn-undefined-variables
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.19
+FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
 COPY --from=builder /go/src/github.com/openshift/cluster-kube-descheduler-operator/cluster-kube-descheduler-operator /usr/bin/
 COPY --from=builder /go/src/github.com/openshift/cluster-kube-descheduler-operator/soft-tainter /usr/bin/
 COPY --from=builder /go/src/github.com/openshift/cluster-kube-descheduler-operator/manifests /manifests

bundle.Dockerfile

@@ -1,4 +1,4 @@
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 as builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24 as builder
 WORKDIR /go/src/github.com/openshift/cluster-kube-descheduler-operator
 COPY . .
 

pkg/operator/target_config_reconciler_test.go

@@ -1939,25 +1939,33 @@ type fakeRecorder struct {
 
 func (f *fakeRecorder) Event(reason, note string) {
 	if f.Events != nil {
-		f.Events <- fmt.Sprintf(reason + " " + note)
+		f.Events <- fmt.Sprintf("%s %s", reason, note)
 	}
 }
 
 func (f *fakeRecorder) Eventf(reason, note string, args ...interface{}) {
 	if f.Events != nil {
-		f.Events <- fmt.Sprintf(reason+" "+note, args...)
+		msg := fmt.Sprintf("%s %s", reason, note)
+		if len(args) > 0 {
+			msg += " " + fmt.Sprint(args...)
+		}
+		f.Events <- msg
 	}
 }
 
 func (f *fakeRecorder) Warning(reason, note string) {
 	if f.Events != nil {
-		f.Events <- fmt.Sprintf(reason + " " + note)
+		f.Events <- fmt.Sprintf("%s %s", reason, note)
 	}
 }
 
 func (f *fakeRecorder) Warningf(reason, note string, args ...interface{}) {
 	if f.Events != nil {
-		f.Events <- fmt.Sprintf(reason+" "+note, args...)
+		msg := fmt.Sprintf("%s %s", reason, note)
+		if len(args) > 0 {
+			msg += " " + fmt.Sprint(args...)
+		}
+		f.Events <- msg
 	}
 }