Skip to content

Commit 4048871

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #427 from stuggi/bump_controller_tools
Bump CONTROLLER_TOOLS_VERSION to 0.14.0
2 parents 0de59b8 + 701abbb commit 4048871

12 files changed

+1459
-1338
lines changed

‎Makefile

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

188188
## Tool Versions
189189
KUSTOMIZE_VERSION ?= v3.8.7
190-
CONTROLLER_TOOLS_VERSION ?= v0.11.1
190+
CONTROLLER_TOOLS_VERSION ?= v0.14.0
191191

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

‎api/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml

Lines changed: 75 additions & 61 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: octaviaamphoracontrollers.octavia.openstack.org
98
spec:
109
group: octavia.openstack.org
@@ -35,14 +34,19 @@ spec:
3534
API
3635
properties:
3736
apiVersion:
38-
description: 'APIVersion defines the versioned schema of this representation
39-
of an object. Servers should convert recognized schemas to the latest
40-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
37+
description: |-
38+
APIVersion defines the versioned schema of this representation of an object.
39+
Servers should convert recognized schemas to the latest internal value, and
40+
may reject unrecognized values.
41+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4142
type: string
4243
kind:
43-
description: 'Kind is a string value representing the REST resource this
44-
object represents. Servers may infer this from the endpoint the client
45-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
44+
description: |-
45+
Kind is a string value representing the REST resource this object represents.
46+
Servers may infer this from the endpoint the client submits requests to.
47+
Cannot be updated.
48+
In CamelCase.
49+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4650
type: string
4751
metadata:
4852
type: object
@@ -51,6 +55,7 @@ spec:
5155
Octavia Amphora Controllers
5256
properties:
5357
amphoraCustomFlavors:
58+
default: []
5459
description: AmphoraCustomFlavors - User-defined flavors for Octavia
5560
items:
5661
description: OctaviaAmphoraFlavor Settings for custom Amphora flavors
@@ -82,32 +87,33 @@ spec:
8287
type: string
8388
customServiceConfig:
8489
default: '# add your customization here'
85-
description: CustomServiceConfig - customize the service config using
86-
this parameter to change service defaults, or overwrite rendered
87-
information using raw OpenStack config format. The content gets
88-
added to to /etc/<service>/<service>.conf.d directory as custom.conf
89-
file.
90+
description: |-
91+
CustomServiceConfig - customize the service config using this parameter to change service defaults,
92+
or overwrite rendered information using raw OpenStack config format. The content gets added to
93+
to /etc/<service>/<service>.conf.d directory as custom.conf file.
9094
type: string
9195
databaseAccount:
9296
default: octavia
93-
description: DatabaseAccount - name of MariaDBAccount which will be
94-
used to connect for the main octavia database
97+
description: |-
98+
DatabaseAccount - name of MariaDBAccount which will be used to connect
99+
for the main octavia database
95100
type: string
96101
databaseHostname:
97102
description: DatabaseHostname - Octavia DB hostname
98103
type: string
99104
databaseInstance:
100-
description: MariaDB instance name Right now required by the maridb-operator
101-
to get the credentials from the instance to create the DB Might
102-
not be required in future
105+
description: |-
106+
MariaDB instance name
107+
Right now required by the maridb-operator to get the credentials from the instance to create the DB
108+
Might not be required in future
103109
type: string
104110
defaultConfigOverwrite:
105111
additionalProperties:
106112
type: string
107-
description: 'ConfigOverwrite - interface to overwrite default config
108-
files like e.g. logging.conf or policy.json. But can also be used
109-
to add additional files. Those get added to the service config dir
110-
in /etc/<service> . TODO: -> implement'
113+
description: |-
114+
ConfigOverwrite - interface to overwrite default config files like e.g. logging.conf or policy.json.
115+
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
116+
TODO: -> implement
111117
type: object
112118
lbMgmtNetworkID:
113119
default: ""
@@ -146,9 +152,9 @@ spec:
146152
properties:
147153
database:
148154
default: OctaviaDatabasePassword
149-
description: 'Database - Selector to get the octavia Database
150-
user password from the Secret TODO: not used, need change in
151-
mariadb-operator'
155+
description: |-
156+
Database - Selector to get the octavia Database user password from the Secret
157+
TODO: not used, need change in mariadb-operator
152158
type: string
153159
service:
154160
default: OctaviaPassword
@@ -158,26 +164,34 @@ spec:
158164
type: object
159165
persistenceDatabaseAccount:
160166
default: octavia-persistence
161-
description: PersistenceDatabaseAccount - name of MariaDBAccount which
162-
will be used to connect for the persistence database
167+
description: |-
168+
PersistenceDatabaseAccount - name of MariaDBAccount which will be used
169+
to connect for the persistence database
163170
type: string
164171
resources:
165-
description: Resources - Compute Resources required by this service
166-
(Limits/Requests). https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
172+
description: |-
173+
Resources - Compute Resources required by this service (Limits/Requests).
174+
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
167175
properties:
168176
claims:
169-
description: "Claims lists the names of resources, defined in
170-
spec.resourceClaims, that are used by this container. \n This
171-
is an alpha field and requires enabling the DynamicResourceAllocation
172-
feature gate. \n This field is immutable. It can only be set
173-
for containers."
177+
description: |-
178+
Claims lists the names of resources, defined in spec.resourceClaims,
179+
that are used by this container.
180+
181+
182+
This is an alpha field and requires enabling the
183+
DynamicResourceAllocation feature gate.
184+
185+
186+
This field is immutable. It can only be set for containers.
174187
items:
175188
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
176189
properties:
177190
name:
178-
description: Name must match the name of one entry in pod.spec.resourceClaims
179-
of the Pod where this field is used. It makes that resource
180-
available inside a container.
191+
description: |-
192+
Name must match the name of one entry in pod.spec.resourceClaims of
193+
the Pod where this field is used. It makes that resource available
194+
inside a container.
181195
type: string
182196
required:
183197
- name
@@ -193,8 +207,9 @@ spec:
193207
- type: string
194208
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
195209
x-kubernetes-int-or-string: true
196-
description: 'Limits describes the maximum amount of compute resources
197-
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
210+
description: |-
211+
Limits describes the maximum amount of compute resources allowed.
212+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
198213
type: object
199214
requests:
200215
additionalProperties:
@@ -203,11 +218,11 @@ spec:
203218
- type: string
204219
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
205220
x-kubernetes-int-or-string: true
206-
description: 'Requests describes the minimum amount of compute
207-
resources required. If Requests is omitted for a container,
208-
it defaults to Limits if that is explicitly specified, otherwise
209-
to an implementation-defined value. Requests cannot exceed Limits.
210-
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
221+
description: |-
222+
Requests describes the minimum amount of compute resources required.
223+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
224+
otherwise to an implementation-defined value. Requests cannot exceed Limits.
225+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
211226
type: object
212227
type: object
213228
role:
@@ -260,10 +275,10 @@ spec:
260275
operational state.
261276
properties:
262277
lastTransitionTime:
263-
description: Last time the condition transitioned from one status
264-
to another. This should be when the underlying condition changed.
265-
If that is not known, then using the time when the API field
266-
changed is acceptable.
278+
description: |-
279+
Last time the condition transitioned from one status to another.
280+
This should be when the underlying condition changed. If that is not known, then using the time when
281+
the API field changed is acceptable.
267282
format: date-time
268283
type: string
269284
message:
@@ -275,14 +290,13 @@ spec:
275290
in CamelCase.
276291
type: string
277292
severity:
278-
description: Severity provides a classification of Reason code,
279-
so the current situation is immediately understandable and
280-
could act accordingly. It is meant for situations where Status=False
281-
and it should be indicated if it is just informational, warning
282-
(next reconciliation might fix it) or an error (e.g. DB create
283-
issue and no actions to automatically resolve the issue can/should
284-
be done). For conditions where Status=Unknown or Status=True
285-
the Severity should be SeverityNone.
293+
description: |-
294+
Severity provides a classification of Reason code, so the current situation is immediately
295+
understandable and could act accordingly.
296+
It is meant for situations where Status=False and it should be indicated if it is just
297+
informational, warning (next reconciliation might fix it) or an error (e.g. DB create issue
298+
and no actions to automatically resolve the issue can/should be done).
299+
For conditions where Status=Unknown or Status=True the Severity should be SeverityNone.
286300
type: string
287301
status:
288302
description: Status of the condition, one of True, False, Unknown.
@@ -314,11 +328,11 @@ spec:
314328
description: NetworkAttachment status of the deployment pods
315329
type: object
316330
observedGeneration:
317-
description: ObservedGeneration - the most recent generation observed
318-
for this service. If the observed generation is less than the spec
319-
generation, then the controller has not processed the latest changes
320-
injected by the opentack-operator in the top-level CR (e.g. the
321-
ContainerImage)
331+
description: |-
332+
ObservedGeneration - the most recent generation observed for this
333+
service. If the observed generation is less than the spec generation,
334+
then the controller has not processed the latest changes injected by
335+
the opentack-operator in the top-level CR (e.g. the ContainerImage)
322336
format: int64
323337
type: integer
324338
readyCount:

0 commit comments

Comments
 (0)