From 1d09f25018bfdaf6f4900662ac568a64f01150d6 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Fri, 20 Jun 2025 04:16:26 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-ibmcloud-cluster-api-controllers-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/8f77fc475c95f9d98c348deb2feb88f5952d7357/images/ose-ibmcloud-cluster-api-controllers.yml --- .ci-operator.yaml | 2 +- openshift/Dockerfile.openshift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 7c15f83e3..461415cbc 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/openshift/Dockerfile.openshift b/openshift/Dockerfile.openshift index ca5a7e38d..f9ae185eb 100644 --- a/openshift/Dockerfile.openshift +++ b/openshift/Dockerfile.openshift @@ -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 /build COPY . . @@ -7,7 +7,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \ -o=cluster-api-provider-ibmcloud-controller-manager \ main.go -FROM registry.ci.openshift.org/ocp/4.19:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.20:base-rhel9 LABEL description="Cluster API Provider IBM Cloud Controller Manager"