From 73b7eba2468468bf361151ddd4cd8188e800ffab Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 30 Sep 2025 02:40:43 +0000 Subject: [PATCH] Updating ose-machine-api-provider-aws-container image to be consistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/ose-machine-api-provider-aws.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 461415cbc..e307e5af6 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.24-openshift-4.20 + tag: rhel-9-release-golang-1.24-openshift-4.21 diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 10ec3c39e..135ac9b5f 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -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/machine-api-provider-aws COPY . . # VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own RUN unset VERSION \ && GOPROXY=off NO_DOCKER=1 make build -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/machine-api-provider-aws/bin/machine-controller-manager / COPY --from=builder /go/src/github.com/openshift/machine-api-provider-aws/bin/termination-handler /