From 9642e408a6edf0a8d4a8929c9bb41d85690c0b04 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 27 Nov 2023 23:12:24 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/9dc2a375bf335e7e4e3d7e75abc5c3bdbb0c0e98/images/ose-csi-snapshot-controller.yml --- .ci-operator.yaml | 2 +- Dockerfile.snapshot-controller.openshift.rhel7 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 7cd14bfef..7096df34e 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.15 + tag: rhel-9-release-golang-1.20-openshift-4.15 diff --git a/Dockerfile.snapshot-controller.openshift.rhel7 b/Dockerfile.snapshot-controller.openshift.rhel7 index 277abb21a..fa1c0de60 100644 --- a/Dockerfile.snapshot-controller.openshift.rhel7 +++ b/Dockerfile.snapshot-controller.openshift.rhel7 @@ -1,8 +1,8 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter COPY . . RUN make build -FROM registry.ci.openshift.org/ocp/4.15:base +FROM registry.ci.openshift.org/ocp/4.15:base-rhel9 COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/bin/snapshot-controller /usr/bin/ ENTRYPOINT ["/usr/bin/snapshot-controller"]