Skip to content

Commit 7e7c4d1

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#89272 from alculquicondor/perf-mixed-pods
Add multiple init pods to scheduler perf test cases
2 parents 3754aa1 + 5adc4c4 commit 7e7c4d1

File tree

6 files changed

+192
-125
lines changed

6 files changed

+192
-125
lines changed

‎test/integration/scheduler_perf/config/performance-config.yaml‎

Lines changed: 88 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
- template:
22
desc: SchedulingBasic
33
initPods:
4-
podTemplatePath: config/pod-default.yaml
4+
- podTemplatePath: config/pod-default.yaml
55
podsToSchedule:
66
podTemplatePath: config/pod-default.yaml
77
params:
8-
- numNodes: 500
9-
numInitPods: 500
10-
numPodsToSchedule: 1000
11-
- numNodes: 5000
12-
numInitPods: 5000
13-
numPodsToSchedule: 1000
8+
- numNodes: 500
9+
numInitPods: [500]
10+
numPodsToSchedule: 1000
11+
- numNodes: 5000
12+
numInitPods: [5000]
13+
numPodsToSchedule: 1000
1414
- template:
1515
desc: SchedulingPodAntiAffinity
1616
nodes:
1717
uniqueNodeLabelStrategy:
1818
labelKey: kubernetes.io/hostname
1919
initPods:
20-
podTemplatePath: config/pod-with-pod-anti-affinity.yaml
20+
- podTemplatePath: config/pod-with-pod-anti-affinity.yaml
2121
podsToSchedule:
2222
podTemplatePath: config/pod-with-pod-anti-affinity.yaml
2323
params:
24-
- numNodes: 500
25-
numInitPods: 100
26-
numPodsToSchedule: 400
27-
- numNodes: 5000
28-
numInitPods: 1000
29-
numPodsToSchedule: 1000
24+
- numNodes: 500
25+
numInitPods: [100]
26+
numPodsToSchedule: 400
27+
- numNodes: 5000
28+
numInitPods: [1000]
29+
numPodsToSchedule: 1000
3030
- template:
3131
desc: SchedulingSecrets
3232
initPods:
33-
podTemplatePath: config/pod-with-secret-volume.yaml
33+
- podTemplatePath: config/pod-with-secret-volume.yaml
3434
podsToSchedule:
3535
podTemplatePath: config/pod-with-secret-volume.yaml
3636
params:
37-
- numNodes: 500
38-
numInitPods: 500
39-
numPodsToSchedule: 1000
40-
- numNodes: 5000
41-
numInitPods: 5000
42-
numPodsToSchedule: 1000
37+
- numNodes: 500
38+
numInitPods: [500]
39+
numPodsToSchedule: 1000
40+
- numNodes: 5000
41+
numInitPods: [5000]
42+
numPodsToSchedule: 1000
4343
- template:
4444
desc: SchedulingInTreePVs
4545
initPods:
46-
persistentVolumeTemplatePath: config/pv-aws.yaml
46+
- persistentVolumeTemplatePath: config/pv-aws.yaml
4747
persistentVolumeClaimTemplatePath: config/pvc.yaml
4848
podsToSchedule:
4949
persistentVolumeTemplatePath: config/pv-aws.yaml
5050
persistentVolumeClaimTemplatePath: config/pvc.yaml
5151
params:
52-
- numNodes: 500
53-
numInitPods: 500
54-
numPodsToSchedule: 1000
55-
- numNodes: 5000
56-
numInitPods: 5000
57-
numPodsToSchedule: 1000
52+
- numNodes: 500
53+
numInitPods: [500]
54+
numPodsToSchedule: 1000
55+
- numNodes: 5000
56+
numInitPods: [5000]
57+
numPodsToSchedule: 1000
5858
- template:
5959
desc: SchedulingMigratedInTreePVs
6060
nodes:
@@ -66,9 +66,9 @@
6666
ebs.csi.aws.com:
6767
count: 39
6868
migratedPlugins:
69-
- "kubernetes.io/aws-ebs"
69+
- "kubernetes.io/aws-ebs"
7070
initPods:
71-
persistentVolumeTemplatePath: config/pv-aws.yaml
71+
- persistentVolumeTemplatePath: config/pv-aws.yaml
7272
persistentVolumeClaimTemplatePath: config/pvc.yaml
7373
podsToSchedule:
7474
persistentVolumeTemplatePath: config/pv-aws.yaml
@@ -77,12 +77,12 @@
7777
CSIMigration: true
7878
CSIMigrationAWS: true
7979
params:
80-
- numNodes: 500
81-
numInitPods: 500
82-
numPodsToSchedule: 1000
83-
- numNodes: 5000
84-
numInitPods: 5000
85-
numPodsToSchedule: 1000
80+
- numNodes: 500
81+
numInitPods: [500]
82+
numPodsToSchedule: 1000
83+
- numNodes: 5000
84+
numInitPods: [5000]
85+
numPodsToSchedule: 1000
8686
- template:
8787
desc: SchedulingCSIPVs
8888
nodes:
@@ -94,18 +94,18 @@
9494
ebs.csi.aws.com:
9595
count: 39
9696
initPods:
97-
persistentVolumeTemplatePath: config/pv-csi.yaml
97+
- persistentVolumeTemplatePath: config/pv-csi.yaml
9898
persistentVolumeClaimTemplatePath: config/pvc.yaml
9999
podsToSchedule:
100100
persistentVolumeTemplatePath: config/pv-csi.yaml
101101
persistentVolumeClaimTemplatePath: config/pvc.yaml
102102
params:
103-
- numNodes: 500
104-
numInitPods: 500
105-
numPodsToSchedule: 1000
106-
- numNodes: 5000
107-
numInitPods: 5000
108-
numPodsToSchedule: 1000
103+
- numNodes: 500
104+
numInitPods: [500]
105+
numPodsToSchedule: 1000
106+
- numNodes: 5000
107+
numInitPods: [5000]
108+
numPodsToSchedule: 1000
109109
- template:
110110
desc: SchedulingPodAffinity
111111
nodes:
@@ -114,48 +114,48 @@
114114
labelKey: "failure-domain.beta.kubernetes.io/zone"
115115
labelValue: "zone1"
116116
initPods:
117-
podTemplatePath: config/pod-with-pod-affinity.yaml
117+
- podTemplatePath: config/pod-with-pod-affinity.yaml
118118
podsToSchedule:
119119
podTemplatePath: config/pod-with-pod-affinity.yaml
120120
params:
121-
- numNodes: 500
122-
numInitPods: 500
123-
numPodsToSchedule: 1000
124-
- numNodes: 5000
125-
numInitPods: 5000
126-
numPodsToSchedule: 1000
121+
- numNodes: 500
122+
numInitPods: [500]
123+
numPodsToSchedule: 1000
124+
- numNodes: 5000
125+
numInitPods: [5000]
126+
numPodsToSchedule: 1000
127127
- template:
128128
desc: SchedulingPreferredPodAffinity
129129
nodes:
130130
uniqueNodeLabelStrategy:
131131
labelKey: kubernetes.io/hostname
132132
initPods:
133-
podTemplatePath: config/pod-with-preferred-pod-affinity.yaml
133+
- podTemplatePath: config/pod-with-preferred-pod-affinity.yaml
134134
podsToSchedule:
135135
podTemplatePath: config/pod-with-preferred-pod-affinity.yaml
136136
params:
137-
- numNodes: 500
138-
numInitPods: 500
139-
numPodsToSchedule: 1000
140-
- numNodes: 5000
141-
numInitPods: 5000
142-
numPodsToSchedule: 1000
137+
- numNodes: 500
138+
numInitPods: [500]
139+
numPodsToSchedule: 1000
140+
- numNodes: 5000
141+
numInitPods: [5000]
142+
numPodsToSchedule: 1000
143143
- template:
144144
desc: SchedulingPreferredPodAntiAffinity
145145
nodes:
146146
uniqueNodeLabelStrategy:
147147
labelKey: kubernetes.io/hostname
148148
initPods:
149-
podTemplatePath: config/pod-with-preferred-pod-anti-affinity.yaml
149+
- podTemplatePath: config/pod-with-preferred-pod-anti-affinity.yaml
150150
podsToSchedule:
151151
podTemplatePath: config/pod-with-preferred-pod-anti-affinity.yaml
152152
params:
153-
- numNodes: 500
154-
numInitPods: 500
155-
numPodsToSchedule: 1000
156-
- numNodes: 5000
157-
numInitPods: 5000
158-
numPodsToSchedule: 1000
153+
- numNodes: 500
154+
numInitPods: [500]
155+
numPodsToSchedule: 1000
156+
- numNodes: 5000
157+
numInitPods: [5000]
158+
numPodsToSchedule: 1000
159159
- template:
160160
desc: SchedulingNodeAffinity
161161
nodes:
@@ -164,13 +164,30 @@
164164
labelKey: "failure-domain.beta.kubernetes.io/zone"
165165
labelValue: "zone1"
166166
initPods:
167-
podTemplatePath: config/pod-with-node-affinity.yaml
167+
- podTemplatePath: config/pod-with-node-affinity.yaml
168168
podsToSchedule:
169169
podTemplatePath: config/pod-with-node-affinity.yaml
170170
params:
171-
- numNodes: 500
172-
numInitPods: 500
173-
numPodsToSchedule: 1000
174-
- numNodes: 5000
175-
numInitPods: 5000
176-
numPodsToSchedule: 1000
171+
- numNodes: 500
172+
numInitPods: [500]
173+
numPodsToSchedule: 1000
174+
- numNodes: 5000
175+
numInitPods: [5000]
176+
numPodsToSchedule: 1000
177+
- template:
178+
desc: MixedSchedulingBasePod
179+
initPods:
180+
- podTemplatePath: config/pod-default.yaml
181+
- podTemplatePath: config/pod-with-pod-affinity.yaml
182+
- podTemplatePath: config/pod-with-pod-anti-affinity.yaml
183+
- podTemplatePath: config/pod-with-preferred-pod-affinity.yaml
184+
- podTemplatePath: config/pod-with-preferred-pod-anti-affinity.yaml
185+
podsToSchedule:
186+
podTemplatePath: config/pod-default.yaml
187+
params:
188+
- numNodes: 500
189+
numInitPods: [200, 200, 200, 200, 200]
190+
numPodsToSchedule: 1000
191+
- numNodes: 5000
192+
numInitPods: [2000, 2000, 2000, 2000, 2000]
193+
numPodsToSchedule: 1000

‎test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ kind: Pod
33
metadata:
44
generateName: affinity-pod-
55
labels:
6-
foo: ""
6+
color: blue
77
spec:
88
affinity:
99
podAffinity:
1010
requiredDuringSchedulingIgnoredDuringExecution:
1111
- labelSelector:
1212
matchLabels:
13-
foo: ""
13+
color: blue
1414
topologyKey: failure-domain.beta.kubernetes.io/zone
1515
namespaces: ["sched-test", "sched-setup"]
1616
containers:

‎test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
generateName: anti-affinity-pod-
55
labels:
66
color: green
7-
name: test
87
spec:
98
affinity:
109
podAntiAffinity:

‎test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: Pod
33
metadata:
44
generateName: preferred-affinity-pod-
55
labels:
6-
foo: ""
6+
color: red
77
spec:
88
affinity:
99
podAffinity:
1010
preferredDuringSchedulingIgnoredDuringExecution:
1111
- podAffinityTerm:
1212
labelSelector:
1313
matchLabels:
14-
foo: ""
14+
color: red
1515
topologyKey: kubernetes.io/hostname
1616
namespaces: ["sched-test", "sched-setup"]
1717
weight: 1

‎test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: Pod
33
metadata:
44
generateName: preferred-anti-affinity-pod-
55
labels:
6-
foo: ""
6+
color: yellow
77
spec:
88
affinity:
99
podAntiAffinity:
1010
preferredDuringSchedulingIgnoredDuringExecution:
1111
- podAffinityTerm:
1212
labelSelector:
1313
matchLabels:
14-
foo: ""
14+
color: yellow
1515
topologyKey: kubernetes.io/hostname
1616
namespaces: ["sched-test", "sched-setup"]
1717
weight: 1

0 commit comments

Comments
 (0)