From d16483c03ff7372219f8f40b6d9de1ecc1033396 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 16 Sep 2021 10:58:21 +0000 Subject: [PATCH] Updating sriov-network-must-gather images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/3dea8426481b269476342fc0a631273f32ce691e/images/sriov-network-must-gather.yml --- .ci-operator.yaml | 2 +- must-gather/Dockerfile.rhel7 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 7531a96df..9271a8208 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: golang-1.15 + tag: rhel-8-release-golang-1.16-openshift-4.10 diff --git a/must-gather/Dockerfile.rhel7 b/must-gather/Dockerfile.rhel7 index 6dba6b8e5..18bda48d7 100644 --- a/must-gather/Dockerfile.rhel7 +++ b/must-gather/Dockerfile.rhel7 @@ -1,8 +1,8 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator COPY . . -FROM registry.ci.openshift.org/ocp/4.9:base +FROM registry.ci.openshift.org/ocp/4.10:base LABEL io.k8s.display-name="sriov-network-operator-must-gather" \ io.k8s.description="This is a sriov must-gather image that collectes sriov network operator related resources." COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/must-gather/collection-scripts/* /usr/bin/