fix linter issue and update deployments

kubernetes-sigs · Feb 13, 2024 · 9ccf1d8 · 9ccf1d8
1 parent 7e36011
commit 9ccf1d8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/deployment/components/common/worker-mounts.yaml b/deployment/components/common/worker-mounts.yaml
@@ -4,6 +4,9 @@
   - name: host-boot
     hostPath:
       path: "/boot"
+  - name: host-swap
+    hostPath:
+      path: "/proc/swaps"
   - name: host-os-release
     hostPath:
       path: "/etc/os-release"
@@ -38,6 +41,9 @@
   - name: host-sys
     mountPath: "/host-sys"
     readOnly: true
+  - name: host-swaps
+    mountPath: "/host-swaps"
+    readOnly: true
   - name: host-usr-lib
     mountPath: "/host-usr/lib"
     readOnly: true

diff --git a/deployment/helm/node-feature-discovery/templates/worker.yaml b/deployment/helm/node-feature-discovery/templates/worker.yaml
@@ -122,6 +122,9 @@ spec:
         - name: host-lib
           hostPath:
             path: "/lib"
+        - name: host-proc-swap
+          hostPath:
+            path: "/proc/swaps"
         {{- if .Values.worker.mountUsrSrc }}
         - name: host-usr-src
           hostPath:

diff --git a/source/memory/memory.go b/source/memory/memory.go
@@ -133,7 +133,10 @@ func (s *memorySource) GetFeatures() *nfdv1alpha1.Features {
 func detectSwap() (map[string]string, error) {
 	procBasePath := hostpath.ProcDir.Path("swaps")
 	file, err := os.Open(procBasePath)
-	defer file.Close()
+	defer func() error {
+		err = file.Close()
+		return err
+	}()
 	if err != nil {
 		return nil, err
 	}