Skip to content

Commit 23166fd

Browse files
authored
Merge pull request #1721 from andyzhangx/fix-avoidduplicatesslmount-azurestack-1.24
[release-1.24] fix: avoid duplicate ssl mounts on Redhat in AzureStack environment
2 parents 602858c + 131719d commit 23166fd

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed
249 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
@@ -176,7 +176,7 @@ spec:
176176
name: socket-dir
177177
- mountPath: /etc/kubernetes/
178178
name: azure-cred
179-
{{- if eq .Values.cloud "AzureStackCloud" }}
179+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
180180
- name: ssl
181181
mountPath: /etc/ssl/certs
182182
readOnly: true
@@ -225,7 +225,7 @@ spec:
225225
hostPath:
226226
path: /etc/kubernetes/
227227
type: DirectoryOrCreate
228-
{{- if eq .Values.cloud "AzureStackCloud" }}
228+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
229229
- name: ssl
230230
hostPath:
231231
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
@@ -104,6 +104,8 @@ spec:
104104
value: "{{ .Values.linux.kubelet }}"
105105
- name: MIGRATE_K8S_REPO
106106
value: "{{ .Values.node.blobfuseProxy.migrateK8sRepo }}"
107+
- name: SET_READ_AHEAD_SIZE
108+
value: "{{ .Values.node.blobfuseProxy.setReadAheadSize }}"
107109
volumeMounts:
108110
- name: host-usr
109111
mountPath: /host/usr
@@ -236,12 +238,12 @@ spec:
236238
name: azure-cred
237239
- mountPath: /mnt
238240
name: blob-cache
239-
{{- if eq .Values.cloud "AzureStackCloud" }}
241+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
240242
- name: ssl
241243
mountPath: /etc/ssl/certs
242244
readOnly: true
243245
{{- end }}
244-
{{- if eq .Values.linux.distro "fedora" }}
246+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
245247
- name: ssl
246248
mountPath: /etc/ssl/certs
247249
readOnly: true

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

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

0 commit comments

Comments
 (0)