Skip to content

Commit e3aa41e

Browse files
committed
feat: add customize tolerations support
fix yaml config
1 parent 97b600d commit e3aa41e

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed
-11 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,8 @@ spec:
4040
{{ toYaml . | indent 8 }}
4141
{{- end }}
4242
priorityClassName: {{ .Values.priorityClassName | quote }}
43-
tolerations:
44-
- key: "node-role.kubernetes.io/master"
45-
operator: "Equal"
46-
value: "true"
47-
effect: "NoSchedule"
48-
- key: "node-role.kubernetes.io/controlplane"
49-
operator: "Equal"
50-
value: "true"
51-
effect: "NoSchedule"
5243
{{- with .Values.controller.tolerations }}
44+
tolerations:
5345
{{ toYaml . | indent 8 }}
5446
{{- end }}
5547
containers:

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,10 @@ spec:
4545
{{- toYaml .Values.node.affinity | nindent 8 }}
4646
{{- end }}
4747
priorityClassName: {{ .Values.priorityClassName | quote }}
48+
{{- with .Values.node.tolerations }}
4849
tolerations:
49-
- operator: "Exists"
50-
{{- if .Values.node.tolerations }}
51-
{{- toYaml .Values.node.tolerations | nindent 8 }}
52-
{{- end }}
50+
{{ toYaml . | indent 8 }}
51+
{{- end }}
5352
containers:
5453
- name: liveness-probe
5554
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,15 @@ controller:
6767
memory: 20Mi
6868
affinity: {}
6969
nodeSelector: {}
70-
tolerations: []
70+
tolerations:
71+
- key: "node-role.kubernetes.io/master"
72+
operator: "Equal"
73+
value: "true"
74+
effect: "NoSchedule"
75+
- key: "node-role.kubernetes.io/controlplane"
76+
operator: "Equal"
77+
value: "true"
78+
effect: "NoSchedule"
7179

7280
node:
7381
metricsPort: 29635
@@ -98,7 +106,8 @@ node:
98106
memory: 20Mi
99107
affinity: {}
100108
nodeSelector: {}
101-
tolerations: []
109+
tolerations:
110+
- operator: "Exists"
102111
livenessProbe:
103112
healthPort: 29633
104113

0 commit comments

Comments
 (0)