Skip to content
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

Jump to bottom

avoid duplicate ssl mounts #2663

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −4
Open

avoid duplicate ssl mounts #2663

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a9d00
avoid duplicate ssl mounts
gulywwx Nov 23, 2024
0f40e66
simplify the expression in one line
gulywwx Nov 23, 2024
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
4 changes: 4 additions & 0 deletions charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,12 @@ spec:
- mountPath: /etc/kubernetes/
name: azure-cred
{{- if eq .Values.cloud "AzureStackCloud" }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}

{{- if ne .Values.linux.distro "fedora" }}
- name: ssl
mountPath: /etc/ssl/certs
readOnly: true
{{- end }}
{{- end }}
{{- if eq .Values.linux.distro "fedora" }}
- name: ssl
mountPath: /etc/ssl/certs
Expand All @@ -318,10 +320,12 @@ spec:
path: /etc/kubernetes/
type: DirectoryOrCreate
{{- if eq .Values.cloud "AzureStackCloud" }}
{{- if ne .Values.linux.distro "fedora" }}
- name: ssl
hostPath:
path: /etc/ssl/certs
{{- end }}
{{- end }}
{{- if eq .Values.linux.distro "fedora" }}
- name: ssl
hostPath:
Expand Down
4 changes: 4 additions & 0 deletions charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,12 @@ spec:
- mountPath: /sys/class/
name: sys-class
{{- if eq .Values.cloud "AzureStackCloud" }}
{{- if ne .Values.linux.distro "fedora" }}
- name: ssl
mountPath: /etc/ssl/certs
readOnly: true
{{- end }}
{{- end }}
{{- if eq .Values.linux.distro "fedora" }}
- name: ssl
mountPath: /etc/ssl/certs
Expand Down Expand Up @@ -255,10 +257,12 @@ spec:
type: Directory
name: sys-class
{{- if eq .Values.cloud "AzureStackCloud" }}
{{- if ne .Values.linux.distro "fedora" }}
- name: ssl
hostPath:
path: /etc/ssl/certs
{{- end }}
{{- end }}
{{- if eq .Values.linux.distro "fedora" }}
- name: ssl
hostPath:
Expand Down
Loading