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

…zurestack-1.23 [release-1.23] fix: avoid duplicate ssl mounts on Redhat in AzureStack environment
kubernetes-sigs · Nov 29, 2024 · da2b6a9 · da2b6a9
2 parents 0ca7f7e + 2dd4fac
commit da2b6a9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/charts/latest/blob-csi-driver-v1.23.9.tgz b/charts/latest/blob-csi-driver-v1.23.9.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
@@ -165,7 +165,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
@@ -216,7 +216,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
@@ -102,6 +102,8 @@ spec:
               value: "{{ .Values.node.blobfuseProxy.disableUpdateDB }}"
             - name: MIGRATE_K8S_REPO
               value: "{{ .Values.node.blobfuseProxy.migrateK8sRepo }}"
+            - name: SET_READ_AHEAD_SIZE
+              value: "{{ .Values.node.blobfuseProxy.setReadAheadSize }}"
           volumeMounts:
             - name: host-usr
               mountPath: /host/usr
@@ -233,12 +235,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

diff --git a/charts/latest/blob-csi-driver/values.yaml b/charts/latest/blob-csi-driver/values.yaml
@@ -127,6 +127,7 @@ node:
     maxOpenFileNum: "9000000"
     disableUpdateDB: true
     migrateK8sRepo: false
+    setReadAheadSize: true
   blobfuseCachePath: /mnt
   appendTimeStampInCacheDir: false
   mountPermissions: 0777