Skip to content

Commit c53028e

Browse files
authored
Merge pull request #1155 from cvvz/deploy-aznfs
chore: support deploy aznfs mount helper in v1.22 and v1.23
2 parents d1feb68 + 9633cc2 commit c53028e

File tree

2 files changed

+66
-0
lines changed

2 files changed

+66
-0
lines changed

deploy/v1.22.4/csi-blob-node.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ spec:
127127
- "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
128128
- "--nodeid=$(KUBE_NODE_NAME)"
129129
- "--user-agent-suffix=OSS-kubectl"
130+
- "--enable-aznfs-mount=true"
130131
ports:
131132
- containerPort: 29633
132133
name: healthz
@@ -167,12 +168,36 @@ spec:
167168
name: azure-cred
168169
- mountPath: /mnt
169170
name: blob-cache
171+
- mountPath: /opt/microsoft/aznfs/data
172+
name: aznfs-data
173+
- mountPath: /lib/modules
174+
name: lib-modules
175+
readOnly: true
170176
resources:
171177
limits:
172178
memory: 2100Mi
173179
requests:
174180
cpu: 10m
175181
memory: 20Mi
182+
- name: aznfswatchdog
183+
image: mcr.microsoft.com/k8s/csi/blob-csi:latest
184+
command:
185+
- "aznfswatchdog"
186+
imagePullPolicy: IfNotPresent
187+
securityContext:
188+
privileged: true
189+
resources:
190+
limits:
191+
memory: 100Mi
192+
requests:
193+
cpu: 10m
194+
memory: 20Mi
195+
volumeMounts:
196+
- mountPath: /opt/microsoft/aznfs/data
197+
name: aznfs-data
198+
- mountPath: /var/lib/kubelet/
199+
mountPropagation: Bidirectional
200+
name: mountpoint-dir
176201
volumes:
177202
- name: host-usr
178203
hostPath:
@@ -200,4 +225,12 @@ spec:
200225
path: /mnt
201226
type: DirectoryOrCreate
202227
name: blob-cache
228+
- hostPath:
229+
path: /opt/microsoft/aznfs/data
230+
type: DirectoryOrCreate
231+
name: aznfs-data
232+
- name: lib-modules
233+
hostPath:
234+
path: /lib/modules
235+
type: DirectoryOrCreate
203236
---

deploy/v1.23.2/csi-blob-node.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ spec:
129129
- "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
130130
- "--nodeid=$(KUBE_NODE_NAME)"
131131
- "--user-agent-suffix=OSS-kubectl"
132+
- "--enable-aznfs-mount=true"
132133
ports:
133134
- containerPort: 29633
134135
name: healthz
@@ -169,12 +170,36 @@ spec:
169170
name: azure-cred
170171
- mountPath: /mnt
171172
name: blob-cache
173+
- mountPath: /opt/microsoft/aznfs/data
174+
name: aznfs-data
175+
- mountPath: /lib/modules
176+
name: lib-modules
177+
readOnly: true
172178
resources:
173179
limits:
174180
memory: 2100Mi
175181
requests:
176182
cpu: 10m
177183
memory: 20Mi
184+
- name: aznfswatchdog
185+
image: mcr.microsoft.com/k8s/csi/blob-csi:latest
186+
command:
187+
- "aznfswatchdog"
188+
imagePullPolicy: IfNotPresent
189+
securityContext:
190+
privileged: true
191+
resources:
192+
limits:
193+
memory: 100Mi
194+
requests:
195+
cpu: 10m
196+
memory: 20Mi
197+
volumeMounts:
198+
- mountPath: /opt/microsoft/aznfs/data
199+
name: aznfs-data
200+
- mountPath: /var/lib/kubelet/
201+
mountPropagation: Bidirectional
202+
name: mountpoint-dir
178203
volumes:
179204
- name: host-usr
180205
hostPath:
@@ -205,4 +230,12 @@ spec:
205230
path: /mnt
206231
type: DirectoryOrCreate
207232
name: blob-cache
233+
- hostPath:
234+
path: /opt/microsoft/aznfs/data
235+
type: DirectoryOrCreate
236+
name: aznfs-data
237+
- name: lib-modules
238+
hostPath:
239+
path: /lib/modules
240+
type: DirectoryOrCreate
208241
---

0 commit comments

Comments
 (0)