Skip to content

Commit 478af56

Browse files
committed
[ko] Resolve conflict to merge dev-1.24-ko.1 into main
1 parent e0c2b2f commit 478af56

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

content/ko/examples/pods/pod-with-affinity-anti-affinity.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ spec:
88
requiredDuringSchedulingIgnoredDuringExecution:
99
nodeSelectorTerms:
1010
- matchExpressions:
11-
- key: kubernetes.io/os
11+
- key: topology.kubernetes.io/zone
1212
operator: In
1313
values:
14-
- linux
14+
- antarctica-east1
15+
- antarctica-west1
1516
preferredDuringSchedulingIgnoredDuringExecution:
1617
- weight: 1
1718
preference:

0 commit comments

Comments
 (0)