Bring in CSI driver changes from upstream

This commit is contained in:
Otto Bittner 2022-11-30 17:33:28 +01:00
parent 92d97e117a
commit c05d1589f8
2 changed files with 52 additions and 40 deletions

View File

@ -61,14 +61,17 @@ spec:
mountPath: /dev mountPath: /dev
# The following mounts are required to trigger host udevadm from # The following mounts are required to trigger host udevadm from
# container # container
- name: udev-rules-etc # But we don't want that, because it breaks cryptsetup
mountPath: /etc/udev # Also, the task done by manually triggering udevadm are already
- name: udev-rules-lib # performed by having the correct udev rules configured
mountPath: /lib/udev # - name: udev-rules-etc
- name: udev-socket # mountPath: /etc/udev
mountPath: /run/udev # - name: udev-rules-lib
- name: sys # mountPath: /lib/udev
mountPath: /sys # - name: udev-socket
# mountPath: /run/udev
# - name: sys
# mountPath: /sys
- name: cryptsetup - name: cryptsetup
mountPath: /run/cryptsetup mountPath: /run/cryptsetup
volumes: volumes:
@ -90,18 +93,21 @@ spec:
type: Directory type: Directory
# The following mounts are required to trigger host udevadm from # The following mounts are required to trigger host udevadm from
# container # container
- name: udev-rules-etc # But we don't want that, because it breaks cryptsetup
hostPath: # Also, the task done by manually triggering udevadm are already
path: /etc/udev # performed by having the correct udev rules configured
type: Directory # - name: udev-rules-etc
- name: udev-rules-lib # hostPath:
hostPath: # path: /etc/udev
path: /lib/udev # type: Directory
type: Directory # - name: udev-rules-lib
- name: udev-socket # hostPath:
hostPath: # path: /lib/udev
path: /run/udev # type: Directory
type: Directory # - name: udev-socket
# hostPath:
# path: /run/udev
# type: Directory
- name: sys - name: sys
hostPath: hostPath:
path: /sys path: /sys

View File

@ -61,14 +61,17 @@ spec:
mountPath: /dev mountPath: /dev
# The following mounts are required to trigger host udevadm from # The following mounts are required to trigger host udevadm from
# container # container
- name: udev-rules-etc # But we don't want that, because it breaks cryptsetup
mountPath: /etc/udev # Also, the task done by manually triggering udevadm are already
- name: udev-rules-lib # performed by having the correct udev rules configured
mountPath: /lib/udev # - name: udev-rules-etc
- name: udev-socket # mountPath: /etc/udev
mountPath: /run/udev # - name: udev-rules-lib
- name: sys # mountPath: /lib/udev
mountPath: /sys # - name: udev-socket
# mountPath: /run/udev
# - name: sys
# mountPath: /sys
- name: cryptsetup - name: cryptsetup
mountPath: /run/cryptsetup mountPath: /run/cryptsetup
volumes: volumes:
@ -90,18 +93,21 @@ spec:
type: Directory type: Directory
# The following mounts are required to trigger host udevadm from # The following mounts are required to trigger host udevadm from
# container # container
- name: udev-rules-etc # But we don't want that, because it breaks cryptsetup
hostPath: # Also, the task done by manually triggering udevadm are already
path: /etc/udev # performed by having the correct udev rules configured
type: Directory # - name: udev-rules-etc
- name: udev-rules-lib # hostPath:
hostPath: # path: /etc/udev
path: /lib/udev # type: Directory
type: Directory # - name: udev-rules-lib
- name: udev-socket # hostPath:
hostPath: # path: /lib/udev
path: /run/udev # type: Directory
type: Directory # - name: udev-socket
# hostPath:
# path: /run/udev
# type: Directory
- name: sys - name: sys
hostPath: hostPath:
path: /sys path: /sys