Skip to content

Commit 00f6164

Browse files
kyuan-mongodbkyuan-mongodb
authored
DOCSP-41572 added podAffinityTerm to all instances of podAntiAffinity (#1803)
(cherry picked from commit 0db9cfa)
1 parent 7957a82 commit 00f6164

File tree

3 files changed

+168
-154
lines changed

3 files changed

+168
-154
lines changed

‎source/includes/code-examples/yaml-files/example-sharded-cluster.yaml

Lines changed: 72 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -581,76 +581,82 @@ spec:
581581
persistent: true
582582
configSrvPodSpec:
583583
podTemplate:
584-
affinity:
585-
podAffinity:
586-
requiredDuringSchedulingIgnoredDuringExecution:
587-
- labelSelector:
588-
matchExpressions:
589-
- key: security
590-
operator: In
591-
values:
592-
- S1
593-
topologyKey: failure-domain.beta.kubernetes.io/zone
594-
nodeAffinity:
595-
requiredDuringSchedulingIgnoredDuringExecution:
596-
nodeSelectorTerms:
597-
- matchExpressions:
598-
- key: kubernetes.io/e2e-az-name
599-
operator: In
600-
values:
601-
- e2e-az1
602-
- e2e-az2
603-
podAntiAffinity:
604-
requiredDuringSchedulingIgnoredDuringExecution:
605-
topologyKey: nodeId
584+
spec:
585+
affinity:
586+
podAffinity:
587+
requiredDuringSchedulingIgnoredDuringExecution:
588+
- labelSelector:
589+
matchExpressions:
590+
- key: security
591+
operator: In
592+
values:
593+
- S1
594+
topologyKey: failure-domain.beta.kubernetes.io/zone
595+
nodeAffinity:
596+
requiredDuringSchedulingIgnoredDuringExecution:
597+
nodeSelectorTerms:
598+
- matchExpressions:
599+
- key: kubernetes.io/e2e-az-name
600+
operator: In
601+
values:
602+
- e2e-az1
603+
- e2e-az2
604+
podAntiAffinity:
605+
requiredDuringSchedulingIgnoredDuringExecution:
606+
- podAffinityTerm:
607+
topologyKey: nodeId
606608
mongosPodSpec:
607609
podTemplate:
608-
affinity:
609-
podAffinity:
610-
requiredDuringSchedulingIgnoredDuringExecution:
611-
- labelSelector:
612-
matchExpressions:
613-
- key: security
614-
operator: In
615-
values:
616-
- S1
617-
topologyKey: failure-domain.beta.kubernetes.io/zone
618-
nodeAffinity:
619-
requiredDuringSchedulingIgnoredDuringExecution:
620-
nodeSelectorTerms:
621-
- matchExpressions:
622-
- key: kubernetes.io/e2e-az-name
623-
operator: In
624-
values:
625-
- e2e-az1
626-
- e2e-az2
627-
podAntiAffinity:
628-
requiredDuringSchedulingIgnoredDuringExecution:
629-
topologyKey: nodeId
610+
spec:
611+
affinity:
612+
podAffinity:
613+
requiredDuringSchedulingIgnoredDuringExecution:
614+
- labelSelector:
615+
matchExpressions:
616+
- key: security
617+
operator: In
618+
values:
619+
- S1
620+
topologyKey: failure-domain.beta.kubernetes.io/zone
621+
nodeAffinity:
622+
requiredDuringSchedulingIgnoredDuringExecution:
623+
nodeSelectorTerms:
624+
- matchExpressions:
625+
- key: kubernetes.io/e2e-az-name
626+
operator: In
627+
values:
628+
- e2e-az1
629+
- e2e-az2
630+
podAntiAffinity:
631+
requiredDuringSchedulingIgnoredDuringExecution:
632+
- podAffinityTerm:
633+
topologyKey: nodeId
630634
shardPodSpec:
631635
podTemplate:
632-
affinity:
633-
podAffinity:
634-
requiredDuringSchedulingIgnoredDuringExecution:
635-
- labelSelector:
636-
matchExpressions:
637-
- key: security
638-
operator: In
639-
values:
640-
- S1
641-
topologyKey: failure-domain.beta.kubernetes.io/zone
642-
nodeAffinity:
643-
requiredDuringSchedulingIgnoredDuringExecution:
644-
nodeSelectorTerms:
645-
- matchExpressions:
646-
- key: kubernetes.io/e2e-az-name
647-
operator: In
648-
values:
649-
- e2e-az1
650-
- e2e-az2
651-
podAntiAffinity:
652-
requiredDuringSchedulingIgnoredDuringExecution:
653-
topologyKey: nodeId
636+
spec:
637+
affinity:
638+
podAffinity:
639+
requiredDuringSchedulingIgnoredDuringExecution:
640+
- labelSelector:
641+
matchExpressions:
642+
- key: security
643+
operator: In
644+
values:
645+
- S1
646+
topologyKey: failure-domain.beta.kubernetes.io/zone
647+
nodeAffinity:
648+
requiredDuringSchedulingIgnoredDuringExecution:
649+
nodeSelectorTerms:
650+
- matchExpressions:
651+
- key: kubernetes.io/e2e-az-name
652+
operator: In
653+
values:
654+
- e2e-az1
655+
- e2e-az2
656+
podAntiAffinity:
657+
requiredDuringSchedulingIgnoredDuringExecution:
658+
- podAffinityTerm:
659+
topologyKey: nodeId
654660
...
655661
END-affinity-sharded
656662

‎source/reference/k8s/shardedclusterpodspec.yaml

Lines changed: 72 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -29,52 +29,56 @@ spec:
2929
# default size (5Gi) for mounting single Persistent Volume
3030

3131
podTemplate:
32-
affinity:
33-
podAffinity:
34-
requiredDuringSchedulingIgnoredDuringExecution:
35-
- labelSelector:
36-
matchExpressions:
37-
- key: security
38-
operator: In
39-
values:
40-
- S1
41-
topologyKey: failure-domain.beta.kubernetes.io/zone
42-
nodeAffinity:
43-
requiredDuringSchedulingIgnoredDuringExecution:
44-
nodeSelectorTerms:
45-
- matchExpressions:
46-
- key: kubernetes.io/e2e-az-name
47-
operator: In
48-
values:
49-
- e2e-az1
50-
- e2e-az2
51-
podAntiAffinity:
52-
requiredDuringSchedulingIgnoredDuringExecution:
53-
topologyKey: nodeId
32+
spec:
33+
affinity:
34+
podAffinity:
35+
requiredDuringSchedulingIgnoredDuringExecution:
36+
- labelSelector:
37+
matchExpressions:
38+
- key: security
39+
operator: In
40+
values:
41+
- S1
42+
topologyKey: failure-domain.beta.kubernetes.io/zone
43+
nodeAffinity:
44+
requiredDuringSchedulingIgnoredDuringExecution:
45+
nodeSelectorTerms:
46+
- matchExpressions:
47+
- key: kubernetes.io/e2e-az-name
48+
operator: In
49+
values:
50+
- e2e-az1
51+
- e2e-az2
52+
podAntiAffinity:
53+
requiredDuringSchedulingIgnoredDuringExecution:
54+
- podAffinityTerm:
55+
topologyKey: nodeId
5456
mongosPodSpec:
5557
podTemplate:
56-
affinity:
57-
podAffinity:
58-
requiredDuringSchedulingIgnoredDuringExecution:
59-
- labelSelector:
60-
matchExpressions:
61-
- key: security
62-
operator: In
63-
values:
64-
- S1
65-
topologyKey: failure-domain.beta.kubernetes.io/zone
66-
nodeAffinity:
67-
requiredDuringSchedulingIgnoredDuringExecution:
68-
nodeSelectorTerms:
69-
- matchExpressions:
70-
- key: kubernetes.io/e2e-az-name
71-
operator: In
72-
values:
73-
- e2e-az1
74-
- e2e-az2
75-
podAntiAffinity:
76-
requiredDuringSchedulingIgnoredDuringExecution:
77-
topologyKey: nodeId
58+
spec:
59+
affinity:
60+
podAffinity:
61+
requiredDuringSchedulingIgnoredDuringExecution:
62+
- labelSelector:
63+
matchExpressions:
64+
- key: security
65+
operator: In
66+
values:
67+
- S1
68+
topologyKey: failure-domain.beta.kubernetes.io/zone
69+
nodeAffinity:
70+
requiredDuringSchedulingIgnoredDuringExecution:
71+
nodeSelectorTerms:
72+
- matchExpressions:
73+
- key: kubernetes.io/e2e-az-name
74+
operator: In
75+
values:
76+
- e2e-az1
77+
- e2e-az2
78+
podAntiAffinity:
79+
requiredDuringSchedulingIgnoredDuringExecution:
80+
- podAffinityTerm:
81+
topologyKey: nodeId
7882
shardPodSpec:
7983
persistence:
8084
multiple:
@@ -86,28 +90,30 @@ spec:
8690
storage: "4Gi"
8791
storageClass: standard
8892
podTemplate:
89-
affinity:
90-
podAffinity:
91-
requiredDuringSchedulingIgnoredDuringExecution:
92-
- labelSelector:
93-
matchExpressions:
94-
- key: security
95-
operator: In
96-
values:
97-
- S1
98-
topologyKey: failure-domain.beta.kubernetes.io/zone
99-
nodeAffinity:
100-
requiredDuringSchedulingIgnoredDuringExecution:
101-
nodeSelectorTerms:
102-
- matchExpressions:
103-
- key: kubernetes.io/e2e-az-name
104-
operator: In
105-
values:
106-
- e2e-az1
107-
- e2e-az2
108-
podAntiAffinity:
109-
requiredDuringSchedulingIgnoredDuringExecution:
110-
topologyKey: nodeId
93+
spec:
94+
affinity:
95+
podAffinity:
96+
requiredDuringSchedulingIgnoredDuringExecution:
97+
- labelSelector:
98+
matchExpressions:
99+
- key: security
100+
operator: In
101+
values:
102+
- S1
103+
topologyKey: failure-domain.beta.kubernetes.io/zone
104+
nodeAffinity:
105+
requiredDuringSchedulingIgnoredDuringExecution:
106+
nodeSelectorTerms:
107+
- matchExpressions:
108+
- key: kubernetes.io/e2e-az-name
109+
operator: In
110+
values:
111+
- e2e-az1
112+
- e2e-az2
113+
podAntiAffinity:
114+
requiredDuringSchedulingIgnoredDuringExecution:
115+
- podAffinityTerm:
116+
topologyKey: nodeId
111117
mongos:
112118
additionalMongodConfig:
113119
systemLog:

‎source/tutorial/plan-k8s-op-considerations.txt

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -132,28 +132,30 @@ To specify Pod affinity:
132132

133133
...
134134
podTemplate:
135-
affinity:
136-
podAffinity:
137-
requiredDuringSchedulingIgnoredDuringExecution:
138-
- labelSelector:
139-
matchExpressions:
140-
- key: security
141-
operator: In
142-
values:
143-
- S1
144-
topologyKey: failure-domain.beta.kubernetes.io/zone
145-
nodeAffinity:
146-
requiredDuringSchedulingIgnoredDuringExecution:
147-
nodeSelectorTerms:
148-
- matchExpressions:
149-
- key: kubernetes.io/e2e-az-name
150-
operator: In
151-
values:
152-
- e2e-az1
153-
- e2e-az2
154-
podAntiAffinity:
155-
requiredDuringSchedulingIgnoredDuringExecution:
156-
topologyKey: nodeId
135+
spec:
136+
affinity:
137+
podAffinity:
138+
requiredDuringSchedulingIgnoredDuringExecution:
139+
- labelSelector:
140+
matchExpressions:
141+
- key: security
142+
operator: In
143+
values:
144+
- S1
145+
topologyKey: failure-domain.beta.kubernetes.io/zone
146+
nodeAffinity:
147+
requiredDuringSchedulingIgnoredDuringExecution:
148+
nodeSelectorTerms:
149+
- matchExpressions:
150+
- key: kubernetes.io/e2e-az-name
151+
operator: In
152+
values:
153+
- e2e-az1
154+
- e2e-az2
155+
podAntiAffinity:
156+
requiredDuringSchedulingIgnoredDuringExecution:
157+
- podAffinityTerm:
158+
topologyKey: nodeId
157159

158160
See the full example of multiple availability zones and node affinity
159161
configuration in

0 commit comments

Comments
 (0)