Skip to content

Commit 3c051fc

Browse files
linkilinki
authored
Merge pull request #9033 from zalando-incubator/e2e-refactor
Avoid problem of anchor-merging lists by using multiple envFroms
2 parents 67f7cda + 7cb6390 commit 3c051fc

File tree

2 files changed

+63
-148
lines changed

2 files changed

+63
-148
lines changed

‎delivery.yaml

Lines changed: 32 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pipeline:
4646
process: microservice_standard_test
4747
config:
4848
apply_manifests:
49-
env: &apply_env_aws
49+
env: &apply_env
5050
- name: DEPLOYMENT_PATH
5151
value: test/e2e
5252
- name: IAM_ROLE_ARN
@@ -55,10 +55,6 @@ pipeline:
5555
value: kubernetes
5656
- name: COMPONENT
5757
value: e2e
58-
- name: CLUSTER_PROVIDER
59-
value: zalando-aws
60-
- name: E2E_SKIP_CLUSTER_UPDATE
61-
value: "false"
6258
end2end_tests:
6359
metadata:
6460
name: e2e
@@ -76,131 +72,18 @@ pipeline:
7672
args:
7773
- create-cluster
7874
env: &e2e_env
79-
- name: CLUSTER_DOMAIN
80-
value: teapot-e2e.zalan.do
81-
- name: CLUSTER_DOMAIN_INTERNAL
82-
value: ingress.cluster.local
83-
- name: RESULT_BUCKET
84-
value: "teapot-kubernetes-e2e-results"
85-
- name: ETCD_ENDPOINTS
86-
value: "https://etcd-server.etcd.teapot-e2e.zalan.do:2479"
87-
- name: CLUSTER_PROVIDER
88-
valueFrom:
89-
configMapKeyRef:
90-
name: kubernetes-e2e-config
91-
key: "CLUSTER_PROVIDER"
92-
- name: E2E_SKIP_CLUSTER_UPDATE
93-
valueFrom:
94-
configMapKeyRef:
95-
name: kubernetes-e2e-config
96-
key: "E2E_SKIP_CLUSTER_UPDATE"
97-
- name: SKIPPER_OPA_ENABLED
98-
value: "true"
99-
- name: HOSTED_ZONE
100-
valueFrom:
101-
configMapKeyRef:
102-
name: kubernetes-e2e-config
103-
key: "HOSTED_ZONE"
104-
- name: REGION
105-
valueFrom:
106-
configMapKeyRef:
107-
name: kubernetes-e2e-config
108-
key: "REGION"
109-
- name: AWS_ACCOUNT
110-
valueFrom:
111-
secretKeyRef:
112-
name: kubernetes-e2e-config-secret
113-
key: "AWS_ACCOUNT"
114-
- name: AWS_REGION
115-
valueFrom:
116-
configMapKeyRef:
117-
name: kubernetes-e2e-config
118-
key: "REGION"
119-
- name: ZMON_ROOT_ACCOUNT_ROLE
120-
valueFrom:
121-
secretKeyRef:
122-
name: kubernetes-e2e-config-secret
123-
key: "ZMON_ROOT_ACCOUNT_ROLE"
124-
- name: AUDITTRAIL_ROOT_ACCOUNT_ROLE
125-
valueFrom:
126-
secretKeyRef:
127-
name: kubernetes-e2e-config-secret
128-
key: "AUDITTRAIL_ROOT_ACCOUNT_ROLE"
129-
- name: SESSION_MANAGER_DESTINATION_ARN
130-
valueFrom:
131-
secretKeyRef:
132-
name: kubernetes-e2e-config-secret
133-
key: "SESSION_MANAGER_DESTINATION_ARN"
134-
- name: APISERVER_BUSINESS_PARTNER_IDS
135-
valueFrom:
136-
secretKeyRef:
137-
name: kubernetes-e2e-config-secret
138-
key: "APISERVER_BUSINESS_PARTNER_IDS"
139-
- name: LIGHTSTEP_TOKEN
140-
valueFrom:
141-
secretKeyRef:
142-
name: kubernetes-e2e-config-secret
143-
key: "LIGHTSTEP_TOKEN"
144-
- name: OWNER
145-
valueFrom:
146-
secretKeyRef:
147-
name: kubernetes-e2e-config-secret
148-
key: "OWNER"
149-
- name: VPC_ID
150-
valueFrom:
151-
secretKeyRef:
152-
name: kubernetes-e2e-config-secret
153-
key: "VPC_ID"
154-
- name: EFS_ID
155-
valueFrom:
156-
secretKeyRef:
157-
name: kubernetes-e2e-config-secret
158-
key: "EFS_ID"
159-
- name: ETCD_CLIENT_CA_CERT
160-
valueFrom:
161-
secretKeyRef:
162-
name: kubernetes-e2e-config-secret
163-
key: "ETCD_CLIENT_CA_CERT"
164-
- name: ETCD_CLIENT_CA_KEY
165-
valueFrom:
166-
secretKeyRef:
167-
name: kubernetes-e2e-config-secret
168-
key: "ETCD_CLIENT_CA_KEY"
169-
- name: ETCD_SCALYR_KEY
170-
valueFrom:
171-
secretKeyRef:
172-
name: kubernetes-e2e-config-secret
173-
key: "ETCD_SCALYR_KEY"
174-
- name: OKTA_AUTH_ISSUER_URL
175-
valueFrom:
176-
secretKeyRef:
177-
name: kubernetes-e2e-config-secret
178-
key: "OKTA_AUTH_ISSUER_URL"
179-
- name: STYRA_TOKEN
180-
valueFrom:
181-
secretKeyRef:
182-
name: kubernetes-e2e-config-secret
183-
key: "STYRA_TOKEN"
184-
- name: SKIPPER_OPA_BUCKET_ARN
185-
valueFrom:
186-
secretKeyRef:
187-
name: kubernetes-e2e-config-secret
188-
key: "SKIPPER_OPA_BUCKET_ARN"
189-
- name: SKIPPER_OPA_OBSERVABILITY_URL
190-
valueFrom:
191-
secretKeyRef:
192-
name: kubernetes-e2e-config-secret
193-
key: "SKIPPER_OPA_OBSERVABILITY_URL"
194-
- name: SKIPPER_OPA_BUNDLES_URL
195-
valueFrom:
196-
secretKeyRef:
197-
name: kubernetes-e2e-config-secret
198-
key: "SKIPPER_OPA_BUNDLES_URL"
19975
- name: CLUSTER_ADMIN_TOKEN
20076
valueFrom:
20177
secretKeyRef:
20278
name: kubernetes-e2e-credentials
20379
key: "cluster-token-secret"
80+
envFrom: &e2e_env_from_aws
81+
- configMapRef:
82+
name: kubernetes-e2e-config-provider-aws
83+
- configMapRef:
84+
name: kubernetes-e2e-config
85+
- secretRef:
86+
name: kubernetes-e2e-config-secret
20487
resources:
20588
limits:
20689
cpu: 500m
@@ -220,7 +103,7 @@ pipeline:
220103
process: microservice_standard_test
221104
config:
222105
apply_manifests:
223-
env: *apply_env_aws
106+
env: *apply_env
224107
end2end_tests:
225108
metadata:
226109
name: e2e
@@ -238,6 +121,7 @@ pipeline:
238121
args:
239122
- e2e
240123
env: *e2e_env
124+
envFrom: *e2e_env_from_aws
241125
resources:
242126
limits:
243127
cpu: 2
@@ -257,7 +141,7 @@ pipeline:
257141
process: microservice_standard_test
258142
config:
259143
apply_manifests:
260-
env: *apply_env_aws
144+
env: *apply_env
261145
end2end_tests:
262146
metadata:
263147
name: e2e
@@ -275,6 +159,7 @@ pipeline:
275159
args:
276160
- loadtest-e2e
277161
env: *e2e_env
162+
envFrom: *e2e_env_from_aws
278163
resources:
279164
limits:
280165
cpu: 1000m
@@ -294,7 +179,7 @@ pipeline:
294179
process: microservice_standard_test
295180
config:
296181
apply_manifests:
297-
env: *apply_env_aws
182+
env: *apply_env
298183
end2end_tests:
299184
metadata:
300185
name: e2e
@@ -312,6 +197,7 @@ pipeline:
312197
args:
313198
- stackset-e2e
314199
env: *e2e_env
200+
envFrom: *e2e_env_from_aws
315201
resources:
316202
limits:
317203
cpu: 2
@@ -333,7 +219,7 @@ pipeline:
333219
process: microservice_standard_test
334220
config:
335221
apply_manifests:
336-
env: *apply_env_aws
222+
env: *apply_env
337223
end2end_tests:
338224
metadata:
339225
name: e2e
@@ -351,6 +237,7 @@ pipeline:
351237
args:
352238
- decommission-cluster
353239
env: *e2e_env
240+
envFrom: *e2e_env_from_aws
354241
resources:
355242
limits:
356243
cpu: 500m
@@ -370,19 +257,7 @@ pipeline:
370257
process: microservice_standard_test
371258
config:
372259
apply_manifests:
373-
env: &apply_env_eks
374-
- name: DEPLOYMENT_PATH
375-
value: test/e2e
376-
- name: IAM_ROLE_ARN
377-
value: "arn:aws:iam::925511348110:role/cluster-lifecycle-manager-entrypoint"
378-
- name: APPLICATION
379-
value: kubernetes
380-
- name: COMPONENT
381-
value: e2e
382-
- name: CLUSTER_PROVIDER
383-
value: zalando-eks
384-
- name: E2E_SKIP_CLUSTER_UPDATE
385-
value: "true"
260+
env: *apply_env
386261
end2end_tests:
387262
metadata:
388263
name: e2e
@@ -400,6 +275,13 @@ pipeline:
400275
args:
401276
- create-cluster
402277
env: *e2e_env
278+
envFrom: &e2e_env_from_eks
279+
- configMapRef:
280+
name: kubernetes-e2e-config-provider-eks
281+
- configMapRef:
282+
name: kubernetes-e2e-config
283+
- secretRef:
284+
name: kubernetes-e2e-config-secret
403285
resources:
404286
limits:
405287
cpu: 500m
@@ -419,7 +301,7 @@ pipeline:
419301
process: microservice_standard_test
420302
config:
421303
apply_manifests:
422-
env: *apply_env_eks
304+
env: *apply_env
423305
end2end_tests:
424306
metadata:
425307
name: e2e
@@ -437,6 +319,7 @@ pipeline:
437319
args:
438320
- e2e
439321
env: *e2e_env
322+
envFrom: *e2e_env_from_eks
440323
resources:
441324
limits:
442325
cpu: 2
@@ -456,7 +339,7 @@ pipeline:
456339
process: microservice_standard_test
457340
config:
458341
apply_manifests:
459-
env: *apply_env_eks
342+
env: *apply_env
460343
end2end_tests:
461344
metadata:
462345
name: e2e
@@ -474,6 +357,7 @@ pipeline:
474357
args:
475358
- loadtest-e2e
476359
env: *e2e_env
360+
envFrom: *e2e_env_from_eks
477361
resources:
478362
limits:
479363
cpu: 1000m
@@ -493,7 +377,7 @@ pipeline:
493377
process: microservice_standard_test
494378
config:
495379
apply_manifests:
496-
env: *apply_env_eks
380+
env: *apply_env
497381
end2end_tests:
498382
metadata:
499383
name: e2e
@@ -511,6 +395,7 @@ pipeline:
511395
args:
512396
- stackset-e2e
513397
env: *e2e_env
398+
envFrom: *e2e_env_from_eks
514399
resources:
515400
limits:
516401
cpu: 2
@@ -532,7 +417,7 @@ pipeline:
532417
process: microservice_standard_test
533418
config:
534419
apply_manifests:
535-
env: *apply_env_eks
420+
env: *apply_env
536421
end2end_tests:
537422
metadata:
538423
name: e2e
@@ -550,6 +435,7 @@ pipeline:
550435
args:
551436
- decommission-cluster
552437
env: *e2e_env
438+
envFrom: *e2e_env_from_eks
553439
resources:
554440
limits:
555441
cpu: 500m

‎test/e2e/apply/config.yaml

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,34 @@ metadata:
88
data:
99
HOSTED_ZONE: "teapot-e2e.zalan.do"
1010
REGION: "eu-central-1"
11-
CLUSTER_PROVIDER: "{{{CLUSTER_PROVIDER}}}"
12-
E2E_SKIP_CLUSTER_UPDATE: "{{{E2E_SKIP_CLUSTER_UPDATE}}}"
11+
AWS_REGION: "eu-central-1"
12+
CLUSTER_DOMAIN: "teapot-e2e.zalan.do"
13+
CLUSTER_DOMAIN_INTERNAL: "ingress.cluster.local"
14+
RESULT_BUCKET: "teapot-kubernetes-e2e-results"
15+
ETCD_ENDPOINTS: "https://etcd-server.etcd.teapot-e2e.zalan.do:2479"
16+
SKIPPER_OPA_ENABLED: "true"
17+
18+
---
19+
20+
apiVersion: v1
21+
kind: ConfigMap
22+
metadata:
23+
labels:
24+
application: "{{{APPLICATION}}}"
25+
component: "{{{COMPONENT}}}"
26+
name: "{{{APPLICATION}}}-{{{COMPONENT}}}-config-provider-aws"
27+
data:
28+
CLUSTER_PROVIDER: "zalando-aws"
29+
30+
---
31+
32+
apiVersion: v1
33+
kind: ConfigMap
34+
metadata:
35+
labels:
36+
application: "{{{APPLICATION}}}"
37+
component: "{{{COMPONENT}}}"
38+
name: "{{{APPLICATION}}}-{{{COMPONENT}}}-config-provider-eks"
39+
data:
40+
CLUSTER_PROVIDER: "zalando-eks"
41+
E2E_SKIP_CLUSTER_UPDATE: "true"

0 commit comments

Comments
 (0)