From a5a949bbbbe7cdaf8000b22d326ad05940e767f7 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sun, 17 Sep 2023 22:26:32 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-powervs-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/da6a5af1fa96762cc8410f09fc28c0457280f59a/images/ose-powervs-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 844f0d26a..7cd14bfef 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.20-openshift-4.14 + tag: rhel-8-release-golang-1.20-openshift-4.15 diff --git a/openshift-hack/images/Dockerfile.openshift b/openshift-hack/images/Dockerfile.openshift index b342fe799..5fdc447cb 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-8-golang-1.20-openshift-4.14 AS ccm-builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 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.14:base +FROM registry.ci.openshift.org/ocp/4.15:base 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" ]