Merge pull request #1368 from elezar/check-directory-mounts

Ensure that directory volumes have Directory type

Author: elezar

deployments/helm/nvidia-device-plugin/templates/daemonset-device-plugin.yml

@@ -196,7 +196,7 @@ spec:
         securityContext:
           {{- include "nvidia-device-plugin.securityContext" . | nindent 10 }}
         volumeMounts:
-          - name: device-plugin
+          - name: kubelet-device-plugins-dir
             mountPath: /var/lib/kubelet/device-plugins
         {{- if typeIs "string" .Values.nvidiaDriverRoot }}
           # We always mount the driver root at /driver-root in the container.
@@ -223,20 +223,22 @@ spec:
           {{- toYaml . | nindent 10 }}
         {{- end }}
       volumes:
-        - name: device-plugin
+        - name: kubelet-device-plugins-dir
           hostPath:
             path: /var/lib/kubelet/device-plugins
+            type: Directory
         - name: mps-root
           hostPath:
             path: {{ .Values.mps.root }}
             type: DirectoryOrCreate
         - name: mps-shm
           hostPath:
             path: {{ .Values.mps.root }}/shm
-       {{- if typeIs "string" .Values.nvidiaDriverRoot }}
+        {{- if typeIs "string" .Values.nvidiaDriverRoot }}
         - name: driver-root
           hostPath:
             path: {{ .Values.nvidiaDriverRoot }}
+            type: Directory
         {{- end }}
         - name: cdi-root
           hostPath:

deployments/helm/nvidia-device-plugin/templates/daemonset-gfd.yml

@@ -198,9 +198,11 @@ spec:
         - name: output-dir
           hostPath:
             path: "/etc/kubernetes/node-feature-discovery/features.d"
+            type: DirectoryOrCreate
         - name: host-sys
           hostPath:
             path: "/sys"
+            type: Directory
         - name: driver-root
           hostPath:
             path: {{ clean ( join "/" ( list "/" .Values.nvidiaDriverRoot ) ) | quote }}

deployments/static/gpu-feature-discovery-daemonset-with-mig-mixed.yaml

@@ -60,6 +60,8 @@ spec:
         - name: output-dir
           hostPath:
             path: "/etc/kubernetes/node-feature-discovery/features.d"
+            type: DirectoryOrCreate
         - name: host-sys
           hostPath:
             path: "/sys"
+            type: Directory

deployments/static/gpu-feature-discovery-daemonset-with-mig-single.yaml

@@ -60,6 +60,8 @@ spec:
         - name: output-dir
           hostPath:
             path: "/etc/kubernetes/node-feature-discovery/features.d"
+            type: DirectoryOrCreate
         - name: host-sys
           hostPath:
             path: "/sys"
+            type: Directory

deployments/static/gpu-feature-discovery-daemonset.yaml

@@ -58,6 +58,8 @@ spec:
         - name: output-dir
           hostPath:
             path: "/etc/kubernetes/node-feature-discovery/features.d"
+            type: DirectoryOrCreate
         - name: host-sys
           hostPath:
             path: "/sys"
+            type: Directory

deployments/static/gpu-feature-discovery-job.yaml.template

@@ -32,7 +32,9 @@ spec:
         - name: output-dir
           hostPath:
             path: "/etc/kubernetes/node-feature-discovery/features.d"
+            type: DirectoryOrCreate
         - name: host-sys
           hostPath:
             path: "/sys"
+            type: Directory
       restartPolicy: Never

deployments/static/nvidia-device-plugin-compat-with-cpumanager.yml

@@ -48,9 +48,10 @@ spec:
         securityContext:
           privileged: true
         volumeMounts:
-        - name: device-plugin
+        - name: kubelet-device-plugins-dir
           mountPath: /var/lib/kubelet/device-plugins
       volumes:
-      - name: device-plugin
+      - name: kubelet-device-plugins-dir
         hostPath:
           path: /var/lib/kubelet/device-plugins
+          type: Directory

deployments/static/nvidia-device-plugin-privileged-with-service-account.yml

@@ -129,10 +129,11 @@ spec:
           securityContext:
             privileged: true
           volumeMounts:
-            - name: device-plugin
+            - name: kubelet-device-plugins-dir
               mountPath: /var/lib/kubelet/device-plugins
       serviceAccountName: nvidia-device-plugin
       volumes:
-        - name: device-plugin
+        - name: kubelet-device-plugins-dir
           hostPath:
             path: /var/lib/kubelet/device-plugins
+            type: DirectoryOrCreate

deployments/static/nvidia-device-plugin.yml

@@ -48,9 +48,10 @@ spec:
           capabilities:
             drop: ["ALL"]
         volumeMounts:
-        - name: device-plugin
+        - name: kubelet-device-plugins-dir
           mountPath: /var/lib/kubelet/device-plugins
       volumes:
-      - name: device-plugin
+      - name: kubelet-device-plugins-dir
         hostPath:
           path: /var/lib/kubelet/device-plugins
+          type: Directory