Skip to content

Commit f7ff11d

Browse files
Merge pull request #295 from stuggi/bump_controller_tools
Bump CONTROLLER_TOOLS_VERSION to 0.14.0
2 parents 2e3a8e1 + 4502880 commit f7ff11d

10 files changed

+157
-141
lines changed

Makefile

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

214214
## Tool Versions
215215
KUSTOMIZE_VERSION ?= v3.8.7
216-
CONTROLLER_TOOLS_VERSION ?= v0.11.1
216+
CONTROLLER_TOOLS_VERSION ?= v0.14.0
217217
GOTOOLCHAIN_VERSION ?= go1.21.0
218218

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

api/bases/mariadb.openstack.org_galeras.yaml

Lines changed: 32 additions & 28 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: galeras.mariadb.openstack.org
98
spec:
109
group: mariadb.openstack.org
@@ -30,14 +29,19 @@ spec:
3029
description: Galera is the Schema for the galeras API
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
@@ -49,9 +53,10 @@ spec:
4953
to environmental default if empty)
5054
type: string
5155
customServiceConfig:
52-
description: Customize config using this parameter to change service
53-
defaults, or overwrite rendered information using raw MariaDB config
54-
format. The content gets added to /etc/my.cnf.d/galera_custom.cnf
56+
description: |-
57+
Customize config using this parameter to change service defaults,
58+
or overwrite rendered information using raw MariaDB config format.
59+
The content gets added to /etc/my.cnf.d/galera_custom.cnf
5560
type: string
5661
disableNonTLSListeners:
5762
description: When TLS is configured, only allow connections to the
@@ -152,10 +157,10 @@ spec:
152157
operational state.
153158
properties:
154159
lastTransitionTime:
155-
description: Last time the condition transitioned from one status
156-
to another. This should be when the underlying condition changed.
157-
If that is not known, then using the time when the API field
158-
changed is acceptable.
160+
description: |-
161+
Last time the condition transitioned from one status to another.
162+
This should be when the underlying condition changed. If that is not known, then using the time when
163+
the API field changed is acceptable.
159164
format: date-time
160165
type: string
161166
message:
@@ -167,14 +172,13 @@ spec:
167172
in CamelCase.
168173
type: string
169174
severity:
170-
description: Severity provides a classification of Reason code,
171-
so the current situation is immediately understandable and
172-
could act accordingly. It is meant for situations where Status=False
173-
and it should be indicated if it is just informational, warning
174-
(next reconciliation might fix it) or an error (e.g. DB create
175-
issue and no actions to automatically resolve the issue can/should
176-
be done). For conditions where Status=Unknown or Status=True
177-
the Severity should be SeverityNone.
175+
description: |-
176+
Severity provides a classification of Reason code, so the current situation is immediately
177+
understandable and could act accordingly.
178+
It is meant for situations where Status=False and it should be indicated if it is just
179+
informational, warning (next reconciliation might fix it) or an error (e.g. DB create issue
180+
and no actions to automatically resolve the issue can/should be done).
181+
For conditions where Status=Unknown or Status=True the Severity should be SeverityNone.
178182
type: string
179183
status:
180184
description: Status of the condition, one of True, False, Unknown.
@@ -194,11 +198,11 @@ spec:
194198
description: Map of hashes to track input changes
195199
type: object
196200
observedGeneration:
197-
description: ObservedGeneration - the most recent generation observed
198-
for this service. If the observed generation is less than the spec
199-
generation, then the controller has not processed the latest changes
200-
injected by the opentack-operator in the top-level CR (e.g. the
201-
ContainerImage)
201+
description: |-
202+
ObservedGeneration - the most recent generation observed for this
203+
service. If the observed generation is less than the spec generation,
204+
then the controller has not processed the latest changes injected by
205+
the opentack-operator in the top-level CR (e.g. the ContainerImage)
202206
format: int64
203207
type: integer
204208
safeToBootstrap:

api/bases/mariadb.openstack.org_mariadbaccounts.yaml

Lines changed: 23 additions & 20 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: mariadbaccounts.mariadb.openstack.org
98
spec:
109
group: mariadb.openstack.org
@@ -30,14 +29,19 @@ spec:
3029
description: MariaDBAccount is the Schema for the mariadbaccounts API
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
@@ -69,10 +73,10 @@ spec:
6973
operational state.
7074
properties:
7175
lastTransitionTime:
72-
description: Last time the condition transitioned from one status
73-
to another. This should be when the underlying condition changed.
74-
If that is not known, then using the time when the API field
75-
changed is acceptable.
76+
description: |-
77+
Last time the condition transitioned from one status to another.
78+
This should be when the underlying condition changed. If that is not known, then using the time when
79+
the API field changed is acceptable.
7680
format: date-time
7781
type: string
7882
message:
@@ -84,14 +88,13 @@ spec:
8488
in CamelCase.
8589
type: string
8690
severity:
87-
description: Severity provides a classification of Reason code,
88-
so the current situation is immediately understandable and
89-
could act accordingly. It is meant for situations where Status=False
90-
and it should be indicated if it is just informational, warning
91-
(next reconciliation might fix it) or an error (e.g. DB create
92-
issue and no actions to automatically resolve the issue can/should
93-
be done). For conditions where Status=Unknown or Status=True
94-
the Severity should be SeverityNone.
91+
description: |-
92+
Severity provides a classification of Reason code, so the current situation is immediately
93+
understandable and could act accordingly.
94+
It is meant for situations where Status=False and it should be indicated if it is just
95+
informational, warning (next reconciliation might fix it) or an error (e.g. DB create issue
96+
and no actions to automatically resolve the issue can/should be done).
97+
For conditions where Status=Unknown or Status=True the Severity should be SeverityNone.
9598
type: string
9699
status:
97100
description: Status of the condition, one of True, False, Unknown.

api/bases/mariadb.openstack.org_mariadbdatabases.yaml

Lines changed: 23 additions & 20 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: mariadbdatabases.mariadb.openstack.org
98
spec:
109
group: mariadb.openstack.org
@@ -30,14 +29,19 @@ spec:
3029
description: MariaDBDatabase is the Schema for the mariadbdatabases API
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
@@ -71,10 +75,10 @@ spec:
7175
operational state.
7276
properties:
7377
lastTransitionTime:
74-
description: Last time the condition transitioned from one status
75-
to another. This should be when the underlying condition changed.
76-
If that is not known, then using the time when the API field
77-
changed is acceptable.
78+
description: |-
79+
Last time the condition transitioned from one status to another.
80+
This should be when the underlying condition changed. If that is not known, then using the time when
81+
the API field changed is acceptable.
7882
format: date-time
7983
type: string
8084
message:
@@ -86,14 +90,13 @@ spec:
8690
in CamelCase.
8791
type: string
8892
severity:
89-
description: Severity provides a classification of Reason code,
90-
so the current situation is immediately understandable and
91-
could act accordingly. It is meant for situations where Status=False
92-
and it should be indicated if it is just informational, warning
93-
(next reconciliation might fix it) or an error (e.g. DB create
94-
issue and no actions to automatically resolve the issue can/should
95-
be done). For conditions where Status=Unknown or Status=True
96-
the Severity should be SeverityNone.
93+
description: |-
94+
Severity provides a classification of Reason code, so the current situation is immediately
95+
understandable and could act accordingly.
96+
It is meant for situations where Status=False and it should be indicated if it is just
97+
informational, warning (next reconciliation might fix it) or an error (e.g. DB create issue
98+
and no actions to automatically resolve the issue can/should be done).
99+
For conditions where Status=Unknown or Status=True the Severity should be SeverityNone.
97100
type: string
98101
status:
99102
description: Status of the condition, one of True, False, Unknown.

api/v1beta1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)