From 6c8e86342eb1b368e428056b27e4fef2824ff90c Mon Sep 17 00:00:00 2001
From: Travis Glenn Hansen <travisghansen@yahoo.com>
Date: Fri, 28 Jul 2023 07:05:03 -0600
Subject: [PATCH] support containerd 1.7+ with windows host process

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
---
 CHANGELOG.md                                      | 6 ++++++
 stable/democratic-csi/Chart.yaml                  | 2 +-
 stable/democratic-csi/templates/_helpers.tpl      | 5 +++++
 stable/democratic-csi/templates/node-windows.yaml | 9 +++++++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b63d2e1..bef4531 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.14.1
+
+Released 2023-07-16
+
+- support changes to containerd 1.7+ with windows host process
+
 # 0.14.0
 
 Released 2023-07-16
diff --git a/stable/democratic-csi/Chart.yaml b/stable/democratic-csi/Chart.yaml
index c6c55cf..0daf423 100644
--- a/stable/democratic-csi/Chart.yaml
+++ b/stable/democratic-csi/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: csi storage for container orchestration systems
 name: democratic-csi
-version: 0.14.0
+version: 0.14.1
diff --git a/stable/democratic-csi/templates/_helpers.tpl b/stable/democratic-csi/templates/_helpers.tpl
index db5ee4e..d2f5f4d 100644
--- a/stable/democratic-csi/templates/_helpers.tpl
+++ b/stable/democratic-csi/templates/_helpers.tpl
@@ -233,6 +233,11 @@ Create chart name and version as used by the chart label.
 {{- $root := . -}}
 - name: csi-proxy
   image: {{ .Values.csiProxy.image }}
+  {{- if eq $windows "1" }}
+  workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/app"
+  command:
+  - "$env:CONTAINER_SANDBOX_MOUNT_POINT/app/bin/csi-grpc-proxy.exe"
+  {{- end }}
   {{- if .Values.csiProxy.resources }}
   resources:
 {{ toYaml .Values.csiProxy.resources | indent 4 }}
diff --git a/stable/democratic-csi/templates/node-windows.yaml b/stable/democratic-csi/templates/node-windows.yaml
index d6b0ebc..b351fc8 100644
--- a/stable/democratic-csi/templates/node-windows.yaml
+++ b/stable/democratic-csi/templates/node-windows.yaml
@@ -84,6 +84,11 @@ spec:
       {{- if .Values.node.driver.enabled }}
       - name: csi-driver
         image: {{ .Values.node.driver.image }}
+        workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/app"
+        command:
+        - "$env:CONTAINER_SANDBOX_MOUNT_POINT/app/bin/node.exe"
+        - "--expose-gc"
+        - "$env:CONTAINER_SANDBOX_MOUNT_POINT/app/bin/democratic-csi"
         {{- if .Values.node.driver.imagePullPolicy }}
         imagePullPolicy: {{ .Values.node.driver.imagePullPolicy }}
         {{- end }}
@@ -127,9 +132,9 @@ spec:
           failureThreshold: 3
           exec:
             command:
-            - bin/node.exe
+            - "$env:CONTAINER_SANDBOX_MOUNT_POINT/app/bin/node.exe"
             - --expose-gc
-            - bin/liveness-probe
+            - "$env:CONTAINER_SANDBOX_MOUNT_POINT/app/bin/liveness-probe"
             - --csi-version={{ .Values.csiDriver.version }}
             - --csi-address={{ $csiPipeAddress }}
           initialDelaySeconds: 10