From d3b463f884af4cfa85825bffabe068fe14533e10 Mon Sep 17 00:00:00 2001
From: Fabian Zimmermann <dev.faz@gmail.com>
Date: Fri, 23 Feb 2024 14:12:01 +0100
Subject: [PATCH] use directory-mapping instead of simple
 containerd.socket-file-mapping to allow falco to reconnect if containerd got
 restarted on host

Fixes #632

Signed-off-by: Fabian Zimmermann <dev.faz@gmail.com>
---
 charts/falco/CHANGELOG.md               | 4 ++++
 charts/falco/Chart.yaml                 | 2 +-
 charts/falco/templates/pod-template.tpl | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/charts/falco/CHANGELOG.md b/charts/falco/CHANGELOG.md
index 1e87c6cf5..27eac1f07 100644
--- a/charts/falco/CHANGELOG.md
+++ b/charts/falco/CHANGELOG.md
@@ -3,6 +3,10 @@
 This file documents all notable changes to Falco Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
+## v4.2.3
+
+* falco is now able to reconnect to containerd.socket
+
 ## v4.2.2
 
 * fix(falco/README): dead link
diff --git a/charts/falco/Chart.yaml b/charts/falco/Chart.yaml
index cc96dce8a..5e81dcc31 100644
--- a/charts/falco/Chart.yaml
+++ b/charts/falco/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: falco
-version: 4.2.2
+version: 4.2.3
 appVersion: "0.37.1"
 description: Falco
 keywords:
diff --git a/charts/falco/templates/pod-template.tpl b/charts/falco/templates/pod-template.tpl
index 5eb572886..8fbcc811b 100644
--- a/charts/falco/templates/pod-template.tpl
+++ b/charts/falco/templates/pod-template.tpl
@@ -65,7 +65,7 @@ spec:
         {{- if .enabled }}
         {{- if .containerd.enabled }}
         - --cri
-        - /run/containerd/containerd.sock
+        - /run/containerd/{{ base .containerd.socket }}
         {{- end }}
         {{- if .crio.enabled }}
         - --cri
@@ -159,7 +159,7 @@ spec:
           name: docker-socket
         {{- end }}
         {{- if .containerd.enabled }}
-        - mountPath: /host/run/containerd/containerd.sock
+        - mountPath: /host/run/containerd/
           name: containerd-socket
         {{- end }}
         {{- if .crio.enabled }}
@@ -262,7 +262,7 @@ spec:
     {{- if .containerd.enabled }}
     - name: containerd-socket
       hostPath:
-        path: {{ .containerd.socket }}
+        path: {{ dir .containerd.socket }}
     {{- end }}
     {{- if .crio.enabled }}
     - name: crio-socket