Skip to content

Commit 150ba97

Browse files
committed
Move all load manifests under the related modules
1 parent 7844e77 commit 150ba97

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

clusterloader2/testing/load/config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ steps:
143143
{{end}}
144144

145145
- module:
146-
path: modules/services.yaml
146+
path: modules/services/config.yaml
147147
params:
148148
actionName: "Creating"
149149
namespaces: {{$namespaces}}
@@ -162,7 +162,7 @@ steps:
162162
# Moved from reconcile-objects/config.yaml to mitigate https://github.com/kubernetes/kubernetes/issues/96635.
163163
# TODO(https://github.com/kubernetes/perf-tests/issues/1823): Merge back to reconcile-objects/config.yaml once the k/k bug is fixed.
164164
- module:
165-
path: /modules/configmaps-secrets.yaml
165+
path: /modules/configmaps-secrets/config.yaml
166166
params:
167167
actionName: create
168168
tuningSet: default
@@ -224,7 +224,7 @@ steps:
224224
{{if not $IS_SMALL_CLUSTER}}
225225
# BEGIN scheduler throughput
226226
- module:
227-
path: modules/scheduler-throughput.yaml
227+
path: modules/scheduler-throughput/config.yaml
228228
params:
229229
action: create
230230
namespaces: {{$namespaces}}
@@ -413,7 +413,7 @@ steps:
413413
{{end}}
414414

415415
- module:
416-
path: /modules/configmaps-secrets.yaml
416+
path: /modules/configmaps-secrets/config.yaml
417417
params:
418418
actionName: delete
419419
tuningSet: default
@@ -431,7 +431,7 @@ steps:
431431
objectTemplatePath: daemonset-priorityclass.yaml
432432

433433
- module:
434-
path: modules/services.yaml
434+
path: /modules/services/config.yaml
435435
params:
436436
actionName: "Deleting"
437437
namespaces: {{$namespaces}}

clusterloader2/testing/load/modules/configmaps-secrets.yaml renamed to clusterloader2/testing/load/modules/configmaps-secrets/config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@ steps:
2020
tuningSet: {{$tuningSet}}
2121
objectBundle:
2222
- basename: big-deployment
23-
objectTemplatePath: configmap.yaml
23+
objectTemplatePath: /modules/configmaps-secrets/configmap.yaml
2424
- basename: big-deployment
25-
objectTemplatePath: secret.yaml
25+
objectTemplatePath: /modules/configmaps-secrets/secret.yaml
2626
- namespaceRange:
2727
min: 1
2828
max: {{$namespaces}}
2929
replicasPerNamespace: {{$mediumDeploymentsPerNamespace}}
3030
tuningSet: {{$tuningSet}}
3131
objectBundle:
3232
- basename: medium-deployment
33-
objectTemplatePath: configmap.yaml
33+
objectTemplatePath: /modules/configmaps-secrets/configmap.yaml
3434
- basename: medium-deployment
35-
objectTemplatePath: secret.yaml
35+
objectTemplatePath: /modules/configmaps-secrets/secret.yaml
3636
- namespaceRange:
3737
min: 1
3838
max: {{$namespaces}}
3939
replicasPerNamespace: {{$smallDeploymentsPerNamespace}}
4040
tuningSet: {{$tuningSet}}
4141
objectBundle:
4242
- basename: small-deployment
43-
objectTemplatePath: configmap.yaml
43+
objectTemplatePath: /modules/configmaps-secrets/configmap.yaml
4444
- basename: small-deployment
45-
objectTemplatePath: secret.yaml
45+
objectTemplatePath: /modules/configmaps-secrets/secret.yaml

clusterloader2/testing/load/configmap.yaml renamed to clusterloader2/testing/load/modules/configmaps-secrets/configmap.yaml

File renamed without changes.

clusterloader2/testing/load/secret.yaml renamed to clusterloader2/testing/load/modules/configmaps-secrets/secret.yaml

File renamed without changes.

clusterloader2/testing/load/modules/pod-startup-latency.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ steps:
4848
tuningSet: Uniform5qps
4949
objectBundle:
5050
- basename: latency-deployment
51-
objectTemplatePath: simple-deployment.yaml
51+
objectTemplatePath: /modules/scheduler-throughput/simple-deployment.yaml
5252
templateFillMap:
5353
Replicas: 1
5454
Group: latency
@@ -70,7 +70,7 @@ steps:
7070
tuningSet: default
7171
objectBundle:
7272
- basename: latency-deployment
73-
objectTemplatePath: simple-deployment.yaml
73+
objectTemplatePath: /modules/scheduler-throughput/simple-deployment.yaml
7474
- name: Waiting for latency pods to be deleted
7575
measurements:
7676
- Identifier: WaitForRunningLatencyDeployments

clusterloader2/testing/load/modules/scheduler-throughput.yaml renamed to clusterloader2/testing/load/modules/scheduler-throughput/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ steps:
5353
tuningSet: default
5454
objectBundle:
5555
- basename: scheduler-throughput-deployment
56-
objectTemplatePath: simple-deployment.yaml
56+
objectTemplatePath: /modules/scheduler-throughput/simple-deployment.yaml
5757
templateFillMap:
5858
Replicas: {{$schedulerThroughputPodsPerDeployment}}
5959
Group: scheduler-throughput

clusterloader2/testing/load/simple-deployment.yaml renamed to clusterloader2/testing/load/modules/scheduler-throughput/simple-deployment.yaml

File renamed without changes.

clusterloader2/testing/load/modules/services.yaml renamed to clusterloader2/testing/load/modules/services/config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ steps:
1717
tuningSet: Sequence
1818
objectBundle:
1919
- basename: big-service
20-
objectTemplatePath: service.yaml
20+
objectTemplatePath: /modules/services/service.yaml
2121
- namespaceRange:
2222
min: 1
2323
max: {{$namespaces}}
2424
replicasPerNamespace: {{$mediumServicesPerNamespace}}
2525
tuningSet: Sequence
2626
objectBundle:
2727
- basename: medium-service
28-
objectTemplatePath: service.yaml
28+
objectTemplatePath: /modules/services/service.yaml
2929
- namespaceRange:
3030
min: 1
3131
max: {{$namespaces}}
3232
replicasPerNamespace: {{$smallServicesPerNamespace}}
3333
tuningSet: Sequence
3434
objectBundle:
3535
- basename: small-service
36-
objectTemplatePath: service.yaml
36+
objectTemplatePath: /modules/services/service.yaml
File renamed without changes.

0 commit comments

Comments
 (0)