whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34796 from jihoon-seo/220704_ko_Resolve_conflict_to_merge_dev-1.24-ko.1

Browse Source 
[ko] Resolve conflict to merge `dev-1.24-ko.1` into `main`
This commit is contained in:
Kubernetes Prow Robot
2022-07-04 12:09:24 -07:00
committed by GitHub
parent e0c2b2f036 478af5669a
commit 0f506a119d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/ko/examples/pods/pod-with-affinity-anti-affinity.yaml
+3 -2
View File
@@ -8,10 +8,11 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
- matchExpressions: - matchExpressions:
- key: kubernetes.io/os - key: topology.kubernetes.io/zone
operator: In operator: In
values: values:
- linux - antarctica-east1
- antarctica-west1
preferredDuringSchedulingIgnoredDuringExecution: preferredDuringSchedulingIgnoredDuringExecution:
- weight: 1 - weight: 1
preference: preference: