From 48e514b9127ea5b6fa8666cf52c946988b8c1a81 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 20 Dec 2025 02:56:38 +0000 Subject: [PATCH] UPSTREAM: : openshift: Updating ose-machine-api-provider-openstack-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-machine-api-provider-openstack.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 e307e5af6..284a91009 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.21 + tag: rhel-9-release-golang-1.24-openshift-4.22 diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 378b4e5bb..93553f033 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,7 +1,7 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack COPY . . RUN make -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-openstack/machine-controller-manager /