From 86638bb26456cde40a9715a7f8fcb7380e4f8a08 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Fri, 6 Dec 2024 00:04:02 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-aws-cluster-api-controllers-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-aws-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 64887a08b4..7c15f83e3e 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.22-openshift-4.18 + tag: rhel-9-release-golang-1.23-openshift-4.19 diff --git a/openshift/Dockerfile.openshift b/openshift/Dockerfile.openshift index 34f35e4ec7..a5830fc996 100644 --- a/openshift/Dockerfile.openshift +++ b/openshift/Dockerfile.openshift @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 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-aws-controller-manager \ main.go -FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.19:base-rhel9 LABEL description="Cluster API Provider AWS Controller Manager"