From ca07344731ac95752505f83fef75f71e396c53df Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 9 Dec 2023 18:33:44 +0000 Subject: [PATCH] Updating ose-network-metrics-daemon-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/c78b2b27f47b41d5d59449c863f3dea6eaa988b7/images/ose-network-metrics-daemon.yml --- .ci-operator.yaml | 2 +- Dockerfile.openshift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 7cd14bfe..a83f0f84 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.21-openshift-4.16 diff --git a/Dockerfile.openshift b/Dockerfile.openshift index d612a434..3a34cb63 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,5 +1,5 @@ # This dockerfile is specific to building the network metrics daemon for OpenShift -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.21-openshift-4.16 AS builder # Add everything ENV PKG_NAME=github.com/openshift/network-metrics-daemon @@ -13,7 +13,7 @@ RUN make build-bin WORKDIR / -FROM registry.ci.openshift.org/ocp/4.15:base +FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 COPY --from=builder /go/src/github.com/openshift/network-metrics-daemon/bin/network-metrics-daemon /usr/bin/network-metrics LABEL io.k8s.display-name="Network Metrics Daemon" \