From bc2c82b0321c3c6aa6bafe1c83a1373c9349ccde Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Wed, 4 Sep 2024 19:16:09 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-olm-operator-controller.yml --- .ci-operator.yaml | 2 +- openshift/operator-controller.Dockerfile | 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/operator-controller.Dockerfile b/openshift/operator-controller.Dockerfile index 2af44e43e..2a649dd90 100644 --- a/openshift/operator-controller.Dockerfile +++ b/openshift/operator-controller.Dockerfile @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder WORKDIR /build COPY . . RUN make go-build-local -FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 USER 1001 COPY --from=builder /build/bin/manager /manager COPY openshift/manifests /openshift/manifests