[ko] Resolve conflict to merge dev-1.24-ko.1 into main

This commit is contained in:
Jihoon Seo 2022-07-04 10:20:51 +09:00
parent e0c2b2f036
commit 478af5669a
1 changed files with 3 additions and 2 deletions

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: