Skip to content

Commit 5448f1f

Browse files
committed
feat(chart): Split priorityClassName for controller and node daemonset
BREAKING CHANGE: Move priorityClassName from a top-level value to a controller/node specific value, so the controller can be system-cluster-critical and the node ds system-node-critical
1 parent d87deab commit 5448f1f

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

charts/cloudstack-csi/templates/csi-controller-deploy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ spec:
208208
hostAliases:
209209
{{- toYaml . | nindent 8 }}
210210
{{- end }}
211-
{{- if .Values.priorityClassName }}
212-
priorityClassName: {{ .Values.priorityClassName }}
211+
{{- if .Values.controller.priorityClassName }}
212+
priorityClassName: {{ .Values.controller.priorityClassName }}
213213
{{- end }}
214214
{{- with .Values.imagePullSecrets }}
215215
imagePullSecrets:

charts/cloudstack-csi/templates/csi-node-ds.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ spec:
174174
hostAliases:
175175
{{- toYaml . | nindent 8 }}
176176
{{- end }}
177-
{{- if .Values.priorityClassName }}
178-
priorityClassName: {{ .Values.priorityClassName }}
177+
{{- if .Values.node.priorityClassName }}
178+
priorityClassName: {{ .Values.node.priorityClassName }}
179179
{{- end }}
180180
{{- with .Values.imagePullSecrets }}
181181
imagePullSecrets:

charts/cloudstack-csi/values.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ controller:
6666
# maxSurge is the maximum number of pods that can be
6767
# created over the desired number of pods.
6868
maxSurge: 1
69+
priorityClassName: ""
6970
podSecurityContext:
7071
runAsNonRoot: true
7172
runAsUser: 65532
@@ -118,7 +119,7 @@ node:
118119
hostPath:
119120
path: /etc/cacert
120121
dnsPolicy: ClusterFirstWithHostNet
121-
122+
priorityClassName: ""
122123
podSecurityContext: {}
123124

124125
securityContext: {}
@@ -208,8 +209,6 @@ secret:
208209
secret-key: ""
209210
hostMount: false
210211

211-
priorityClassName: ""
212-
213212
imagePullSecrets: []
214213
# - name: my-imagepull-secret
215214

deploy/k8s/node-daemonset.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626

2727
containers:
2828
- name: cloudstack-csi-node
29-
image: ghcr.io/leaseweb/cloudstack-csi-driver:master
29+
image: cloudstack-csi-driver
3030
imagePullPolicy: Always
3131
args:
3232
- "-endpoint=$(CSI_ENDPOINT)"
@@ -56,6 +56,8 @@ spec:
5656
mountPropagation: Bidirectional
5757
- name: device-dir
5858
mountPath: /dev
59+
- name: cloud-init-dir
60+
mountPath: /run/cloud-init/
5961
- name: cloudstack-conf
6062
mountPath: /etc/cloudstack-csi-driver
6163
ports:
@@ -131,6 +133,10 @@ spec:
131133
hostPath:
132134
path: /var/lib/kubelet/plugins_registry
133135
type: Directory
136+
- name: cloud-init-dir
137+
hostPath:
138+
path: /run/cloud-init/
139+
type: Directory
134140
- name: cloudstack-conf
135141
secret:
136142
secretName: cloudstack-secret

0 commit comments

Comments
 (0)