From 798fee055cbd3786c1f266f1277752608176a7d4 Mon Sep 17 00:00:00 2001
From: SergioGabeteSysdig
 <108256093+SergioGabeteSysdig@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:44:29 +0200
Subject: [PATCH] feat(node-analyzer): Change Bottlerocket apiclient and socket
 volume mounts to ignore non existent files (#1797)

---
 charts/node-analyzer/Chart.yaml                           | 2 +-
 .../node-analyzer/templates/daemonset-node-analyzer.yaml  | 4 ++--
 charts/node-analyzer/tests/botllerocket_test.yaml         | 8 ++++----
 charts/sysdig-deploy/Chart.yaml                           | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charts/node-analyzer/Chart.yaml b/charts/node-analyzer/Chart.yaml
index 3258d5c3a..2d039d46e 100644
--- a/charts/node-analyzer/Chart.yaml
+++ b/charts/node-analyzer/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: node-analyzer
 description: Sysdig Node Analyzer
 # currently matching Sysdig's appVersion 1.14.34
-version: 1.29.6
+version: 1.29.7
 appVersion: 12.9.0
 
 keywords:
diff --git a/charts/node-analyzer/templates/daemonset-node-analyzer.yaml b/charts/node-analyzer/templates/daemonset-node-analyzer.yaml
index d0d15ef95..2c96da8b4 100644
--- a/charts/node-analyzer/templates/daemonset-node-analyzer.yaml
+++ b/charts/node-analyzer/templates/daemonset-node-analyzer.yaml
@@ -96,11 +96,11 @@ spec:
         - name: apiclient
           hostPath:
             path: {{ .Values.nodeAnalyzer.bottlerocket.apiClientPath }}
-            type: File
+            type: ""
         - name: apiserver-socket
           hostPath:
             path: {{ .Values.nodeAnalyzer.bottlerocket.apiServerSocketPath }}
-            type: Socket
+            type: ""
         {{- end }}
         - name: tmp-vol
           {{- if .Values.nodeAnalyzer.runtimeScanner.storageClassName }}
diff --git a/charts/node-analyzer/tests/botllerocket_test.yaml b/charts/node-analyzer/tests/botllerocket_test.yaml
index 91b5c160f..7cbf348d4 100644
--- a/charts/node-analyzer/tests/botllerocket_test.yaml
+++ b/charts/node-analyzer/tests/botllerocket_test.yaml
@@ -32,7 +32,7 @@ tests:
             name: apiclient
             hostPath:
               path: /usr/bin/apiclient
-              type: File
+              type: ""
           count: 1
           any: true
         template: templates/daemonset-node-analyzer.yaml
@@ -42,7 +42,7 @@ tests:
             name: apiserver-socket
             hostPath:
               path: /run/api.sock
-              type: Socket
+              type: ""
           count: 1
           any: true
         template: templates/daemonset-node-analyzer.yaml
@@ -80,7 +80,7 @@ tests:
             name: apiclient
             hostPath:
               path: /usr/bin/apiclient
-              type: File
+              type: ""
         template: templates/daemonset-node-analyzer.yaml
       - notContains:
           path: spec.template.spec.volumes
@@ -88,7 +88,7 @@ tests:
             name: apiserver-socket
             hostPath:
               path: /run/api.sock
-              type: Socket
+              type: ""
         template: templates/daemonset-node-analyzer.yaml
       - notContains:
           path: spec.template.spec.containers[0].volumeMounts
diff --git a/charts/sysdig-deploy/Chart.yaml b/charts/sysdig-deploy/Chart.yaml
index 00ac00026..672bd79d8 100644
--- a/charts/sysdig-deploy/Chart.yaml
+++ b/charts/sysdig-deploy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sysdig-deploy
 description: A chart with various Sysdig components for Kubernetes
 type: application
-version: 1.57.2
+version: 1.57.3
 maintainers:
   - name: AlbertoBarba
     email: alberto.barba@sysdig.com
@@ -36,7 +36,7 @@ dependencies:
   - name: node-analyzer
     # repository: https://charts.sysdig.com
     repository: file://../node-analyzer
-    version: ~1.29.6
+    version: ~1.29.7
     alias: nodeAnalyzer
     condition: nodeAnalyzer.enabled
   - name: cluster-scanner