Skip to content

Commit cb5471e

Browse files
Merge pull request #200 from eshulman2/common
Embed common structs
2 parents 458fbd9 + 3c6fb17 commit cb5471e

24 files changed

+933
-769
lines changed

api/bases/test.openstack.org_ansibletests.yaml

Lines changed: 113 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ spec:
2727
name: v1beta1
2828
schema:
2929
openAPIV3Schema:
30-
description: AnsibleTestStatus is the Schema for the AnsibleTestStatus API
3130
properties:
3231
apiVersion:
3332
description: 'APIVersion defines the versioned schema of this representation
@@ -86,14 +85,15 @@ spec:
8685
type: string
8786
containerImage:
8887
default: ""
89-
description: Container image for AnsibleTest
88+
description: A URL of a container image that should be used by the
89+
test-operator for tests execution.
9090
type: string
9191
debug:
9292
default: false
9393
description: Run ansible playbook with -vvvv
9494
type: boolean
9595
extraConfigmapsMounts:
96-
description: Extra configmaps for mounting in the pod.
96+
description: Extra configmaps for mounting inside the pod
9797
items:
9898
properties:
9999
mountPath:
@@ -115,6 +115,12 @@ spec:
115115
- subPath
116116
type: object
117117
type: array
118+
nodeSelector:
119+
additionalProperties:
120+
type: string
121+
description: This value contains a nodeSelector value that is applied
122+
to test pods spawned by the test operator.
123+
type: object
118124
openStackConfigMap:
119125
default: openstack-config
120126
description: OpenStackConfigMap is the name of the ConfigMap containing
@@ -137,8 +143,50 @@ spec:
137143
type: boolean
138144
storageClass:
139145
default: local-storage
140-
description: StorageClass used to create PVCs that store the logs
146+
description: StorageClass used to create any test-operator related
147+
PVCs.
141148
type: string
149+
tolerations:
150+
description: This value contains a toleration that is applied to pods
151+
spawned by the test pods that are spawned by the test-operator.
152+
items:
153+
description: The pod this Toleration is attached to tolerates any
154+
taint that matches the triple <key,value,effect> using the matching
155+
operator <operator>.
156+
properties:
157+
effect:
158+
description: Effect indicates the taint effect to match. Empty
159+
means match all taint effects. When specified, allowed values
160+
are NoSchedule, PreferNoSchedule and NoExecute.
161+
type: string
162+
key:
163+
description: Key is the taint key that the toleration applies
164+
to. Empty means match all taint keys. If the key is empty,
165+
operator must be Exists; this combination means to match all
166+
values and all keys.
167+
type: string
168+
operator:
169+
description: Operator represents a key's relationship to the
170+
value. Valid operators are Exists and Equal. Defaults to Equal.
171+
Exists is equivalent to wildcard for value, so that a pod
172+
can tolerate all taints of a particular category.
173+
type: string
174+
tolerationSeconds:
175+
description: TolerationSeconds represents the period of time
176+
the toleration (which must be of effect NoExecute, otherwise
177+
this field is ignored) tolerates the taint. By default, it
178+
is not set, which means tolerate the taint forever (do not
179+
evict). Zero and negative values will be treated as 0 (evict
180+
immediately) by the system.
181+
format: int64
182+
type: integer
183+
value:
184+
description: Value is the taint value the toleration matches
185+
to. If the operator is Exists, the value should be empty,
186+
otherwise just a regular string.
187+
type: string
188+
type: object
189+
type: array
142190
workflow:
143191
description: A parameter that contains a workflow definition.
144192
items:
@@ -167,23 +215,26 @@ spec:
167215
and passed to the ansible command using -e @/etc/test_operator/<file>
168216
type: string
169217
backoffLimit:
218+
default: 0
170219
description: BackoffLimit allows to define the maximum number
171220
of retried executions (defaults to 0).
172221
format: int32
173222
type: integer
174223
computeSSHKeySecretName:
175-
description: ComputesSSHKeySecretName is the name of the k8s
224+
description: ComputeSSHKeySecretName is the name of the k8s
176225
secret that contains an ssh key for computes. The key is mounted
177226
to ~/.ssh/id_ecdsa in the ansible pod
178227
type: string
179228
containerImage:
180-
description: Container image for AnsibleTest
229+
default: ""
230+
description: A URL of a container image that should be used
231+
by the test-operator for tests execution.
181232
type: string
182233
debug:
183234
description: Run ansible playbook with -vvvv
184235
type: boolean
185236
extraConfigmapsMounts:
186-
description: Extra configmaps for mounting in the pod
237+
description: Extra configmaps for mounting inside the pod
187238
items:
188239
properties:
189240
mountPath:
@@ -205,11 +256,19 @@ spec:
205256
- subPath
206257
type: object
207258
type: array
259+
nodeSelector:
260+
additionalProperties:
261+
type: string
262+
description: This value contains a nodeSelector value that is
263+
applied to test pods spawned by the test operator.
264+
type: object
208265
openStackConfigMap:
266+
default: openstack-config
209267
description: OpenStackConfigMap is the name of the ConfigMap
210268
containing the clouds.yaml
211269
type: string
212270
openStackConfigSecret:
271+
default: openstack-config-secret
213272
description: OpenStackConfigSecret is the name of the Secret
214273
containing the secure.yaml
215274
type: string
@@ -228,9 +287,53 @@ spec:
228287
maxLength: 100
229288
type: string
230289
storageClass:
231-
description: StorageClass used to create PVCs that store the
232-
logs
290+
default: local-storage
291+
description: StorageClass used to create any test-operator related
292+
PVCs.
233293
type: string
294+
tolerations:
295+
description: This value contains a toleration that is applied
296+
to pods spawned by the test pods that are spawned by the test-operator.
297+
items:
298+
description: The pod this Toleration is attached to tolerates
299+
any taint that matches the triple <key,value,effect> using
300+
the matching operator <operator>.
301+
properties:
302+
effect:
303+
description: Effect indicates the taint effect to match.
304+
Empty means match all taint effects. When specified,
305+
allowed values are NoSchedule, PreferNoSchedule and
306+
NoExecute.
307+
type: string
308+
key:
309+
description: Key is the taint key that the toleration
310+
applies to. Empty means match all taint keys. If the
311+
key is empty, operator must be Exists; this combination
312+
means to match all values and all keys.
313+
type: string
314+
operator:
315+
description: Operator represents a key's relationship
316+
to the value. Valid operators are Exists and Equal.
317+
Defaults to Equal. Exists is equivalent to wildcard
318+
for value, so that a pod can tolerate all taints of
319+
a particular category.
320+
type: string
321+
tolerationSeconds:
322+
description: TolerationSeconds represents the period of
323+
time the toleration (which must be of effect NoExecute,
324+
otherwise this field is ignored) tolerates the taint.
325+
By default, it is not set, which means tolerate the
326+
taint forever (do not evict). Zero and negative values
327+
will be treated as 0 (evict immediately) by the system.
328+
format: int64
329+
type: integer
330+
value:
331+
description: Value is the taint value the toleration matches
332+
to. If the operator is Exists, the value should be empty,
333+
otherwise just a regular string.
334+
type: string
335+
type: object
336+
type: array
234337
workloadSSHKeySecretName:
235338
description: WorkloadSSHKeySecretName is the name of the k8s
236339
secret that contains an ssh key for the ansible workload.
@@ -251,7 +354,7 @@ spec:
251354
- ansiblePlaybookPath
252355
type: object
253356
status:
254-
description: AnsibleTestStatus defines the observed state of AnsibleTest
357+
description: CommonTestStatus defines the observed state of the controller
255358
properties:
256359
conditions:
257360
description: Conditions

api/bases/test.openstack.org_horizontests.yaml

Lines changed: 75 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ spec:
2727
name: v1beta1
2828
schema:
2929
openAPIV3Schema:
30-
description: HorizonTest is the Schema for the horizontests API
3130
properties:
3231
apiVersion:
3332
description: 'APIVersion defines the versioned schema of this representation
@@ -65,11 +64,35 @@ spec:
6564
type: integer
6665
containerImage:
6766
default: ""
68-
description: Container image for horizontest
67+
description: A URL of a container image that should be used by the
68+
test-operator for tests execution.
6969
type: string
7070
dashboardUrl:
7171
description: DashboardUrl is the URL of the Horizon dashboard.
7272
type: string
73+
extraConfigmapsMounts:
74+
description: Extra configmaps for mounting inside the pod
75+
items:
76+
properties:
77+
mountPath:
78+
description: Path within the container at which the volume should
79+
be mounted.
80+
type: string
81+
name:
82+
description: The name of an existing config map for mounting.
83+
maxLength: 253
84+
type: string
85+
subPath:
86+
default: ""
87+
description: Config map subpath for mounting, defaults to configmap
88+
root.
89+
type: string
90+
required:
91+
- mountPath
92+
- name
93+
- subPath
94+
type: object
95+
type: array
7396
flavorName:
7497
default: m1.tiny
7598
description: FlavorName is the name of the OpenStack flavor to create
@@ -97,6 +120,12 @@ spec:
97120
description: LogsDirectoryName is the name of the directory to store
98121
test logs.
99122
type: string
123+
nodeSelector:
124+
additionalProperties:
125+
type: string
126+
description: This value contains a nodeSelector value that is applied
127+
to test pods spawned by the test operator.
128+
type: object
100129
parallel:
101130
default: false
102131
description: Parallel
@@ -127,8 +156,50 @@ spec:
127156
type: string
128157
storageClass:
129158
default: local-storage
130-
description: StorageClass used to create PVCs that store the logs
159+
description: StorageClass used to create any test-operator related
160+
PVCs.
131161
type: string
162+
tolerations:
163+
description: This value contains a toleration that is applied to pods
164+
spawned by the test pods that are spawned by the test-operator.
165+
items:
166+
description: The pod this Toleration is attached to tolerates any
167+
taint that matches the triple <key,value,effect> using the matching
168+
operator <operator>.
169+
properties:
170+
effect:
171+
description: Effect indicates the taint effect to match. Empty
172+
means match all taint effects. When specified, allowed values
173+
are NoSchedule, PreferNoSchedule and NoExecute.
174+
type: string
175+
key:
176+
description: Key is the taint key that the toleration applies
177+
to. Empty means match all taint keys. If the key is empty,
178+
operator must be Exists; this combination means to match all
179+
values and all keys.
180+
type: string
181+
operator:
182+
description: Operator represents a key's relationship to the
183+
value. Valid operators are Exists and Equal. Defaults to Equal.
184+
Exists is equivalent to wildcard for value, so that a pod
185+
can tolerate all taints of a particular category.
186+
type: string
187+
tolerationSeconds:
188+
description: TolerationSeconds represents the period of time
189+
the toleration (which must be of effect NoExecute, otherwise
190+
this field is ignored) tolerates the taint. By default, it
191+
is not set, which means tolerate the taint forever (do not
192+
evict). Zero and negative values will be treated as 0 (evict
193+
immediately) by the system.
194+
format: int64
195+
type: integer
196+
value:
197+
description: Value is the taint value the toleration matches
198+
to. If the operator is Exists, the value should be empty,
199+
otherwise just a regular string.
200+
type: string
201+
type: object
202+
type: array
132203
user:
133204
default: horizontest
134205
description: User is the username under which the Horizon tests will
@@ -141,10 +212,9 @@ spec:
141212
- dashboardUrl
142213
- horizonRepoBranch
143214
- repoUrl
144-
- storageClass
145215
type: object
146216
status:
147-
description: HorizonTestStatus defines the observed state of HorizonTest
217+
description: CommonTestStatus defines the observed state of the controller
148218
properties:
149219
conditions:
150220
description: Conditions

0 commit comments

Comments
 (0)