Skip to content

Commit da2b6a9

Browse files
authored
Merge pull request #1722 from andyzhangx/fix-avoidduplicatesslmount-azurestack-1.23
[release-1.23] fix: avoid duplicate ssl mounts on Redhat in AzureStack environment
2 parents 0ca7f7e + 2dd4fac commit da2b6a9

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed
-196 Bytes
Binary file not shown.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ spec:
165165
name: azcopy-dir
166166
- mountPath: /etc/kubernetes/
167167
name: azure-cred
168-
{{- if eq .Values.cloud "AzureStackCloud" }}
168+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
169169
- name: ssl
170170
mountPath: /etc/ssl/certs
171171
readOnly: true
@@ -216,7 +216,7 @@ spec:
216216
hostPath:
217217
path: /etc/kubernetes/
218218
type: DirectoryOrCreate
219-
{{- if eq .Values.cloud "AzureStackCloud" }}
219+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
220220
- name: ssl
221221
hostPath:
222222
path: /etc/ssl/certs

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ spec:
102102
value: "{{ .Values.node.blobfuseProxy.disableUpdateDB }}"
103103
- name: MIGRATE_K8S_REPO
104104
value: "{{ .Values.node.blobfuseProxy.migrateK8sRepo }}"
105+
- name: SET_READ_AHEAD_SIZE
106+
value: "{{ .Values.node.blobfuseProxy.setReadAheadSize }}"
105107
volumeMounts:
106108
- name: host-usr
107109
mountPath: /host/usr
@@ -233,12 +235,12 @@ spec:
233235
name: azure-cred
234236
- mountPath: /mnt
235237
name: blob-cache
236-
{{- if eq .Values.cloud "AzureStackCloud" }}
238+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
237239
- name: ssl
238240
mountPath: /etc/ssl/certs
239241
readOnly: true
240242
{{- end }}
241-
{{- if eq .Values.linux.distro "fedora" }}
243+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
242244
- name: ssl
243245
mountPath: /etc/ssl/certs
244246
readOnly: true

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ node:
127127
maxOpenFileNum: "9000000"
128128
disableUpdateDB: true
129129
migrateK8sRepo: false
130+
setReadAheadSize: true
130131
blobfuseCachePath: /mnt
131132
appendTimeStampInCacheDir: false
132133
mountPermissions: 0777

0 commit comments

Comments
 (0)