Skip to content

Commit 7e292c0

Browse files
committed
Merge remote-tracking branch 'origin/main' into adr-pdb
2 parents 2efcd8c + ed66203 commit 7e292c0

File tree

2 files changed

+4
-29
lines changed

2 files changed

+4
-29
lines changed

modules/concepts/pages/roles-and-role-groups.adoc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,16 @@ spec:
4949
roleGroups:
5050
default:
5151
replicas: 3
52-
selector:
53-
matchLabels:
54-
kubernetes.io/os: linux # <2>
5552
dataNodes:
5653
config:
5754
resources:
5855
storage:
5956
data:
60-
capacity: 1Gi # <3>
57+
capacity: 1Gi # <2>
6158
roleGroups:
6259
default:
6360
replicas: 2
64-
hiCapacity: # <4>
61+
hiCapacity: # <3>
6562
config:
6663
resources:
6764
storage:
@@ -71,9 +68,8 @@ spec:
7168
----
7269

7370
<1> The JournalNode role with only a single default role group. For the role group 3 replicas are specified, specifying a replica count is optional, the default is 1.
74-
<2> For the NameNodes default role group, a label selector is given, the pods should only be specified on nodes where the `kubernetes.io/os` label has the value `linux`.
75-
<3> A common config setting for the DataNodes role. This configuration setting applies only to pods for this role.
76-
<4> The DataNode role has two role groups, the default group and the hiCapacity group. In it the config setting for the group is overridden with a higher value of 2Gi. This role group has only one replica.
71+
<2> A common config setting for the DataNodes role. This configuration setting applies only to pods for this role.
72+
<3> The DataNode role has two role groups, the default group and the hiCapacity group. In it the config setting for the group is overridden with a higher value of 2Gi. This role group has only one replica.
7773

7874
== Further Reading
7975

modules/tutorials/pages/end-to-end_data_pipeline_example.adoc

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ spec:
121121
servers:
122122
roleGroups:
123123
default:
124-
selector:
125-
matchLabels:
126-
kubernetes.io/os: linux
127124
replicas: 1
128125
config: {}
129126
EOF
@@ -218,9 +215,6 @@ spec:
218215
capacity: "20Gi"
219216
roleGroups:
220217
default:
221-
selector:
222-
matchLabels:
223-
kubernetes.io/os: linux
224218
config:
225219
log:
226220
rootLogLevel: INFO
@@ -448,9 +442,6 @@ spec:
448442
druid.s3.enablePathStyleAccess: "true"
449443
roleGroups:
450444
default:
451-
selector:
452-
matchLabels:
453-
kubernetes.io/os: linux
454445
config: {}
455446
replicas: 1
456447
coordinators:
@@ -459,9 +450,6 @@ spec:
459450
druid.s3.enablePathStyleAccess: "true"
460451
roleGroups:
461452
default:
462-
selector:
463-
matchLabels:
464-
kubernetes.io/os: linux
465453
config: {}
466454
replicas: 1
467455
historicals:
@@ -470,9 +458,6 @@ spec:
470458
druid.s3.enablePathStyleAccess: "true"
471459
roleGroups:
472460
default:
473-
selector:
474-
matchLabels:
475-
kubernetes.io/os: linux
476461
config: {}
477462
replicas: 1
478463
middleManagers:
@@ -481,9 +466,6 @@ spec:
481466
druid.s3.enablePathStyleAccess: "true"
482467
roleGroups:
483468
default:
484-
selector:
485-
matchLabels:
486-
kubernetes.io/os: linux
487469
config: {}
488470
replicas: 1
489471
routers:
@@ -492,9 +474,6 @@ spec:
492474
druid.s3.enablePathStyleAccess: "true"
493475
roleGroups:
494476
default:
495-
selector:
496-
matchLabels:
497-
kubernetes.io/os: linux
498477
config: {}
499478
replicas: 1
500479
EOF

0 commit comments

Comments
 (0)