Skip to content

Commit d57fab9

Browse files
scylla-operator-bot[bot]scylla-operator-bot[bot]
authored
Merge pull request #2235 from rzetelskik/unify-taints-tolerations
Unify the use of taints and tolerations in deploy, docs, examples and tests
2 parents 91b1fe0 + 6c6a517 commit d57fab9

16 files changed

+105
-30
lines changed

‎docs/source/resources/scyllaclusters/multidc/multidc.md

+18-18
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@ spec:
164164
values:
165165
- scylla
166166
tolerations:
167-
- key: role
167+
- effect: NoSchedule
168+
key: scylla-operator.scylladb.com/dedicated
168169
operator: Equal
169-
value: scylla-clusters
170-
effect: NoSchedule
170+
value: scyllaclusters
171171
- name: b
172172
members: 1
173173
storage:
@@ -208,10 +208,10 @@ spec:
208208
values:
209209
- scylla
210210
tolerations:
211-
- key: role
211+
- effect: NoSchedule
212+
key: scylla-operator.scylladb.com/dedicated
212213
operator: Equal
213-
value: scylla-clusters
214-
effect: NoSchedule
214+
value: scyllaclusters
215215
- name: c
216216
members: 1
217217
storage:
@@ -252,10 +252,10 @@ spec:
252252
values:
253253
- scylla
254254
tolerations:
255-
- key: role
255+
- effect: NoSchedule
256+
key: scylla-operator.scylladb.com/dedicated
256257
operator: Equal
257-
value: scylla-clusters
258-
effect: NoSchedule
258+
value: scyllaclusters
259259
```
260260

261261
Apply the manifest:
@@ -418,10 +418,10 @@ spec:
418418
values:
419419
- scylla
420420
tolerations:
421-
- key: role
421+
- effect: NoSchedule
422+
key: scylla-operator.scylladb.com/dedicated
422423
operator: Equal
423-
value: scylla-clusters
424-
effect: NoSchedule
424+
value: scyllaclusters
425425
- name: b
426426
members: 1
427427
storage:
@@ -462,10 +462,10 @@ spec:
462462
values:
463463
- scylla
464464
tolerations:
465-
- key: role
465+
- effect: NoSchedule
466+
key: scylla-operator.scylladb.com/dedicated
466467
operator: Equal
467-
value: scylla-clusters
468-
effect: NoSchedule
468+
value: scyllaclusters
469469
- name: c
470470
members: 1
471471
storage:
@@ -506,10 +506,10 @@ spec:
506506
values:
507507
- scylla
508508
tolerations:
509-
- key: role
509+
- effect: NoSchedule
510+
key: scylla-operator.scylladb.com/dedicated
510511
operator: Equal
511-
value: scylla-clusters
512-
effect: NoSchedule
512+
value: scyllaclusters
513513
```
514514

515515
To apply the manifest, run:

‎examples/common/nodeconfig-alpha.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,8 @@ spec:
66
placement:
77
nodeSelector:
88
scylla.scylladb.com/node-type: scylla
9+
tolerations:
10+
- effect: NoSchedule
11+
key: scylla-operator.scylladb.com/dedicated
12+
operator: Equal
13+
value: scyllaclusters

‎examples/eks/scyllacluster.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ spec:
3333
values:
3434
- scylla
3535
tolerations:
36-
- key: role
36+
- effect: NoSchedule
37+
key: scylla-operator.scylladb.com/dedicated
3738
operator: Equal
38-
value: scylla-clusters
39-
effect: NoSchedule
39+
value: scyllaclusters
4040
- name: b
4141
members: 1
4242
storage:
@@ -60,10 +60,10 @@ spec:
6060
values:
6161
- scylla
6262
tolerations:
63-
- key: role
63+
- effect: NoSchedule
64+
key: scylla-operator.scylladb.com/dedicated
6465
operator: Equal
65-
value: scylla-clusters
66-
effect: NoSchedule
66+
value: scyllaclusters
6767
- name: c
6868
members: 1
6969
storage:
@@ -87,7 +87,7 @@ spec:
8787
values:
8888
- scylla
8989
tolerations:
90-
- key: role
90+
- effect: NoSchedule
91+
key: scylla-operator.scylladb.com/dedicated
9192
operator: Equal
92-
value: scylla-clusters
93-
effect: NoSchedule
93+
value: scyllaclusters

‎examples/generic/nodeconfig-alpha.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ spec:
1818
- prjquota
1919
placement:
2020
nodeSelector:
21-
kubernetes.io/os: linux
2221
scylla.scylladb.com/node-type: scylla
2322
tolerations:
2423
- effect: NoSchedule
25-
key: role
24+
key: scylla-operator.scylladb.com/dedicated
2625
operator: Equal
27-
value: scylla-clusters
26+
value: scyllaclusters

‎examples/helm/values.cluster.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,9 @@ racks:
1919
requests:
2020
cpu: 1
2121
memory: 1Gi
22+
placement:
23+
tolerations:
24+
- effect: NoSchedule
25+
key: scylla-operator.scylladb.com/dedicated
26+
operator: Equal
27+
value: scyllaclusters

‎examples/helm/values.manager.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,9 @@ scylla:
3838
requests:
3939
cpu: 1
4040
memory: 200Mi
41+
placement:
42+
tolerations:
43+
- effect: NoSchedule
44+
key: scylla-operator.scylladb.com/dedicated
45+
operator: Equal
46+
value: scyllaclusters

‎examples/monitoring/v1alpha1/scylladbmonitoring.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ spec:
1818
resources:
1919
requests:
2020
storage: 1Gi
21+
placement:
22+
tolerations:
23+
- effect: NoSchedule
24+
key: scylla-operator.scylladb.com/dedicated
25+
operator: Equal
26+
value: scyllaclusters
2127
grafana:
2228
exposeOptions:
2329
webInterface:

‎examples/scylladb/scylla.scyllacluster.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,9 @@ spec:
2424
limits:
2525
cpu: 1
2626
memory: 1Gi
27+
placement:
28+
tolerations:
29+
- effect: NoSchedule
30+
key: scylla-operator.scylladb.com/dedicated
31+
operator: Equal
32+
value: scyllaclusters

‎helm/scylla-manager/values.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ scylla:
7777
requests:
7878
cpu: 1
7979
memory: 200Mi
80+
placement:
81+
tolerations:
82+
- effect: NoSchedule
83+
key: scylla-operator.scylladb.com/dedicated
84+
operator: Equal
85+
value: scyllaclusters
8086
# Whether to create Prometheus ServiceMonitor
8187
serviceMonitor:
8288
create: false

‎helm/scylla/values.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ racks:
6666
requests:
6767
cpu: 1
6868
memory: 4Gi
69+
placement:
70+
tolerations:
71+
- effect: NoSchedule
72+
key: scylla-operator.scylladb.com/dedicated
73+
operator: Equal
74+
value: scyllaclusters
6975
# Whether to create Prometheus ServiceMonitor
7076
serviceMonitor:
7177
create: false

‎test/e2e/fixture/scylla/nodeconfig.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,8 @@ spec:
66
placement:
77
nodeSelector:
88
scylla.scylladb.com/node-type: scylla
9+
tolerations:
10+
- effect: NoSchedule
11+
key: scylla-operator.scylladb.com/dedicated
12+
operator: Equal
13+
value: scyllaclusters

‎test/e2e/fixture/scylla/scyllacluster.yaml.tmpl

+6
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,9 @@ spec:
3535
limits:
3636
cpu: 1
3737
memory: 1Gi
38+
placement:
39+
tolerations:
40+
- effect: NoSchedule
41+
key: scylla-operator.scylladb.com/dedicated
42+
operator: Equal
43+
value: scyllaclusters

‎test/e2e/fixture/scylla/scylladbcluster.yaml.tmpl

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ spec:
3434
nodes: 1
3535
racks:
3636
- name: a
37+
placement:
38+
tolerations:
39+
- effect: NoSchedule
40+
key: scylla-operator.scylladb.com/dedicated
41+
operator: Equal
42+
value: scyllaclusters
3743
datacenters:
3844
{{- range $rkcIdx, $rkc := .remoteKubernetesClusters }}
3945
- name: dc-{{ $rkcIdx }}

‎test/e2e/fixture/scylla/scylladbdatacenter.yaml.tmpl

+6
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,11 @@ spec:
4040
type: {{ .clientsBroadcastAddressType }}
4141
rackTemplate:
4242
nodes: 1
43+
placement:
44+
tolerations:
45+
- effect: NoSchedule
46+
key: scylla-operator.scylladb.com/dedicated
47+
operator: Equal
48+
value: scyllaclusters
4349
racks:
4450
- name: us-east-1a

‎test/e2e/fixture/scylla/scylladbmonitoring.yaml.tmpl

+6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ spec:
2828
resources:
2929
requests:
3030
storage: 1Gi
31+
placement:
32+
tolerations:
33+
- effect: NoSchedule
34+
key: scylla-operator.scylladb.com/dedicated
35+
operator: Equal
36+
value: scyllaclusters
3137
grafana:
3238
exposeOptions:
3339
webInterface:

‎test/e2e/fixture/scylla/zonal.scyllacluster.yaml.tmpl

+6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ spec:
3636
limits:
3737
cpu: 1
3838
memory: 1Gi
39+
placement:
40+
tolerations:
41+
- effect: NoSchedule
42+
key: scylla-operator.scylladb.com/dedicated
43+
operator: Equal
44+
value: scyllaclusters
3945
{{- end }}
4046
sysctls:
4147
- fs.aio-max-nr=30000000

0 commit comments

Comments
 (0)