From 245b96f5f996f510ceeb4ad0770dc136b8839780 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Wed, 4 Sep 2024 15:56:59 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-ibm-cloud-controller-manager-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-ibm-cloud-controller-manager.yml --- .ci-operator.yaml | 2 +- openshift-hack/images/Dockerfile.openshift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 1e59c02c2..64887a08b 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.17 + tag: rhel-9-release-golang-1.22-openshift-4.18 diff --git a/openshift-hack/images/Dockerfile.openshift b/openshift-hack/images/Dockerfile.openshift index 4b271533a..d438d771c 100644 --- a/openshift-hack/images/Dockerfile.openshift +++ b/openshift-hack/images/Dockerfile.openshift @@ -1,11 +1,11 @@ # Build IBM cloud controller manager binary -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS ccm-builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS ccm-builder WORKDIR /build COPY . . RUN CGO_ENABLED=0 go build -ldflags "-s -w" -o ibm-cloud-controller-manager . # Assemble the final image -FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 LABEL description="IBM Cloud Controller Manager" COPY --from=ccm-builder /build/ibm-cloud-controller-manager /bin/ibm-cloud-controller-manager ENTRYPOINT [ "/bin/ibm-cloud-controller-manager" ]