Skip to content

Commit d70ca56

Browse files
kyuan-mongodbjwilliams-mongo
kyuan-mongodb
authored and
jwilliams-mongo
committed
DOCSP-41572 added podAffinityTerm to all instances of podAntiAffinity (#1790)
1 parent 78d60c4 commit d70ca56

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

‎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)