From 238d7685a328c9b9b9b5e6da5b776d7cbcd9dbc4 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 28 Nov 2023 02:32:35 +0000 Subject: [PATCH 1/2] UPSTREAM: : Updating ose-gcp-pd-csi-driver-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/9dc2a375bf335e7e4e3d7e75abc5c3bdbb0c0e98/images/ose-gcp-pd-csi-driver.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 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.openshift b/Dockerfile.openshift index 1cc196cf1..3490655b2 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,10 +1,10 @@ -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 WORKDIR /go/src/github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver COPY . . # Skip Windows driver build RUN make gce-pd-driver -FROM registry.ci.openshift.org/ocp/4.15:base +FROM registry.ci.openshift.org/ocp/4.15:base-rhel9 # Get all deps # nvme-cli and /usr/bin/xxd are deps of google_nvme_id From 69aee14438557ad8cdc8e1c7fd5691fb7e296c36 Mon Sep 17 00:00:00 2001 From: Fabio Bertinatto Date: Thu, 30 Nov 2023 11:12:45 -0300 Subject: [PATCH 2/2] UPSTREAM: : Add OpenShift Dockerfile To be squashed with previous commit with the same title. --- Dockerfile.openshift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 3490655b2..f46da3379 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -9,7 +9,7 @@ FROM registry.ci.openshift.org/ocp/4.15:base-rhel9 # Get all deps # nvme-cli and /usr/bin/xxd are deps of google_nvme_id RUN yum update -y && \ - yum install --setopt=tsflags=nodocs -y e2fsprogs xfsprogs util-linux systemd-udev nvme-cli /usr/bin/xxd && \ + yum install --setopt=tsflags=nodocs -y e2fsprogs xfsprogs util-linux nvme-cli /usr/lib/udev/scsi_id /usr/bin/xxd && \ yum clean all && rm -rf /var/cache/yum/* && \ mkdir -p /lib/udev_containerized && cp /usr/lib/udev/scsi_id /lib/udev_containerized/scsi_id # The driver assumes this path