From 5f83401c56246ba7a110189671e72e807715c404 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 28 Nov 2023 19:43:02 +0000 Subject: [PATCH] Updating ose-prometheus-adapter-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/9dc2a375bf335e7e4e3d7e75abc5c3bdbb0c0e98/images/ose-prometheus-adapter.yml --- .ci-operator.yaml | 2 +- Dockerfile.ocp | 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.ocp b/Dockerfile.ocp index 6df22f8cf..000709d43 100644 --- a/Dockerfile.ocp +++ b/Dockerfile.ocp @@ -1,4 +1,4 @@ -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 COPY . /go/src/github.com/kubernetes-sigs/prometheus-adapter @@ -6,7 +6,7 @@ WORKDIR /go/src/github.com/kubernetes-sigs/prometheus-adapter RUN make RUN mv /go/src/github.com/kubernetes-sigs/prometheus-adapter/adapter /usr/bin/adapter -FROM registry.ci.openshift.org/ocp/4.15:base +FROM registry.ci.openshift.org/ocp/4.15:base-rhel9 COPY --from=builder /usr/bin/adapter /usr/bin/adapter