Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 9, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
Binary file modified charts/latest/blob-csi-driver-1.25.3.tgz
View file
Open in desktop
Binary file not shown.
10 changes: 2 additions & 8 deletions charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,12 @@ spec:
name: azcopy-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
Expand Down Expand Up @@ -247,15 +244,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
Expand Down
12 changes: 3 additions & 9 deletions charts/latest/blob-csi-driver/templates/csi-blob-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/latest/blob-csi-driver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deploy/csi-blob-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,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"
Expand Down
Loading