Merge pull request #399 from openshift-bot/art-consistency-openshift-4.21-ose-cluster-openshift-controller-manager-operator

OCPBUGS-62494: Updating ose-cluster-openshift-controller-manager-operator-container image to be consistent with ART for 4.21

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.24-openshift-4.20
+  tag: rhel-9-release-golang-1.24-openshift-4.21

Dockerfile

@@ -1,11 +1,11 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-openshift-controller-manager-operator
 COPY . .
 RUN GO_COMPLIANCE_INFO=0 make build \
     && make tests-ext-build \
     && gzip cluster-openshift-controller-manager-operator-tests-ext
 
-FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
 COPY --from=builder /go/src/github.com/openshift/cluster-openshift-controller-manager-operator/cluster-openshift-controller-manager-operator /usr/bin/
 COPY --from=builder /go/src/github.com/openshift/cluster-openshift-controller-manager-operator/cluster-openshift-controller-manager-operator-tests-ext.gz /usr/bin/
 COPY manifests /manifests