Merge pull request kubernetes-sigs#95 from openshift-bot/art-consiste…

…ncy-openshift-4.15-ose-prometheus-adapter OCPBUGS-24155: Updating ose-prometheus-adapter-container image to be consistent with ART
machine424 · Dec 5, 2023 · c38187e · c38187e
2 parents 2b309fe + 5f83401
commit c38187e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -1,12 +1,12 @@
-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
 
 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