From 9c6f088e4208977d0a63dd4acd886b687220a556 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Fri, 16 Jan 2026 07:12:49 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-cluster-kube-cluster-api-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/56e2bf0ab22776b09d3451bdc3aa877a023c82af/images/ose-cluster-kube-cluster-api-operator.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 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/openshift/Dockerfile.openshift b/openshift/Dockerfile.openshift index 11b1b5dd1..e1f7a5051 100644 --- a/openshift/Dockerfile.openshift +++ b/openshift/Dockerfile.openshift @@ -1,4 +1,4 @@ -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 /build COPY . . @@ -7,7 +7,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \ -o=cluster-api-operator \ cmd/main.go -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9-minimal LABEL description="Cluster API Operator"