Skip to content

Commit 08d98cd

Browse files
committed
add /var/log/ mountPath
fix chart config
1 parent 70b5e24 commit 08d98cd

File tree

4 files changed

+26
-2
lines changed

4 files changed

+26
-2
lines changed
61 Bytes
Binary file not shown.

charts/latest/azurefile-csi-driver/templates/csi-azurefile-node.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,17 @@ spec:
9797
- name: MIGRATE_K8S_REPO
9898
value: "{{ .Values.node.azurefileProxy.migrateK8sRepo }}"
9999
- name: SETUP_MI_AUTH
100-
value: "{{ .Values.node.azurefileProxy.setUpMIAuth }}"
100+
value: "{{ .Values.node.enableManagedIdentityAuth }}"
101101
volumeMounts:
102102
- name: host-usr
103103
mountPath: /host/usr
104104
- name: host-etc
105105
mountPath: /host/etc
106+
{{- if .Values.node.enableManagedIdentityAuth }}
106107
- name: mountpoint-dir
107108
mountPath: /var/lib/kubelet/
108109
mountPropagation: Bidirectional
110+
{{- end }}
109111
containers:
110112
- name: liveness-probe
111113
volumeMounts:
@@ -145,6 +147,7 @@ spec:
145147
- name: registration-dir
146148
mountPath: /registration
147149
resources: {{- toYaml .Values.linux.resources.nodeDriverRegistrar | nindent 12 }}
150+
{{- if .Values.node.enableManagedIdentityAuth }}
148151
- name: azfilesrefresh
149152
{{- if hasPrefix "/" .Values.image.azurefile.repository }}
150153
image: "{{ .Values.image.baseRepo }}{{ .Values.image.azurefile.repository }}:{{ .Values.image.azurefile.tag }}"
@@ -165,7 +168,10 @@ spec:
165168
name: mountpoint-dir
166169
- name: host-etc
167170
mountPath: /etc
171+
- name: log-dir
172+
mountPath: /var/log/
168173
resources: {{- toYaml .Values.linux.resources.azfilesrefresh | nindent 12 }}
174+
{{- end }}
169175
- name: azurefile
170176
{{- if hasPrefix "/" .Values.image.azurefile.repository }}
171177
image: "{{ .Values.image.baseRepo }}{{ .Values.image.azurefile.repository }}:{{ .Values.image.azurefile.tag }}"
@@ -254,6 +260,10 @@ spec:
254260
- mountPath: /run/kata-containers/shared/direct-volumes
255261
name: kata-direct-volumes
256262
{{- end }}
263+
{{- if .Values.node.enableManagedIdentityAuth }}
264+
- name: log-dir
265+
mountPath: /var/log/
266+
{{- end }}
257267
resources: {{- toYaml .Values.linux.resources.azurefile | nindent 12 }}
258268
volumes:
259269
- name: host-usr
@@ -296,4 +306,10 @@ spec:
296306
path: /run/kata-containers/shared/direct-volumes/
297307
type: DirectoryOrCreate
298308
{{- end }}
309+
{{- if .Values.node.enableManagedIdentityAuth }}
310+
- hostPath:
311+
path: /var/log/
312+
type: DirectoryOrCreate
313+
name: log-dir
314+
{{- end }}
299315
{{- end -}}

charts/latest/azurefile-csi-driver/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ node:
127127
allowEmptyCloudConfig: true
128128
allowInlineVolumeKeyAccessWithIdentity: false
129129
enableKataCCMount: false
130+
enableManagedIdentityAuth: true
130131
metricsPort: 29615
131132
livenessProbe:
132133
healthPort: 29613
@@ -135,7 +136,6 @@ node:
135136
enabled: true
136137
installAznfsMount: true
137138
migrateK8sRepo: false
138-
setUpMIAuth: true
139139

140140
snapshot:
141141
enabled: false

deploy/csi-azurefile-node.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ spec:
170170
name: kata-direct-volumes
171171
- name: host-etc
172172
mountPath: /etc
173+
- name: log-dir
174+
mountPath: /var/log/
173175
resources:
174176
limits:
175177
memory: 400Mi
@@ -192,6 +194,8 @@ spec:
192194
name: mountpoint-dir
193195
- name: host-etc
194196
mountPath: /etc
197+
- name: log-dir
198+
mountPath: /var/log/
195199
resources:
196200
limits:
197201
memory: 100Mi
@@ -229,4 +233,8 @@ spec:
229233
hostPath:
230234
path: /run/kata-containers/shared/direct-volumes/
231235
type: DirectoryOrCreate
236+
- hostPath:
237+
path: /var/log/
238+
type: DirectoryOrCreate
239+
name: log-dir
232240
---

0 commit comments

Comments
 (0)