support containerd 1.7+ with windows host process

Signed-off-by: Travis Glenn Hansen <[email protected]>
democratic-csi · Jul 28, 2023 · 6c8e863 · 6c8e863
1 parent 66c7371
commit 6c8e863
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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