Fix so that udevadm can be run from inside kubernetes container on th…

…e host
kubernetes-sigs · Oct 3, 2018 · ab9b4b9 · ab9b4b9
1 parent b85c3a2
commit ab9b4b9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -25,6 +25,6 @@ FROM gcr.io/google-containers/debian-base-amd64:0.3
 COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
 
 # Install necessary dependencies
-RUN clean-install util-linux e2fsprogs mount ca-certificates
+RUN clean-install util-linux e2fsprogs mount ca-certificates udev
 
 ENTRYPOINT ["/gce-pd-csi-driver"]
diff --git a/deploy/kubernetes/dev/node.yaml b/deploy/kubernetes/dev/node.yaml
@@ -51,7 +51,16 @@ spec:
             - name: plugin-dir
               mountPath: /csi
             - name: device-dir
-              mountPath: /host/dev
+              mountPath: /dev
+            # The following mounts are required to trigger host udevadm from container
+            - name: udev-rules-etc
+              mountPath: /etc/udev
+            - name: udev-rules-lib
+              mountPath: /lib/udev
+            - name: udev-socket
+              mountPath: /run/udev
+            - name: sys
+              mountPath: /sys
       volumes:
         - name: registration-dir
           hostPath:
@@ -68,4 +77,21 @@ spec:
         - name: device-dir
           hostPath:
             path: /dev
+            type: Directory
+        # The following mounts are required to trigger host udevadm from container
+        - name: udev-rules-etc
+          hostPath:
+            path: /etc/udev
+            type: Directory
+        - name: udev-rules-lib
+          hostPath:
+            path: /lib/udev
+            type: Directory
+        - name: udev-socket
+          hostPath:
+            path: /run/udev
+            type: Directory
+        - name: sys
+          hostPath:
+            path: /sys
             type: Directory
diff --git a/pkg/mount-manager/device-utils.go b/pkg/mount-manager/device-utils.go
@@ -27,13 +27,12 @@ import (
 )
 
 const (
-	diskByHostIdPath     = "/host/dev/disk/by-id/"
 	diskByIdPath         = "/dev/disk/by-id/"
 	diskGooglePrefix     = "google-"
 	diskScsiGooglePrefix = "scsi-0Google_PersistentDisk_"
 	diskPartitionSuffix  = "-part"
-	diskSDPath           = "/host/dev/sd"
-	diskSDPattern        = "/host/dev/sd*"
+	diskSDPath           = "/dev/sd"
+	diskSDPattern        = "/dev/sd*"
 	// How many times to retry for a consistent read of /proc/mounts.
 	maxListTries = 3
 	// Number of fields per line in /proc/mounts as per the fstab man page.
@@ -75,8 +74,6 @@ func (m *deviceUtils) GetDiskByIdPaths(deviceName string, partition string) []st
 	devicePaths := []string{
 		path.Join(diskByIdPath, diskGooglePrefix+deviceName),
 		path.Join(diskByIdPath, diskScsiGooglePrefix+deviceName),
-		path.Join(diskByHostIdPath, diskScsiGooglePrefix+deviceName),
-		path.Join(diskByHostIdPath, diskScsiGooglePrefix+deviceName),
 	}
 
 	if partition != "" {