Merge pull request #1719 from andyzhangx/fix-avoidduplicatesslmount-a…

…zurestack fix: avoid duplicate ssl mounts on Redhat in AzureStack environment
kubernetes-sigs · Nov 29, 2024 · 67948df · 67948df
2 parents 590bbd4 + 98897de
commit 67948df
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/latest/blob-csi-driver-v0.0.0.tgz b/charts/latest/blob-csi-driver-v0.0.0.tgz
diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml
@@ -178,7 +178,7 @@ spec:
               name: azcopy-dir
             - mountPath: /etc/kubernetes/
               name: azure-cred
-            {{- if eq .Values.cloud "AzureStackCloud" }}
+            {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
             - name: ssl
               mountPath: /etc/ssl/certs
               readOnly: true
@@ -229,7 +229,7 @@ spec:
           hostPath:
             path: /etc/kubernetes/
             type: DirectoryOrCreate
-        {{- if eq .Values.cloud "AzureStackCloud" }}
+        {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
         - name: ssl
           hostPath:
             path: /etc/ssl/certs

diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml
@@ -238,12 +238,12 @@ spec:
               name: azure-cred
             - mountPath: /mnt
               name: blob-cache
-            {{- if eq .Values.cloud "AzureStackCloud" }}
+            {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
             - name: ssl
               mountPath: /etc/ssl/certs
               readOnly: true
             {{- end }}
-            {{- if eq .Values.linux.distro "fedora" }}
+            {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
             - name: ssl
               mountPath: /etc/ssl/certs
               readOnly: true