Skip to content

Commit 7e2935b

Browse files
fmountfmount
committed
Kuttl test to cover an edge deployment scenario
This patch introduces a kuttl test that is supposed to cover an Edge use case deployment. It asserts that the required resources exist and the Pods are available. This change also updates the Edge sample to make sure it reflects the right type. Signed-off-by: Francesco Pantano <[email protected]>
1 parent 47e8a3c commit 7e2935b

File tree

5 files changed

+458
-5
lines changed

5 files changed

+458
-5
lines changed

‎config/samples/layout/edge/glance_v1beta1_glance.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ spec:
99
debug = true
1010
databaseInstance: openstack
1111
databaseAccount: glance
12-
keystoneEndpoint: central
12+
keystoneEndpoint: default
1313
glanceAPIs:
14-
central:
14+
default:
1515
preserveJobs: false
1616
replicas: 1
17-
type: single
18-
edge1:
17+
type: split
18+
az1:
1919
preserveJobs: false
2020
replicas: 1
2121
type: single
22-
edge2:
22+
az2:
2323
preserveJobs: false
2424
replicas: 1
2525
type: single

‎test/kuttl/tests/glance_edge/01-assert.yaml‎

Lines changed: 374 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,374 @@
1+
#
2+
# Check for:
3+
# - Glance CR
4+
# - GlanceAPI glance-default-external CR
5+
# - GlanceAPI glance-default-internal CR
6+
# - GlanceAPI glance-az1-edge CR
7+
# - GlanceAPI glance-az2-edge CR
8+
# - GlanceAPI glance-default-external-api StatefulSet
9+
# - GlanceAPI glance-default-internal-api StatefulSet
10+
# - GlanceAPI glance-az1-edge-api StatefulSet
11+
# - GlanceAPI glance-az2-edge-api StatefulSet
12+
# - glance-default-internal service
13+
# - glance-default-public service
14+
# - glance-default-headless service
15+
# - glance-az1-internal service
16+
# - glance-az1-headless service
17+
# - glance-az2-internal service
18+
# - glance-az2-headless service
19+
20+
apiVersion: glance.openstack.org/v1beta1
21+
kind: Glance
22+
metadata:
23+
name: glance
24+
spec:
25+
serviceUser: glance
26+
databaseInstance: openstack
27+
databaseAccount: glance
28+
glanceAPIs:
29+
default:
30+
replicas: 1
31+
az1:
32+
replicas: 1
33+
az2:
34+
replicas: 1
35+
secret: osp-secret
36+
storageRequest: 10G
37+
---
38+
apiVersion: glance.openstack.org/v1beta1
39+
kind: GlanceAPI
40+
metadata:
41+
name: glance-default-external
42+
spec:
43+
apiType: external
44+
databaseAccount: glance
45+
passwordSelectors:
46+
service: GlancePassword
47+
replicas: 1
48+
---
49+
apiVersion: glance.openstack.org/v1beta1
50+
kind: GlanceAPI
51+
metadata:
52+
name: glance-default-internal
53+
spec:
54+
apiType: internal
55+
databaseAccount: glance
56+
passwordSelectors:
57+
service: GlancePassword
58+
replicas: 1
59+
---
60+
apiVersion: glance.openstack.org/v1beta1
61+
kind: GlanceAPI
62+
metadata:
63+
name: glance-az1-edge
64+
spec:
65+
apiType: edge
66+
databaseAccount: glance
67+
passwordSelectors:
68+
service: GlancePassword
69+
replicas: 1
70+
---
71+
apiVersion: glance.openstack.org/v1beta1
72+
kind: GlanceAPI
73+
metadata:
74+
name: glance-az2-edge
75+
spec:
76+
apiType: edge
77+
databaseAccount: glance
78+
passwordSelectors:
79+
service: GlancePassword
80+
replicas: 1
81+
---
82+
apiVersion: apps/v1
83+
kind: StatefulSet
84+
metadata:
85+
name: glance-default-external-api
86+
spec:
87+
replicas: 1
88+
selector:
89+
matchLabels:
90+
service: glance
91+
template:
92+
metadata:
93+
labels:
94+
service: glance
95+
spec:
96+
containers:
97+
- args:
98+
- --single-child
99+
- --
100+
- /usr/bin/tail
101+
- -n+1
102+
- -F
103+
- /var/log/glance/glance-default-external.log
104+
command:
105+
- /usr/bin/dumb-init
106+
name: glance-log
107+
- args:
108+
- -c
109+
- /usr/sbin/httpd -DFOREGROUND
110+
command:
111+
- /bin/bash
112+
name: glance-httpd
113+
- args:
114+
- -c
115+
- /usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start
116+
command:
117+
- /bin/bash
118+
name: glance-api
119+
serviceAccount: glance-glance
120+
serviceAccountName: glance-glance
121+
status:
122+
availableReplicas: 1
123+
replicas: 1
124+
---
125+
apiVersion: apps/v1
126+
kind: StatefulSet
127+
metadata:
128+
name: glance-default-internal-api
129+
spec:
130+
replicas: 1
131+
selector:
132+
matchLabels:
133+
service: glance
134+
template:
135+
metadata:
136+
labels:
137+
service: glance
138+
spec:
139+
containers:
140+
- args:
141+
- --single-child
142+
- --
143+
- /usr/bin/tail
144+
- -n+1
145+
- -F
146+
- /var/log/glance/glance-default-internal.log
147+
command:
148+
- /usr/bin/dumb-init
149+
name: glance-log
150+
- args:
151+
- -c
152+
- /usr/sbin/httpd -DFOREGROUND
153+
command:
154+
- /bin/bash
155+
name: glance-httpd
156+
- args:
157+
- -c
158+
- /usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start
159+
command:
160+
- /bin/bash
161+
name: glance-api
162+
serviceAccount: glance-glance
163+
serviceAccountName: glance-glance
164+
status:
165+
availableReplicas: 1
166+
replicas: 1
167+
---
168+
apiVersion: apps/v1
169+
kind: StatefulSet
170+
metadata:
171+
name: glance-az1-edge-api
172+
spec:
173+
replicas: 1
174+
selector:
175+
matchLabels:
176+
service: glance
177+
template:
178+
metadata:
179+
labels:
180+
service: glance
181+
spec:
182+
containers:
183+
- args:
184+
- --single-child
185+
- --
186+
- /usr/bin/tail
187+
- -n+1
188+
- -F
189+
- /var/log/glance/glance-az1-edge.log
190+
command:
191+
- /usr/bin/dumb-init
192+
name: glance-log
193+
- args:
194+
- -c
195+
- /usr/sbin/httpd -DFOREGROUND
196+
command:
197+
- /bin/bash
198+
name: glance-httpd
199+
- args:
200+
- -c
201+
- /usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start
202+
command:
203+
- /bin/bash
204+
name: glance-api
205+
serviceAccount: glance-glance
206+
serviceAccountName: glance-glance
207+
status:
208+
replicas: 1
209+
---
210+
apiVersion: apps/v1
211+
kind: StatefulSet
212+
metadata:
213+
name: glance-az2-edge-api
214+
spec:
215+
replicas: 1
216+
selector:
217+
matchLabels:
218+
service: glance
219+
template:
220+
metadata:
221+
labels:
222+
service: glance
223+
spec:
224+
containers:
225+
- args:
226+
- --single-child
227+
- --
228+
- /usr/bin/tail
229+
- -n+1
230+
- -F
231+
- /var/log/glance/glance-az2-edge.log
232+
command:
233+
- /usr/bin/dumb-init
234+
name: glance-log
235+
- args:
236+
- -c
237+
- /usr/sbin/httpd -DFOREGROUND
238+
command:
239+
- /bin/bash
240+
name: glance-httpd
241+
- args:
242+
- -c
243+
- /usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start
244+
command:
245+
- /bin/bash
246+
name: glance-api
247+
serviceAccount: glance-glance
248+
serviceAccountName: glance-glance
249+
status:
250+
replicas: 1
251+
---
252+
apiVersion: v1
253+
kind: Service
254+
metadata:
255+
name: glance-default-internal
256+
labels:
257+
endpoint: internal
258+
service: glance
259+
spec:
260+
ports:
261+
- name: glance-default-internal
262+
port: 9292
263+
protocol: TCP
264+
targetPort: 9292
265+
selector:
266+
service: glance
267+
---
268+
apiVersion: v1
269+
kind: Service
270+
metadata:
271+
name: glance-default-public
272+
labels:
273+
endpoint: public
274+
service: glance
275+
spec:
276+
ports:
277+
- name: glance-default-public
278+
port: 9292
279+
protocol: TCP
280+
targetPort: 9292
281+
selector:
282+
service: glance
283+
---
284+
apiVersion: v1
285+
kind: Service
286+
metadata:
287+
name: glance-default-external-api
288+
labels:
289+
service: glance
290+
spec:
291+
ports:
292+
- name: glance-default-external-api
293+
port: 9292
294+
protocol: TCP
295+
targetPort: 9292
296+
selector:
297+
service: glance
298+
---
299+
apiVersion: v1
300+
kind: Service
301+
metadata:
302+
name: glance-default-internal-api
303+
labels:
304+
service: glance
305+
spec:
306+
ports:
307+
- name: glance-default-internal-api
308+
port: 9292
309+
protocol: TCP
310+
targetPort: 9292
311+
selector:
312+
service: glance
313+
---
314+
apiVersion: v1
315+
kind: Service
316+
metadata:
317+
name: glance-az1-internal
318+
labels:
319+
service: glance
320+
spec:
321+
ports:
322+
- name: glance-az1-internal
323+
port: 9292
324+
protocol: TCP
325+
targetPort: 9292
326+
selector:
327+
service: glance
328+
---
329+
# headless service for az1
330+
apiVersion: v1
331+
kind: Service
332+
metadata:
333+
name: glance-az1-edge-api
334+
labels:
335+
service: glance
336+
spec:
337+
ports:
338+
- name: glance-az1-edge-api
339+
port: 9292
340+
protocol: TCP
341+
targetPort: 9292
342+
selector:
343+
service: glance
344+
---
345+
apiVersion: v1
346+
kind: Service
347+
metadata:
348+
name: glance-az2-internal
349+
labels:
350+
service: glance
351+
spec:
352+
ports:
353+
- name: glance-az2-internal
354+
port: 9292
355+
protocol: TCP
356+
targetPort: 9292
357+
selector:
358+
service: glance
359+
---
360+
# headless service for az2
361+
apiVersion: v1
362+
kind: Service
363+
metadata:
364+
name: glance-az2-edge-api
365+
labels:
366+
service: glance
367+
spec:
368+
ports:
369+
- name: glance-az2-edge-api
370+
port: 9292
371+
protocol: TCP
372+
targetPort: 9292
373+
selector:
374+
service: glance

0 commit comments

Comments
 (0)