From 551301c5ccf71032d16b3436b962a8aa333383ac Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sun, 17 Dec 2023 04:12:20 +0000 Subject: [PATCH] Updating sriov-network-config-daemon-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/sriov-network-config-daemon.yml --- .ci-operator.yaml | 2 +- Dockerfile.sriov-network-config-daemon.rhel7 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 7096df34e..a83f0f843 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.20-openshift-4.15 + tag: rhel-9-release-golang-1.21-openshift-4.16 diff --git a/Dockerfile.sriov-network-config-daemon.rhel7 b/Dockerfile.sriov-network-config-daemon.rhel7 index a1a8a2e57..b163a057c 100644 --- a/Dockerfile.sriov-network-config-daemon.rhel7 +++ b/Dockerfile.sriov-network-config-daemon.rhel7 @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-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 WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator COPY . . RUN make _build-sriov-network-config-daemon BIN_PATH=build/_output/cmd -FROM registry.ci.openshift.org/ocp/4.15:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 RUN yum -y update && ARCH_DEP_PKGS=$(if [ "$(uname -m)" != "s390x" ]; then echo -n mstflint ; fi) && yum -y install pciutils hwdata $ARCH_DEP_PKGS && yum clean all LABEL io.k8s.display-name="OpenShift sriov-network-config-daemon" \ io.k8s.description="This is a daemon that manage and config sriov network devices in Openshift cluster" \