From 1cb03776203e15f68c32010e0c4d3a102e36ede4 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 20 Dec 2025 11:20:02 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-openstack-cloud-controller-manager-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-openstack-cloud-controller-manager.yml --- .ci-operator.yaml | 2 +- images/cloud-controller-manager/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index e307e5af66..284a910090 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/images/cloud-controller-manager/Dockerfile b/images/cloud-controller-manager/Dockerfile index ad543c0081..eb2a1d8a37 100644 --- a/images/cloud-controller-manager/Dockerfile +++ b/images/cloud-controller-manager/Dockerfile @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 WORKDIR /go/src/k8s.io/cloud-provider-openstack COPY . . RUN go build -o openstack-cloud-controller-manager ./cmd/openstack-cloud-controller-manager -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 COPY --from=0 /go/src/k8s.io/cloud-provider-openstack/openstack-cloud-controller-manager /usr/bin/