From 6a3b01451cbe414f2eb528f3295688c5cf560c5f Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Wed, 18 Jun 2025 17:32:07 +0000 Subject: [PATCH] Updating ose-machine-api-operator-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-machine-api-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile.rhel | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 7c15f83e3e..461415cbc5 100644 --- a/.ci-operator.yaml +++ b/.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 diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 5b31dc79b3..7983b9086d 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,4 +1,4 @@ -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/machine-api-operator COPY . . RUN NO_DOCKER=1 make build && \ @@ -6,7 +6,7 @@ RUN NO_DOCKER=1 make build && \ cp /go/src/github.com/openshift/machine-api-operator/bin/machine-api-tests-ext /tmp/build/machine-api-tests-ext && \ gzip /tmp/build/machine-api-tests-ext -FROM registry.ci.openshift.org/ocp/4.19:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.20:base-rhel9 COPY --from=builder /go/src/github.com/openshift/machine-api-operator/install manifests COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machine-api-operator . COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/nodelink-controller .