Skip to content

Commit e1accf2

Browse files
stuggistuggi
committed
Bump CONTROLLER_TOOLS_VERSION to 0.14.0
bump controller tools to the version which bumps k8s deps to v0.29.0, which aligns with the version in the operators. Signed-off-by: Martin Schuppert <[email protected]>
1 parent 9e5d13c commit e1accf2

20 files changed

+2345
-2187
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
183183

184184
## Tool Versions
185185
KUSTOMIZE_VERSION ?= v3.8.7
186-
CONTROLLER_TOOLS_VERSION ?= v0.11.1
186+
CONTROLLER_TOOLS_VERSION ?= v0.14.0
187187
OPERATOR_SDK_VERSION ?= v1.31.0
188188
GOTOOLCHAIN_VERSION ?= go1.21.0
189189

‎api/bases/designate.openstack.org_designateapis.yaml‎

Lines changed: 178 additions & 184 deletions
Large diffs are not rendered by default.

‎api/bases/designate.openstack.org_designatebackendbind9s.yaml‎

Lines changed: 79 additions & 69 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: designatebackendbind9s.designate.openstack.org
98
spec:
109
group: designate.openstack.org
@@ -30,36 +29,41 @@ spec:
3029
description: DesignateBackendbind9 is the Schema for the designatebackendbind9
3130
properties:
3231
apiVersion:
33-
description: 'APIVersion defines the versioned schema of this representation
34-
of an object. Servers should convert recognized schemas to the latest
35-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
32+
description: |-
33+
APIVersion defines the versioned schema of this representation of an object.
34+
Servers should convert recognized schemas to the latest internal value, and
35+
may reject unrecognized values.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3637
type: string
3738
kind:
38-
description: 'Kind is a string value representing the REST resource this
39-
object represents. Servers may infer this from the endpoint the client
40-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
39+
description: |-
40+
Kind is a string value representing the REST resource this object represents.
41+
Servers may infer this from the endpoint the client submits requests to.
42+
Cannot be updated.
43+
In CamelCase.
44+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4145
type: string
4246
metadata:
4347
type: object
4448
spec:
4549
description: DesignateBackendbind9Spec defines the desired state of DesignateBackendbind9
4650
properties:
4751
backendMdnsServerProtocol:
48-
description: 'BackendTypeProtocol - Defines the backend protocol to
49-
be used between the designate-worker & designate_mdns to/from the
50-
DNS server. Acceptable values are: "UDP", "TCP" Please Note: this
51-
MUST match what is in the /etc/designate.conf [''service:mdns'']'
52+
description: |-
53+
BackendTypeProtocol - Defines the backend protocol to be used between the designate-worker &
54+
designate_mdns to/from the DNS server. Acceptable values are: "UDP", "TCP"
55+
Please Note: this MUST match what is in the /etc/designate.conf ['service:mdns']
5256
type: string
5357
backendType:
54-
description: BackendType - Defines the backend service/configuration
55-
we are using, i.e. bind9, PowerDNS, BYO, etc.. Helps maintain a
56-
single init container/init.sh to do container setup
58+
description: |-
59+
BackendType - Defines the backend service/configuration we are using, i.e. bind9, PowerDNS, BYO, etc..
60+
Helps maintain a single init container/init.sh to do container setup
5761
type: string
5862
backendWorkerServerProtocol:
59-
description: 'BackendTypeProtocol - Defines the backend protocol to
60-
be used between the designate-worker & designate_mdns to/from the
61-
DNS server. Acceptable values are: "UDP", "TCP" Please Note: this
62-
MUST match what is in the /etc/designate.conf [''service:worker'']'
63+
description: |-
64+
BackendTypeProtocol - Defines the backend protocol to be used between the designate-worker &
65+
designate_mdns to/from the DNS server. Acceptable values are: "UDP", "TCP"
66+
Please Note: this MUST match what is in the /etc/designate.conf ['service:worker']
6367
type: string
6468
containerImage:
6569
description: ContainerImage - Designate Container Image URL (will
@@ -76,17 +80,16 @@ spec:
7680
type: string
7781
type: array
7882
customServiceConfig:
79-
description: CustomServiceConfig - customize the service config using
80-
this parameter to change service defaults, or overwrite rendered
81-
information using raw OpenStack config format. The content gets
82-
added to to /etc/<service>/<service>.conf.d directory as a custom
83-
config file.
83+
description: |-
84+
CustomServiceConfig - customize the service config using this parameter to change service defaults,
85+
or overwrite rendered information using raw OpenStack config format. The content gets added to
86+
to /etc/<service>/<service>.conf.d directory as a custom config file.
8487
type: string
8588
customServiceConfigSecrets:
86-
description: CustomServiceConfigSecrets - customize the service config
87-
using this parameter to specify Secrets that contain sensitive service
88-
config data. The content of each Secret gets added to the /etc/<service>/<service>.conf.d
89-
directory as a custom config file.
89+
description: |-
90+
CustomServiceConfigSecrets - customize the service config using this parameter to specify Secrets
91+
that contain sensitive service config data. The content of each Secret gets added to the
92+
/etc/<service>/<service>.conf.d directory as a custom config file.
9093
items:
9194
type: string
9295
type: array
@@ -101,10 +104,10 @@ spec:
101104
defaultConfigOverwrite:
102105
additionalProperties:
103106
type: string
104-
description: 'ConfigOverwrite - interface to overwrite default config
105-
files like e.g. policy.json. But can also be used to add additional
106-
files. Those get added to the service config dir in /etc/<service>
107-
. TODO: -> implement'
107+
description: |-
108+
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
109+
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
110+
TODO: -> implement
108111
type: object
109112
networkAttachments:
110113
description: NetworkAttachments is a list of NetworkAttachment resource
@@ -115,9 +118,9 @@ spec:
115118
nodeSelector:
116119
additionalProperties:
117120
type: string
118-
description: NodeSelector to target subset of worker nodes running
119-
this service. Setting here overrides any global NodeSelector settings
120-
within the Designate CR.
121+
description: |-
122+
NodeSelector to target subset of worker nodes running this service. Setting here overrides
123+
any global NodeSelector settings within the Designate CR.
121124
type: object
122125
passwordSelectors:
123126
default:
@@ -139,22 +142,29 @@ spec:
139142
minimum: 0
140143
type: integer
141144
resources:
142-
description: Resources - Compute Resources required by this service
143-
(Limits/Requests). https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
145+
description: |-
146+
Resources - Compute Resources required by this service (Limits/Requests).
147+
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
144148
properties:
145149
claims:
146-
description: "Claims lists the names of resources, defined in
147-
spec.resourceClaims, that are used by this container. \n This
148-
is an alpha field and requires enabling the DynamicResourceAllocation
149-
feature gate. \n This field is immutable. It can only be set
150-
for containers."
150+
description: |-
151+
Claims lists the names of resources, defined in spec.resourceClaims,
152+
that are used by this container.
153+
154+
155+
This is an alpha field and requires enabling the
156+
DynamicResourceAllocation feature gate.
157+
158+
159+
This field is immutable. It can only be set for containers.
151160
items:
152161
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
153162
properties:
154163
name:
155-
description: Name must match the name of one entry in pod.spec.resourceClaims
156-
of the Pod where this field is used. It makes that resource
157-
available inside a container.
164+
description: |-
165+
Name must match the name of one entry in pod.spec.resourceClaims of
166+
the Pod where this field is used. It makes that resource available
167+
inside a container.
158168
type: string
159169
required:
160170
- name
@@ -170,8 +180,9 @@ spec:
170180
- type: string
171181
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
172182
x-kubernetes-int-or-string: true
173-
description: 'Limits describes the maximum amount of compute resources
174-
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
183+
description: |-
184+
Limits describes the maximum amount of compute resources allowed.
185+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
175186
type: object
176187
requests:
177188
additionalProperties:
@@ -180,11 +191,11 @@ spec:
180191
- type: string
181192
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
182193
x-kubernetes-int-or-string: true
183-
description: 'Requests describes the minimum amount of compute
184-
resources required. If Requests is omitted for a container,
185-
it defaults to Limits if that is explicitly specified, otherwise
186-
to an implementation-defined value. Requests cannot exceed Limits.
187-
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
194+
description: |-
195+
Requests describes the minimum amount of compute resources required.
196+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
197+
otherwise to an implementation-defined value. Requests cannot exceed Limits.
198+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
188199
type: object
189200
type: object
190201
secret:
@@ -223,10 +234,10 @@ spec:
223234
operational state.
224235
properties:
225236
lastTransitionTime:
226-
description: Last time the condition transitioned from one status
227-
to another. This should be when the underlying condition changed.
228-
If that is not known, then using the time when the API field
229-
changed is acceptable.
237+
description: |-
238+
Last time the condition transitioned from one status to another.
239+
This should be when the underlying condition changed. If that is not known, then using the time when
240+
the API field changed is acceptable.
230241
format: date-time
231242
type: string
232243
message:
@@ -238,14 +249,13 @@ spec:
238249
in CamelCase.
239250
type: string
240251
severity:
241-
description: Severity provides a classification of Reason code,
242-
so the current situation is immediately understandable and
243-
could act accordingly. It is meant for situations where Status=False
244-
and it should be indicated if it is just informational, warning
245-
(next reconciliation might fix it) or an error (e.g. DB create
246-
issue and no actions to automatically resolve the issue can/should
247-
be done). For conditions where Status=Unknown or Status=True
248-
the Severity should be SeverityNone.
252+
description: |-
253+
Severity provides a classification of Reason code, so the current situation is immediately
254+
understandable and could act accordingly.
255+
It is meant for situations where Status=False and it should be indicated if it is just
256+
informational, warning (next reconciliation might fix it) or an error (e.g. DB create issue
257+
and no actions to automatically resolve the issue can/should be done).
258+
For conditions where Status=Unknown or Status=True the Severity should be SeverityNone.
249259
type: string
250260
status:
251261
description: Status of the condition, one of True, False, Unknown.
@@ -272,11 +282,11 @@ spec:
272282
description: NetworkAttachments status of the deployment pods
273283
type: object
274284
observedGeneration:
275-
description: ObservedGeneration - the most recent generation observed
276-
for this service. If the observed generation is less than the spec
277-
generation, then the controller has not processed the latest changes
278-
injected by the opentack-operator in the top-level CR (e.g. the
279-
ContainerImage)
285+
description: |-
286+
ObservedGeneration - the most recent generation observed for this
287+
service. If the observed generation is less than the spec generation,
288+
then the controller has not processed the latest changes injected by
289+
the opentack-operator in the top-level CR (e.g. the ContainerImage)
280290
format: int64
281291
type: integer
282292
readyCount:

0 commit comments

Comments
 (0)