Skip to content

Commit 41b53ed

Browse files
authored
Merge pull request #130 from Leaseweb/prioclass
feat: Set priorityClassName in deploy manifest, split setting in chart
2 parents 4be79b0 + 5448f1f commit 41b53ed

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-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/controller-deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: cloudstack-csi-controller
77
namespace: kube-system
88
spec:
9-
replicas: 3
9+
replicas: 2
1010
strategy:
1111
type: RollingUpdate
1212
rollingUpdate:
@@ -21,6 +21,7 @@ spec:
2121
app.kubernetes.io/name: cloudstack-csi-controller
2222
app.kubernetes.io/part-of: cloudstack-csi-driver
2323
spec:
24+
priorityClassName: system-cluster-critical
2425
serviceAccountName: cloudstack-csi-controller
2526
nodeSelector:
2627
kubernetes.io/os: linux

deploy/k8s/node-daemonset.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ spec:
1515
app.kubernetes.io/name: cloudstack-csi-node
1616
app.kubernetes.io/part-of: cloudstack-csi-driver
1717
spec:
18+
priorityClassName: system-node-critical
1819
nodeSelector:
1920
kubernetes.io/os: linux
2021
tolerations:

0 commit comments

Comments
 (0)