Skip to content

Commit 67948df

Browse files
authored
Merge pull request #1719 from andyzhangx/fix-avoidduplicatesslmount-azurestack
fix: avoid duplicate ssl mounts on Redhat in AzureStack environment
2 parents 590bbd4 + 98897de commit 67948df

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed
27 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
@@ -178,7 +178,7 @@ spec:
178178
name: azcopy-dir
179179
- mountPath: /etc/kubernetes/
180180
name: azure-cred
181-
{{- if eq .Values.cloud "AzureStackCloud" }}
181+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
182182
- name: ssl
183183
mountPath: /etc/ssl/certs
184184
readOnly: true
@@ -229,7 +229,7 @@ spec:
229229
hostPath:
230230
path: /etc/kubernetes/
231231
type: DirectoryOrCreate
232-
{{- if eq .Values.cloud "AzureStackCloud" }}
232+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
233233
- name: ssl
234234
hostPath:
235235
path: /etc/ssl/certs

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,12 @@ spec:
238238
name: azure-cred
239239
- mountPath: /mnt
240240
name: blob-cache
241-
{{- if eq .Values.cloud "AzureStackCloud" }}
241+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
242242
- name: ssl
243243
mountPath: /etc/ssl/certs
244244
readOnly: true
245245
{{- end }}
246-
{{- if eq .Values.linux.distro "fedora" }}
246+
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
247247
- name: ssl
248248
mountPath: /etc/ssl/certs
249249
readOnly: true

0 commit comments

Comments
 (0)