Fix for istio#46163 - Make netns host node path configurable (istio…

…#47444) * Fix for istio#46163 Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io> * Release notes Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io> --------- Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io>
WillardHu · Oct 19, 2023 · 7e7d52a · 7e7d52a
1 parent e7bbb97
commit 7e7d52a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/manifests/charts/istio-cni/templates/daemonset.yaml b/manifests/charts/istio-cni/templates/daemonset.yaml
@@ -202,7 +202,9 @@ spec:
             path: /var/run/istio-cni
         - name: cni-netns-dir
           hostPath:
-            path: /var/run/netns
+            path: {{ .Values.cniNetnsDir | default "/var/run/netns" }}
+            type: Directory # this directory must exist on the node, if it does not,
+            # consult your container runtime documentation for the appropriate path
         {{- if eq .Values.cni.ambient.redirectMode "ebpf"}}
         - name: cni-bpffs-dir
           hostPath:

diff --git a/manifests/charts/istio-cni/values.yaml b/manifests/charts/istio-cni/values.yaml
@@ -20,6 +20,10 @@ cni:
   cniBinDir: "" # Auto-detected based on version; defaults to /opt/cni/bin.
   cniConfDir: /etc/cni/net.d
   cniConfFileName: ""
+  # This directory must exist on the node, if it does not, consult your container runtime
+  # documentation for the appropriate path.
+  cniNetnsDir: # Defaults to '/var/run/netns', in minikube/docker/others can be '/run/docker/netns'.
+
 
   excludeNamespaces:
     - istio-system

diff --git a/releasenotes/notes/47444.yaml b/releasenotes/notes/47444.yaml
@@ -0,0 +1,8 @@
+apiVersion: release-notes/v2
+kind: bug-fix
+area: traffic-management
+issue:
+  - 47444
+releaseNotes:
+- |
+  **Added** Support alternate network namespace paths (for e.g. minikube) via `values.cni.cniNetnsDir`