Skip to content

Commit b2b1b46

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #261 from stuggi/bump_controller_tools
Bump CONTROLLER_TOOLS_VERSION to 0.14.0
2 parents da180e1 + 822dfcc commit b2b1b46

12 files changed

+1237
-1096
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ GINKGO ?= $(LOCALBIN)/ginkgo
198198

199199
## Tool Versions
200200
KUSTOMIZE_VERSION ?= v3.8.7
201-
CONTROLLER_TOOLS_VERSION ?= v0.11.1
201+
CONTROLLER_TOOLS_VERSION ?= v0.14.0
202202
GOTOOLCHAIN_VERSION ?= go1.21.0
203203

204204
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"

‎api/bases/test.openstack.org_ansibletests.yaml

Lines changed: 116 additions & 110 deletions
Large diffs are not rendered by default.

‎api/bases/test.openstack.org_horizontests.yaml

Lines changed: 69 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: horizontests.test.openstack.org
98
spec:
109
group: test.openstack.org
@@ -29,14 +28,19 @@ spec:
2928
openAPIV3Schema:
3029
properties:
3130
apiVersion:
32-
description: 'APIVersion defines the versioned schema of this representation
33-
of an object. Servers should convert recognized schemas to the latest
34-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
31+
description: |-
32+
APIVersion defines the versioned schema of this representation of an object.
33+
Servers should convert recognized schemas to the latest internal value, and
34+
may reject unrecognized values.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3536
type: string
3637
kind:
37-
description: 'Kind is a string value representing the REST resource this
38-
object represents. Servers may infer this from the endpoint the client
39-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
38+
description: |-
39+
Kind is a string value representing the REST resource this object represents.
40+
Servers may infer this from the endpoint the client submits requests to.
41+
Cannot be updated.
42+
In CamelCase.
43+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4044
type: string
4145
metadata:
4246
type: object
@@ -45,8 +49,9 @@ spec:
4549
properties:
4650
SELinuxLevel:
4751
default: ""
48-
description: A SELinuxLevel that should be used for test pods spawned
49-
by the test operator.
52+
description: |-
53+
A SELinuxLevel that should be used for test pods spawned by the test
54+
operator.
5055
type: string
5156
adminPassword:
5257
default: admin
@@ -77,11 +82,11 @@ spec:
7782
type: string
7883
debug:
7984
default: false
80-
description: Activate debug mode. When debug mode is activated any
81-
error encountered inside the test-pod causes that the pod will be
82-
kept alive indefinitely (stuck in "Running" phase) or until the
83-
corresponding HorizonTest CR is deleted. This allows the user to
84-
debug any potential troubles with `oc rsh`.
85+
description: |-
86+
Activate debug mode. When debug mode is activated any error encountered
87+
inside the test-pod causes that the pod will be kept alive indefinitely
88+
(stuck in "Running" phase) or until the corresponding HorizonTest CR is deleted.
89+
This allows the user to debug any potential troubles with `oc rsh`.
8590
type: boolean
8691
extraConfigmapsMounts:
8792
description: Extra configmaps for mounting inside the pod
@@ -125,8 +130,9 @@ spec:
125130
description: ImageUrl is the URL to download the Cirros image.
126131
type: string
127132
kubeconfigSecretName:
128-
description: Name of a secret that contains a kubeconfig. The kubeconfig
129-
is mounted under /var/lib/horizontest/.kube/config in the test pod.
133+
description: |-
134+
Name of a secret that contains a kubeconfig. The kubeconfig is mounted under /var/lib/horizontest/.kube/config
135+
in the test pod.
130136
type: string
131137
logsDirectoryName:
132138
default: horizon
@@ -136,8 +142,9 @@ spec:
136142
nodeSelector:
137143
additionalProperties:
138144
type: string
139-
description: This value contains a nodeSelector value that is applied
140-
to test pods spawned by the test operator.
145+
description: |-
146+
This value contains a nodeSelector value that is applied to test pods
147+
spawned by the test operator.
141148
type: object
142149
parallel:
143150
default: false
@@ -150,13 +157,13 @@ spec:
150157
type: string
151158
privileged:
152159
default: false
153-
description: 'Use with caution! This parameter specifies whether test-operator
154-
should spawn test pods with allowedPrivilegedEscalation: true and
155-
the default capabilities on top of capabilities that are usually
156-
needed by the test pods (NET_ADMIN, NET_RAW). This parameter is
157-
deemed insecure but it is needed for certain test-operator functionalities
158-
to work properly (e.g.: extraRPMs in Tempest CR, or certain set
159-
of tobiko tests).'
160+
description: |-
161+
Use with caution! This parameter specifies whether test-operator should spawn test
162+
pods with allowedPrivilegedEscalation: true and the default capabilities on
163+
top of capabilities that are usually needed by the test pods (NET_ADMIN, NET_RAW).
164+
This parameter is deemed insecure but it is needed for certain test-operator
165+
functionalities to work properly (e.g.: extraRPMs in Tempest CR, or certain set
166+
of tobiko tests).
160167
type: boolean
161168
projectName:
162169
default: horizontest
@@ -173,43 +180,43 @@ spec:
173180
PVCs.
174181
type: string
175182
tolerations:
176-
description: This value contains a toleration that is applied to pods
177-
spawned by the test pods that are spawned by the test-operator.
183+
description: |-
184+
This value contains a toleration that is applied to pods spawned by the
185+
test pods that are spawned by the test-operator.
178186
items:
179-
description: The pod this Toleration is attached to tolerates any
180-
taint that matches the triple <key,value,effect> using the matching
181-
operator <operator>.
187+
description: |-
188+
The pod this Toleration is attached to tolerates any taint that matches
189+
the triple <key,value,effect> using the matching operator <operator>.
182190
properties:
183191
effect:
184-
description: Effect indicates the taint effect to match. Empty
185-
means match all taint effects. When specified, allowed values
186-
are NoSchedule, PreferNoSchedule and NoExecute.
192+
description: |-
193+
Effect indicates the taint effect to match. Empty means match all taint effects.
194+
When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
187195
type: string
188196
key:
189-
description: Key is the taint key that the toleration applies
190-
to. Empty means match all taint keys. If the key is empty,
191-
operator must be Exists; this combination means to match all
192-
values and all keys.
197+
description: |-
198+
Key is the taint key that the toleration applies to. Empty means match all taint keys.
199+
If the key is empty, operator must be Exists; this combination means to match all values and all keys.
193200
type: string
194201
operator:
195-
description: Operator represents a key's relationship to the
196-
value. Valid operators are Exists and Equal. Defaults to Equal.
197-
Exists is equivalent to wildcard for value, so that a pod
198-
can tolerate all taints of a particular category.
202+
description: |-
203+
Operator represents a key's relationship to the value.
204+
Valid operators are Exists and Equal. Defaults to Equal.
205+
Exists is equivalent to wildcard for value, so that a pod can
206+
tolerate all taints of a particular category.
199207
type: string
200208
tolerationSeconds:
201-
description: TolerationSeconds represents the period of time
202-
the toleration (which must be of effect NoExecute, otherwise
203-
this field is ignored) tolerates the taint. By default, it
204-
is not set, which means tolerate the taint forever (do not
205-
evict). Zero and negative values will be treated as 0 (evict
206-
immediately) by the system.
209+
description: |-
210+
TolerationSeconds represents the period of time the toleration (which must be
211+
of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
212+
it is not set, which means tolerate the taint forever (do not evict). Zero and
213+
negative values will be treated as 0 (evict immediately) by the system.
207214
format: int64
208215
type: integer
209216
value:
210-
description: Value is the taint value the toleration matches
211-
to. If the operator is Exists, the value should be empty,
212-
otherwise just a regular string.
217+
description: |-
218+
Value is the taint value the toleration matches to.
219+
If the operator is Exists, the value should be empty, otherwise just a regular string.
213220
type: string
214221
type: object
215222
type: array
@@ -236,10 +243,10 @@ spec:
236243
operational state.
237244
properties:
238245
lastTransitionTime:
239-
description: Last time the condition transitioned from one status
240-
to another. This should be when the underlying condition changed.
241-
If that is not known, then using the time when the API field
242-
changed is acceptable.
246+
description: |-
247+
Last time the condition transitioned from one status to another.
248+
This should be when the underlying condition changed. If that is not known, then using the time when
249+
the API field changed is acceptable.
243250
format: date-time
244251
type: string
245252
message:
@@ -251,14 +258,13 @@ spec:
251258
in CamelCase.
252259
type: string
253260
severity:
254-
description: Severity provides a classification of Reason code,
255-
so the current situation is immediately understandable and
256-
could act accordingly. It is meant for situations where Status=False
257-
and it should be indicated if it is just informational, warning
258-
(next reconciliation might fix it) or an error (e.g. DB create
259-
issue and no actions to automatically resolve the issue can/should
260-
be done). For conditions where Status=Unknown or Status=True
261-
the Severity should be SeverityNone.
261+
description: |-
262+
Severity provides a classification of Reason code, so the current situation is immediately
263+
understandable and could act accordingly.
264+
It is meant for situations where Status=False and it should be indicated if it is just
265+
informational, warning (next reconciliation might fix it) or an error (e.g. DB create issue
266+
and no actions to automatically resolve the issue can/should be done).
267+
For conditions where Status=Unknown or Status=True the Severity should be SeverityNone.
262268
type: string
263269
status:
264270
description: Status of the condition, one of True, False, Unknown.

0 commit comments

Comments
 (0)