Skip to content

Commit 7a2d559

Browse files
committed
fix: refine deployment config to support sel setup k8s cluster
fix yaml lint
1 parent 90bd3e7 commit 7a2d559

8 files changed

+9
-29
lines changed
-51 Bytes
Binary file not shown.

charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ spec:
129129
name: socket-dir
130130
- mountPath: /etc/kubernetes/
131131
name: azure-cred
132-
- mountPath: /var/lib/waagent/ManagedIdentity-Settings
133-
readOnly: true
134-
name: msi
135132
{{- if eq .Values.cloud "AzureStackCloud" }}
136133
- name: ssl
137134
mountPath: /etc/ssl/certs
@@ -171,10 +168,7 @@ spec:
171168
- name: azure-cred
172169
hostPath:
173170
path: /etc/kubernetes/
174-
type: Directory
175-
- name: msi
176-
hostPath:
177-
path: /var/lib/waagent/ManagedIdentity-Settings
171+
type: DirectoryOrCreate
178172
{{- if eq .Values.cloud "AzureStackCloud" }}
179173
- name: ssl
180174
hostPath:

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,6 @@ spec:
156156
name: mountpoint-dir
157157
- mountPath: /etc/kubernetes/
158158
name: azure-cred
159-
- mountPath: /var/lib/waagent/ManagedIdentity-Settings
160-
readOnly: true
161-
name: msi
162159
- mountPath: /mnt
163160
name: blob-cache
164161
{{- if eq .Values.cloud "AzureStackCloud" }}
@@ -190,11 +187,8 @@ spec:
190187
name: registration-dir
191188
- hostPath:
192189
path: /etc/kubernetes/
193-
type: Directory
190+
type: DirectoryOrCreate
194191
name: azure-cred
195-
- hostPath:
196-
path: /var/lib/waagent/ManagedIdentity-Settings
197-
name: msi
198192
- hostPath:
199193
path: {{ .Values.node.blobfuseCachePath }}
200194
name: blob-cache

deploy/csi-blob-controller.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ spec:
101101
name: socket-dir
102102
- mountPath: /etc/kubernetes/
103103
name: azure-cred
104-
- mountPath: /var/lib/waagent/ManagedIdentity-Settings
105-
readOnly: true
106-
name: msi
107104
resources:
108105
limits:
109106
cpu: 200m
@@ -137,7 +134,4 @@ spec:
137134
- name: azure-cred
138135
hostPath:
139136
path: /etc/kubernetes/
140-
type: Directory
141-
- name: msi
142-
hostPath:
143-
path: /var/lib/waagent/ManagedIdentity-Settings
137+
type: DirectoryOrCreate

deploy/csi-blob-node.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@ spec:
128128
name: mountpoint-dir
129129
- mountPath: /etc/kubernetes/
130130
name: azure-cred
131-
- mountPath: /var/lib/waagent/ManagedIdentity-Settings
132-
readOnly: true
133-
name: msi
134131
- mountPath: /mnt
135132
name: blob-cache
136133
resources:
@@ -155,12 +152,10 @@ spec:
155152
name: registration-dir
156153
- hostPath:
157154
path: /etc/kubernetes/
158-
type: Directory
155+
type: DirectoryOrCreate
159156
name: azure-cred
160-
- hostPath:
161-
path: /var/lib/waagent/ManagedIdentity-Settings
162-
name: msi
163157
- hostPath:
164158
path: /mnt
159+
type: DirectoryOrCreate
165160
name: blob-cache
166161
---

deploy/example/storageclass-blobfuse-existing-container.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ mountOptions:
1919
- -o attr_timeout=120
2020
- -o entry_timeout=120
2121
- -o negative_timeout=120
22+
- --cache-size-mb=1000 # Default will be 80% of available memory, eviction will happen beyond that.

deploy/example/storageclass-blobfuse-readonly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ mountOptions:
1515
- -o allow_other
1616
- --file-cache-timeout-in-seconds=0
1717
- --cancel-list-on-mount-seconds=60 # prevent billing charges on mounting
18-
- --log-level=LOG_DEBUG # only for debugging
18+
- --log-level=LOG_DEBUG # LOG_WARNING, LOG_INFO, LOG_DEBUG

deploy/example/storageclass-blobfuse.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ mountOptions:
1616
- -o attr_timeout=120
1717
- -o entry_timeout=120
1818
- -o negative_timeout=120
19+
- --log-level=LOG_WARNING # LOG_WARNING, LOG_INFO, LOG_DEBUG
20+
- --cache-size-mb=1000 # Default will be 80% of available memory, eviction will happen beyond that.

0 commit comments

Comments
 (0)