Merge pull request #1875 from andyzhangx/fix-fedora-azurestack-1.24

[release-1.24] fix: avoid duplicate ssl mounts on Fedora node in AzureStack environment

Author: andyzhangx

charts/README.md

@@ -75,7 +75,7 @@ The following table lists the configurable parameters of the latest Azure Blob S
 | `image.nodeDriverRegistrar.tag`                       | csi-node-driver-registrar docker image tag            | `v2.13.0`                                                      |
 | `image.nodeDriverRegistrar.pullPolicy`                | csi-node-driver-registrar image pull policy           | `IfNotPresent`                                                   |
 | `image.csiResizer.repository`                         | csi-resizer docker image                              | `mcr.microsoft.com/oss/kubernetes-csi/csi-resizer`               |
-| `image.csiResizer.tag`                                | csi-resizer docker image tag                          | `v1.13.1`                                                         |
+| `image.csiResizer.tag`                                | csi-resizer docker image tag                          | `v1.13.2`                                                         |
 | `image.csiResizer.pullPolicy`                         | csi-resizer image pull policy                         | `IfNotPresent`                                                   |
 | `imagePullSecrets`                                    | Specify docker-registry secret names as an array      | [] (does not add image pull secrets to deployed pods)          |
 | `cloud`                                               | the cloud environment the driver is running on        | `AzurePublicCloud`                                               |

charts/latest/blob-csi-driver-v1.24.7.tgz

@@ -194,15 +194,12 @@ spec:
               name: socket-dir
             - mountPath: /etc/kubernetes/
               name: azure-cred
-            {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
+            {{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
             - name: ssl
               mountPath: /etc/ssl/certs
               readOnly: true
             {{- end }}
             {{- if eq .Values.linux.distro "fedora" }}
-            - name: ssl
-              mountPath: /etc/ssl/certs
-              readOnly: true
             - name: ssl-pki
               mountPath: /etc/pki/ca-trust/extracted
               readOnly: true
@@ -243,15 +240,12 @@ spec:
           hostPath:
             path: /etc/kubernetes/
             type: DirectoryOrCreate
-        {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
+        {{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
         - name: ssl
           hostPath:
             path: /etc/ssl/certs
         {{- end }}
         {{- if eq .Values.linux.distro "fedora" }}
-        - name: ssl
-          hostPath:
-            path: /etc/ssl/certs
         - name: ssl-pki
           hostPath:
             path: /etc/pki/ca-trust/extracted

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

@@ -238,15 +238,12 @@ spec:
               name: azure-cred
             - mountPath: /mnt
               name: blob-cache
-            {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
+            {{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
             - name: ssl
               mountPath: /etc/ssl/certs
               readOnly: true
             {{- end }}
-            {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
-            - name: ssl
-              mountPath: /etc/ssl/certs
-              readOnly: true
+           {{- if eq .Values.linux.distro "fedora" }}
             - name: ssl-pki
               mountPath: /etc/pki/ca-trust/extracted
               readOnly: true
@@ -311,15 +308,12 @@ spec:
         - hostPath:
             path: {{ .Values.node.blobfuseCachePath }}
           name: blob-cache
-        {{- if eq .Values.cloud "AzureStackCloud" }}
+        {{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
         - name: ssl
           hostPath:
             path: /etc/ssl/certs
         {{- end }}
         {{- if eq .Values.linux.distro "fedora" }}
-        - name: ssl
-          hostPath:
-            path: /etc/ssl/certs
         - name: ssl-pki
           hostPath:
             path: /etc/pki/ca-trust/extracted

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

@@ -18,7 +18,7 @@ image:
     pullPolicy: IfNotPresent
   csiResizer:
     repository: /oss/kubernetes-csi/csi-resizer
-    tag: v1.13.1
+    tag: v1.13.2
     pullPolicy: IfNotPresent
 
 cloud: AzurePublicCloud

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

@@ -136,7 +136,7 @@ spec:
               drop:
                 - ALL
         - name: csi-resizer
-          image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.13.1
+          image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.13.2
           args:
             - "-csi-address=$(ADDRESS)"
             - "-v=2"