Skip to content

Commit 3e3f547

Browse files
committed
Add separate configmaps-secrets module
1 parent 37d776f commit 3e3f547

File tree

3 files changed

+73
-12
lines changed

3 files changed

+73
-12
lines changed

clusterloader2/testing/load/config.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,17 @@ tuningSets:
8484
parallelismLimitedLoad:
8585
parallelismLimit: {{$schedulerThroughputNamespaces}}
8686
# TODO(https://github.com/kubernetes/perf-tests/issues/1024): This TuningSet is used only for pod-startup-latency, get rid of it
87+
# Uniform5qps: for each running phase, use 5 qps.
8788
- name: Uniform5qps
8889
qpsLoad:
8990
qps: 5
91+
# Global100qps: use 100 qps globally:
92+
# * split equally qps among all running phases
93+
# * if some phase finishes, other phases will get more qps.
94+
- name: Global100qps
95+
globalQPSLoad:
96+
qps: 100
97+
burst: 1
9098
- name: RandomizedSaturationTimeLimited
9199
RandomizedTimeLimitedLoad:
92100
timeLimit: {{$saturationTime}}s
@@ -130,6 +138,16 @@ steps:
130138
- basename: daemonset-priorityclass
131139
objectTemplatePath: daemonset-priorityclass.yaml
132140

141+
- module:
142+
path: /modules/configmaps-secrets.yaml
143+
params:
144+
actionName: create
145+
tuningSet: Global100qps
146+
namespaces: {{$namespaces}}
147+
bigDeploymentsPerNamespace: {{$bigDeploymentsPerNamespace}}
148+
mediumDeploymentsPerNamespace: {{$mediumDeploymentsPerNamespace}}
149+
smallDeploymentsPerNamespace: {{$smallDeploymentsPerNamespace}}
150+
133151
- module:
134152
path: /modules/reconcile-objects.yaml
135153
params:
@@ -306,6 +324,16 @@ steps:
306324
pvSmallStatefulSetSize: {{$SMALL_STATEFUL_SETS_PER_NAMESPACE}}
307325
pvMediumStatefulSetSize: {{$MEDIUM_STATEFUL_SETS_PER_NAMESPACE}}
308326

327+
- module:
328+
path: /modules/configmaps-secrets.yaml
329+
params:
330+
actionName: delete
331+
tuningSet: Global100qps
332+
namespaces: {{$namespaces}}
333+
bigDeploymentsPerNamespace: {{$bigDeploymentsPerNamespace}}
334+
mediumDeploymentsPerNamespace: {{$mediumDeploymentsPerNamespace}}
335+
smallDeploymentsPerNamespace: {{$smallDeploymentsPerNamespace}}
336+
309337
- name: Deleting PriorityClass for DaemonSets
310338
phases:
311339
- replicasPerNamespace: 0
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# To mitigate https://github.com/kubernetes/kubernetes/issues/96635 we have to delete
2+
# configmaps and secrets only AFTER the pods using that configmap/secret are deleted.
3+
# TODO(mborsz): Merge this back to reconcile-objects.yaml once the issue above is fixed.
4+
5+
{{$actionName := printf "%s objects" .actionName}}
6+
{{$namespaces := .namespaces}}
7+
{{$tuningSet := .tuningSet}}
8+
9+
{{$bigDeploymentsPerNamespace := .bigDeploymentsPerNamespace}}
10+
{{$mediumDeploymentsPerNamespace := .mediumDeploymentsPerNamespace}}
11+
{{$smallDeploymentsPerNamespace := .smallDeploymentsPerNamespace}}
12+
13+
steps:
14+
- name: {{$actionName}} configmaps and secrets
15+
phases:
16+
- namespaceRange:
17+
min: 1
18+
max: {{$namespaces}}
19+
replicasPerNamespace: {{$bigDeploymentsPerNamespace}}
20+
tuningSet: {{$tuningSet}}
21+
objectBundle:
22+
- basename: big-deployment
23+
objectTemplatePath: configmap.yaml
24+
- basename: big-deployment
25+
objectTemplatePath: secret.yaml
26+
- namespaceRange:
27+
min: 1
28+
max: {{$namespaces}}
29+
replicasPerNamespace: {{$mediumDeploymentsPerNamespace}}
30+
tuningSet: {{$tuningSet}}
31+
objectBundle:
32+
- basename: medium-deployment
33+
objectTemplatePath: configmap.yaml
34+
- basename: medium-deployment
35+
objectTemplatePath: secret.yaml
36+
- namespaceRange:
37+
min: 1
38+
max: {{$namespaces}}
39+
replicasPerNamespace: {{$smallDeploymentsPerNamespace}}
40+
tuningSet: {{$tuningSet}}
41+
objectBundle:
42+
- basename: small-deployment
43+
objectTemplatePath: configmap.yaml
44+
- basename: small-deployment
45+
objectTemplatePath: secret.yaml

clusterloader2/testing/load/modules/reconcile-objects.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,6 @@ steps:
9696
replicasPerNamespace: {{$bigDeploymentsPerNamespace}}
9797
tuningSet: {{$tuningSet}}
9898
objectBundle:
99-
- basename: big-deployment
100-
objectTemplatePath: configmap.yaml
101-
- basename: big-deployment
102-
objectTemplatePath: secret.yaml
10399
{{if $ENABLE_NETWORKPOLICIES}}
104100
- basename: big-deployment
105101
objectTemplatePath: networkpolicy.yaml
@@ -119,10 +115,6 @@ steps:
119115
replicasPerNamespace: {{$mediumDeploymentsPerNamespace}}
120116
tuningSet: {{$tuningSet}}
121117
objectBundle:
122-
- basename: medium-deployment
123-
objectTemplatePath: configmap.yaml
124-
- basename: medium-deployment
125-
objectTemplatePath: secret.yaml
126118
{{if $ENABLE_NETWORKPOLICIES}}
127119
- basename: medium-deployment
128120
objectTemplatePath: networkpolicy.yaml
@@ -141,10 +133,6 @@ steps:
141133
replicasPerNamespace: {{$smallDeploymentsPerNamespace}}
142134
tuningSet: {{$tuningSet}}
143135
objectBundle:
144-
- basename: small-deployment
145-
objectTemplatePath: configmap.yaml
146-
- basename: small-deployment
147-
objectTemplatePath: secret.yaml
148136
{{if $ENABLE_NETWORKPOLICIES}}
149137
- basename: small-deployment
150138
objectTemplatePath: networkpolicy.yaml

0 commit comments

Comments
 (0)