Skip to content

Commit 3efd350

Browse files
andyzhangxandyzhangx
committed
fix: avoid duplicate ssl mounts on Fedora node in AzureStack environment
1 parent a3a5a57 commit 3efd350

File tree

10 files changed

+14
-38
lines changed

10 files changed

+14
-38
lines changed

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

-24 Bytes
Binary file not shown.

‎charts/v1.24.7/blob-csi-driver/templates/csi-blob-controller.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,12 @@ spec:
194194
name: socket-dir
195195
- mountPath: /etc/kubernetes/
196196
name: azure-cred
197-
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
197+
{{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
198198
- name: ssl
199199
mountPath: /etc/ssl/certs
200200
readOnly: true
201201
{{- end }}
202202
{{- if eq .Values.linux.distro "fedora" }}
203-
- name: ssl
204-
mountPath: /etc/ssl/certs
205-
readOnly: true
206203
- name: ssl-pki
207204
mountPath: /etc/pki/ca-trust/extracted
208205
readOnly: true
@@ -243,15 +240,12 @@ spec:
243240
hostPath:
244241
path: /etc/kubernetes/
245242
type: DirectoryOrCreate
246-
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
243+
{{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
247244
- name: ssl
248245
hostPath:
249246
path: /etc/ssl/certs
250247
{{- end }}
251248
{{- if eq .Values.linux.distro "fedora" }}
252-
- name: ssl
253-
hostPath:
254-
path: /etc/ssl/certs
255249
- name: ssl-pki
256250
hostPath:
257251
path: /etc/pki/ca-trust/extracted

‎charts/v1.24.7/blob-csi-driver/templates/csi-blob-node.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,12 @@ spec:
238238
name: azure-cred
239239
- mountPath: /mnt
240240
name: blob-cache
241-
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
241+
{{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
242242
- name: ssl
243243
mountPath: /etc/ssl/certs
244244
readOnly: true
245245
{{- end }}
246-
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
247-
- name: ssl
248-
mountPath: /etc/ssl/certs
249-
readOnly: true
246+
{{- if eq .Values.linux.distro "fedora" }}
250247
- name: ssl-pki
251248
mountPath: /etc/pki/ca-trust/extracted
252249
readOnly: true
@@ -311,15 +308,12 @@ spec:
311308
- hostPath:
312309
path: {{ .Values.node.blobfuseCachePath }}
313310
name: blob-cache
314-
{{- if eq .Values.cloud "AzureStackCloud" }}
311+
{{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
315312
- name: ssl
316313
hostPath:
317314
path: /etc/ssl/certs
318315
{{- end }}
319316
{{- if eq .Values.linux.distro "fedora" }}
320-
- name: ssl
321-
hostPath:
322-
path: /etc/ssl/certs
323317
- name: ssl-pki
324318
hostPath:
325319
path: /etc/pki/ca-trust/extracted

‎charts/v1.24.7/blob-csi-driver/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ image:
1818
pullPolicy: IfNotPresent
1919
csiResizer:
2020
repository: /oss/kubernetes-csi/csi-resizer
21-
tag: v1.13.1
21+
tag: v1.13.2
2222
pullPolicy: IfNotPresent
2323

2424
cloud: AzurePublicCloud

‎charts/v1.25.3/blob-csi-driver-1.25.3.tgz‎

-23 Bytes
Binary file not shown.

‎charts/v1.25.3/blob-csi-driver/templates/csi-blob-controller.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,15 +196,12 @@ spec:
196196
name: azcopy-dir
197197
- mountPath: /etc/kubernetes/
198198
name: azure-cred
199-
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
199+
{{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
200200
- name: ssl
201201
mountPath: /etc/ssl/certs
202202
readOnly: true
203203
{{- end }}
204204
{{- if eq .Values.linux.distro "fedora" }}
205-
- name: ssl
206-
mountPath: /etc/ssl/certs
207-
readOnly: true
208205
- name: ssl-pki
209206
mountPath: /etc/pki/ca-trust/extracted
210207
readOnly: true
@@ -247,15 +244,12 @@ spec:
247244
hostPath:
248245
path: /etc/kubernetes/
249246
type: DirectoryOrCreate
250-
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
247+
{{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
251248
- name: ssl
252249
hostPath:
253250
path: /etc/ssl/certs
254251
{{- end }}
255252
{{- if eq .Values.linux.distro "fedora" }}
256-
- name: ssl
257-
hostPath:
258-
path: /etc/ssl/certs
259253
- name: ssl-pki
260254
hostPath:
261255
path: /etc/pki/ca-trust/extracted

‎charts/v1.25.3/blob-csi-driver/templates/csi-blob-node.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,12 @@ spec:
238238
name: azure-cred
239239
- mountPath: /mnt
240240
name: blob-cache
241-
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
241+
{{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
242242
- name: ssl
243243
mountPath: /etc/ssl/certs
244244
readOnly: true
245245
{{- end }}
246-
{{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
247-
- name: ssl
248-
mountPath: /etc/ssl/certs
249-
readOnly: true
246+
{{- if eq .Values.linux.distro "fedora" }}
250247
- name: ssl-pki
251248
mountPath: /etc/pki/ca-trust/extracted
252249
readOnly: true
@@ -311,15 +308,12 @@ spec:
311308
- hostPath:
312309
path: {{ .Values.node.blobfuseCachePath }}
313310
name: blob-cache
314-
{{- if eq .Values.cloud "AzureStackCloud" }}
311+
{{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
315312
- name: ssl
316313
hostPath:
317314
path: /etc/ssl/certs
318315
{{- end }}
319316
{{- if eq .Values.linux.distro "fedora" }}
320-
- name: ssl
321-
hostPath:
322-
path: /etc/ssl/certs
323317
- name: ssl-pki
324318
hostPath:
325319
path: /etc/pki/ca-trust/extracted

‎charts/v1.25.3/blob-csi-driver/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ image:
1818
pullPolicy: IfNotPresent
1919
csiResizer:
2020
repository: /oss/kubernetes-csi/csi-resizer
21-
tag: v1.13.1
21+
tag: v1.13.2
2222
pullPolicy: IfNotPresent
2323

2424
cloud: AzurePublicCloud

‎deploy/v1.24.7/csi-blob-controller.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ spec:
136136
drop:
137137
- ALL
138138
- name: csi-resizer
139-
image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.13.1
139+
image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.13.2
140140
args:
141141
- "-csi-address=$(ADDRESS)"
142142
- "-v=2"

‎deploy/v1.25.3/csi-blob-controller.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ spec:
138138
drop:
139139
- ALL
140140
- name: csi-resizer
141-
image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.13.1
141+
image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.13.2
142142
args:
143143
- "-csi-address=$(ADDRESS)"
144144
- "-v=2"

0 commit comments

Comments
 (0)