Skip to content

Commit fb6e202

Browse files
xdu31xdu31
committed
Refactoring to use awscli-cl2-load-with-addons-slos pipeline
1 parent 428d50c commit fb6e202

File tree

7 files changed

+195
-298
lines changed

7 files changed

+195
-298
lines changed

‎tests/assets/eks-pod-identity/config.yaml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{{$namespacePrefix := DefaultParam .CL2_NAMESPACE_PREFIX "default"}}
2+
{{$namespaceCount := DefaultParam .CL2_NAMESPACE_COUNT 1}}
3+
{{$totalEksPodIdentityPods := DefaultParam .CL2_EKS_POD_IDENTITY_PODS 5000}}
4+
{{$timeoutEksPodIdentityPodCreation := DefaultParam .CL2_TIMEOUT_EKS_POD_IDENTITY_POD_CREATION "5m"}}
5+
{{$defaultQps := DefaultParam .CL2_DEFAULT_QPS 500}}
6+
{{$defaultBurst := DefaultParam .CL2_DEFAULT_BURST 1000}}
7+
{{$uniformQps := DefaultParam .CL2_UNIFORM_QPS 500}}
8+
9+
{{$SCHEDULER_THROUGHPUT_THRESHOLD := DefaultParam .CL2_SCHEDULER_THROUGHPUT_THRESHOLD 300}}
10+
11+
name: eks-pod-identity
12+
tuningSets:
13+
# default is a tuningset that is meant to be used when we don't have any specific requirements on pace of operations.
14+
- name: default
15+
globalQPSLoad:
16+
qps: {{$defaultQps}}
17+
burst: {{$defaultBurst}}
18+
- name: UniformQPS
19+
qpsLoad:
20+
qps: {{$uniformQps}}
21+
steps:
22+
- name: Creating eks pod identity measurements
23+
measurements:
24+
- Identifier: EksPodIdentityPodStartupLatency
25+
Method: PodStartupLatency
26+
Params:
27+
action: start
28+
labelSelector: group = eks-pod-identity
29+
threshold: 10s
30+
- Identifier: EksPodIdentity
31+
# TODO: Move to SchedulingThroughputPrometheus which requires cl2 prom stack setup as pre-req
32+
Method: SchedulingThroughput
33+
Params:
34+
action: start
35+
labelSelector: group = eks-pod-identity
36+
measurmentInterval: 1s
37+
# a pod identity association with (namespace: default, sa: default) is created as prerequisite
38+
- name: create eks pod identity pods
39+
phases:
40+
- namespaceRange:
41+
min: 1
42+
max: {{$namespaceCount}}
43+
baseName: {{$namespacePrefix}}
44+
replicasPerNamespace: {{$totalEksPodIdentityPods}}
45+
tuningSet: UniformQPS
46+
objectBundle:
47+
- basename: eks-pod-identity
48+
objectTemplatePath: pod-default.yaml
49+
templateFillMap:
50+
Group: eks-pod-identity
51+
- name: Waiting for eks pod identity pods to be created
52+
measurements:
53+
- Identifier: WaitForEksPodIdentityPods
54+
Method: WaitForRunningPods
55+
Params:
56+
action: gather
57+
timeout: {{$timeoutEksPodIdentityPodCreation}}
58+
desiredPodCount: {{$totalEksPodIdentityPods}}
59+
labelSelector: group = eks-pod-identity
60+
- name: Collecting eks pod identity measurements
61+
measurements:
62+
- Identifier: EksPodIdentityPodStartupLatency
63+
Method: PodStartupLatency
64+
Params:
65+
action: gather
66+
- Identifier: EksPodIdentity
67+
Method: SchedulingThroughput
68+
Params:
69+
action: gather
70+
enableViolations: true
71+
threshold: {{$SCHEDULER_THROUGHPUT_THRESHOLD}}
72+
- name: Delete eks pod identity pods
73+
phases:
74+
- namespaceRange:
75+
min: 1
76+
max: {{$namespaceCount}}
77+
baseName: {{$namespacePrefix}}
78+
replicasPerNamespace: 0
79+
tuningSet: default
80+
objectBundle:
81+
- basename: eks-pod-identity
82+
objectTemplatePath: pod-default.yaml
83+
templateFillMap:
84+
Group: eks-pod-identity

tests/assets/pia-trust-policy.json renamed to tests/assets/eks-pod-identity/pia-trust-policy.json

File renamed without changes.

‎tests/assets/eks-pod-identity/pod-default.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: v1
2+
kind: Pod
3+
metadata:
4+
generateName: eks-pod-identity-pod-churn-
5+
labels:
6+
group: {{.Group}}
7+
spec:
8+
containers:
9+
- image: registry.k8s.io/pause:3.9
10+
name: pause
11+
initContainers:
12+
- name: app-init
13+
image: amazon/aws-cli:latest
14+
command: ["/bin/sh"]
15+
args: ["-c", "aws sts get-caller-identity"]

‎tests/pipelines/eks/awscli-cl2-load-with-addons-slos.yaml‎

Lines changed: 79 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ spec:
2121
value: $(params.cluster-name)-node-role
2222
- name: launch-template-stack-name
2323
value: $(params.cluster-name)-launch-template
24+
- name: namespace-count
25+
value: $(params.namespace-count)
2426
retries: 10
2527
taskRef:
2628
kind: Task
@@ -61,6 +63,21 @@ spec:
6163
- default: https://raw.githubusercontent.com/awslabs/kubernetes-iteration-toolkit/main/tests/assets/eks_node_role.json
6264
name: node-role-cfn-url
6365
type: string
66+
- name: namespace-prefix
67+
default: "default"
68+
description: "The prefix of namespaces for EKS Pod Identity test."
69+
- name: namespace-count
70+
default: "1"
71+
description: "The number of namespaces for EKS Pod Identity test."
72+
- name: pia-trust-policy-url
73+
default: "https://raw.githubusercontent.com/awslabs/kubernetes-iteration-toolkit/main/tests/assets/eks-pod-identity/pia-trust-policy.json"
74+
type: string
75+
- name: pia-test-config-url
76+
default: "https://raw.githubusercontent.com/awslabs/kubernetes-iteration-toolkit/main/tests/assets/eks-pod-identity/eks-pod-identity/config.yaml"
77+
- name: pia-test-pod-spec-url
78+
default: "https://raw.githubusercontent.com/awslabs/kubernetes-iteration-toolkit/main/tests/assets/eks-pod-identity/eks-pod-identity/pod-default.yaml"
79+
- name: timeout-pia-pod-creation
80+
default: "5m"
6481
tasks:
6582
- name: slack-notification
6683
params:
@@ -221,6 +238,66 @@ spec:
221238
workspace: results
222239
- name: config
223240
workspace: config
241+
- name: create-pod-identity-association
242+
params:
243+
- name: cluster-name
244+
value: $(params.cluster-name)
245+
- name: endpoint
246+
value: $(params.endpoint)
247+
- name: namespace-prefix
248+
value: $(params.namespace-prefix)
249+
- name: namespace-count
250+
value: $(params.namespace-count)
251+
- name: pia-trust-policy-url
252+
value: $(params.pia-trust-policy-url)
253+
runAfter:
254+
- generate
255+
taskRef:
256+
kind: Task
257+
name: awscli-eks-pia-create
258+
workspaces:
259+
- name: config
260+
workspace: config
261+
- name: generate-eks-pod-identity
262+
params:
263+
- name: cl2-eks-pod-identity-pods
264+
value: $(params.cl2-eks-pod-identity-pods)
265+
- name: cl2-default-qps
266+
value: $(params.cl2-default-qps)
267+
- name: cl2-default-burst
268+
value: $(params.cl2-default-burst)
269+
- name: cl2-uniform-qps
270+
value: $(params.cl2-uniform-qps)
271+
- name: results-bucket
272+
value: $(params.results-bucket)
273+
- name: nodes
274+
value: $(params.desired-nodes)
275+
- name: cluster-name
276+
value: $(params.cluster-name)
277+
- name: namespace-prefix
278+
value: $(params.namespace-prefix)
279+
- name: namespace-count
280+
value: $(params.namespace-count)
281+
- name: pia-test-config-url
282+
value: $(params.pia-test-config-url)
283+
- name: pia-test-pod-spec-url
284+
value: $(params.pia-test-pod-spec-url)
285+
- name: timeout-pia-pod-creation
286+
value: $(params.timeout-pia-pod-creation)
287+
- name: amp-workspace-id
288+
value: '$(params.amp-workspace-id)'
289+
runAfter:
290+
- create-pod-identity-association
291+
taskRef:
292+
kind: Task
293+
name: load-pod-identity
294+
workspaces:
295+
- name: source
296+
workspace: source
297+
- name: results
298+
workspace: results
299+
- name: config
300+
workspace: config
224301
- name: cw-metrics
225302
params:
226303
- name: dimensions
@@ -230,11 +307,11 @@ spec:
230307
- name: namespace
231308
value: $(params.kubernetes-version)
232309
runAfter:
233-
- generate
310+
- generate-eks-pod-identity
234311
taskRef:
235312
kind: Task
236313
name: cloudwatch
237314
workspaces:
238315
- name: source
239316
- name: results
240-
- name: config
317+
- name: config

0 commit comments

Comments
 (0)