Skip to content

Commit 28c1b40

Browse files
mgirgisfmgirgisf
authored
Merge branch 'main' into mgirgis-network-dashboard
2 parents 554969d + 47f2bd8 commit 28c1b40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+4415
-2694
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
197197

198198
## Tool Versions
199199
KUSTOMIZE_VERSION ?= v3.8.7
200-
CONTROLLER_TOOLS_VERSION ?= v0.11.1
200+
CONTROLLER_TOOLS_VERSION ?= v0.14.0
201201
GOTOOLCHAIN_VERSION ?= go1.21.0
202202

203203
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
@@ -401,7 +401,7 @@ kuttl-test-cleanup:
401401
fi
402402

403403
CRD_SCHEMA_CHECKER_VERSION ?= release-4.16
404-
BRANCH=main
404+
BRANCH ?= main
405405

406406
PHONY: crd-schema-check
407407
crd-schema-check: manifests

‎api/bases/telemetry.openstack.org_autoscalings.yaml‎

Lines changed: 145 additions & 163 deletions
Large diffs are not rendered by default.

‎api/bases/telemetry.openstack.org_ceilometers.yaml‎

Lines changed: 95 additions & 53 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: ceilometers.telemetry.openstack.org
98
spec:
109
group: telemetry.openstack.org
@@ -30,14 +29,19 @@ spec:
3029
description: Ceilometer is the Schema for the ceilometers 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
ksmStatus:
4347
description: KSMStatus defines the observed state of kube-state-metrics
@@ -49,10 +53,10 @@ spec:
4953
operational state.
5054
properties:
5155
lastTransitionTime:
52-
description: Last time the condition transitioned from one status
53-
to another. This should be when the underlying condition changed.
54-
If that is not known, then using the time when the API field
55-
changed is acceptable.
56+
description: |-
57+
Last time the condition transitioned from one status to another.
58+
This should be when the underlying condition changed. If that is not known, then using the time when
59+
the API field changed is acceptable.
5660
format: date-time
5761
type: string
5862
message:
@@ -64,14 +68,13 @@ spec:
6468
in CamelCase.
6569
type: string
6670
severity:
67-
description: Severity provides a classification of Reason code,
68-
so the current situation is immediately understandable and
69-
could act accordingly. It is meant for situations where Status=False
70-
and it should be indicated if it is just informational, warning
71-
(next reconciliation might fix it) or an error (e.g. DB create
72-
issue and no actions to automatically resolve the issue can/should
73-
be done). For conditions where Status=Unknown or Status=True
74-
the Severity should be SeverityNone.
71+
description: |-
72+
Severity provides a classification of Reason code, so the current situation is immediately
73+
understandable and could act accordingly.
74+
It is meant for situations where Status=False and it should be indicated if it is just
75+
informational, warning (next reconciliation might fix it) or an error (e.g. DB create issue
76+
and no actions to automatically resolve the issue can/should be done).
77+
For conditions where Status=Unknown or Status=True the Severity should be SeverityNone.
7578
type: string
7679
status:
7780
description: Status of the condition, one of True, False, Unknown.
@@ -91,11 +94,11 @@ spec:
9194
description: Map of hashes to track e.g. job status
9295
type: object
9396
observedGeneration:
94-
description: ObservedGeneration - the most recent generation observed
95-
for this service. If the observed generation is less than the spec
96-
generation, then the controller has not processed the latest changes
97-
injected by the openstack-operator in the top-level CR (e.g. the
98-
ContainerImage)
97+
description: |-
98+
ObservedGeneration - the most recent generation observed for this
99+
service. If the observed generation is less than the spec generation,
100+
then the controller has not processed the latest changes injected by
101+
the openstack-operator in the top-level CR (e.g. the ContainerImage)
99102
format: int64
100103
type: integer
101104
readyCount:
@@ -118,19 +121,18 @@ spec:
118121
type: string
119122
customServiceConfig:
120123
default: '# add your customization here'
121-
description: CustomServiceConfig - customize the service config using
122-
this parameter to change service defaults, or overwrite rendered
123-
information using raw OpenStack config format. The content gets
124-
added to to /etc/<service>/<service>.conf.d directory as custom.conf
125-
file.
124+
description: |-
125+
CustomServiceConfig - customize the service config using this parameter to change service defaults,
126+
or overwrite rendered information using raw OpenStack config format. The content gets added to
127+
to /etc/<service>/<service>.conf.d directory as custom.conf file.
126128
type: string
127129
defaultConfigOverwrite:
128130
additionalProperties:
129131
type: string
130-
description: 'ConfigOverwrite - interface to overwrite default config
131-
files like e.g. logging.conf or policy.json. But can also be used
132-
to add additional files. Those get added to the service config dir
133-
in /etc/<service> . TODO: -> implement'
132+
description: |-
133+
ConfigOverwrite - interface to overwrite default config files like e.g. logging.conf or policy.json.
134+
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
135+
TODO: -> implement
134136
type: object
135137
ipmiImage:
136138
type: string
@@ -147,6 +149,31 @@ spec:
147149
description: SecretName - holding the cert, key for the service
148150
type: string
149151
type: object
152+
mysqldExporterDatabaseAccountPrefix:
153+
default: mysqld-exporter
154+
description: |-
155+
MysqldExporterDatabaseAccountPrefix - Database account prefix for the mysqld-exporter.
156+
A mariadbaccount CR named "<mysqldExporterDatabaseAccountPrefix>-<galera CR name>" for each
157+
galera instance needs to be either created by the user or if it's missing, it'll be
158+
created by the telemetry-operator automatically.
159+
type: string
160+
mysqldExporterEnabled:
161+
description: Whether mysqld_exporter should be deployed
162+
type: boolean
163+
mysqldExporterImage:
164+
type: string
165+
mysqldExporterTLS:
166+
description: MysqldExporterTLS - Parameters related to the TLS for
167+
mysqld_exporter
168+
properties:
169+
caBundleSecretName:
170+
description: CaBundleSecretName - holding the CA certs in a pre-created
171+
bundle file
172+
type: string
173+
secretName:
174+
description: SecretName - holding the cert, key for the service
175+
type: string
176+
type: object
150177
networkAttachmentDefinitions:
151178
description: NetworkAttachmentDefinitions list of network attachment
152179
definitions the service pod gets attached to
@@ -182,8 +209,9 @@ spec:
182209
type: string
183210
rabbitMqClusterName:
184211
default: rabbitmq
185-
description: RabbitMQ instance name Needed to request a transportURL
186-
that is created and used in Telemetry
212+
description: |-
213+
RabbitMQ instance name
214+
Needed to request a transportURL that is created and used in Telemetry
187215
type: string
188216
secret:
189217
default: osp-secret
@@ -227,10 +255,10 @@ spec:
227255
operational state.
228256
properties:
229257
lastTransitionTime:
230-
description: Last time the condition transitioned from one status
231-
to another. This should be when the underlying condition changed.
232-
If that is not known, then using the time when the API field
233-
changed is acceptable.
258+
description: |-
259+
Last time the condition transitioned from one status to another.
260+
This should be when the underlying condition changed. If that is not known, then using the time when
261+
the API field changed is acceptable.
234262
format: date-time
235263
type: string
236264
message:
@@ -242,14 +270,13 @@ spec:
242270
in CamelCase.
243271
type: string
244272
severity:
245-
description: Severity provides a classification of Reason code,
246-
so the current situation is immediately understandable and
247-
could act accordingly. It is meant for situations where Status=False
248-
and it should be indicated if it is just informational, warning
249-
(next reconciliation might fix it) or an error (e.g. DB create
250-
issue and no actions to automatically resolve the issue can/should
251-
be done). For conditions where Status=Unknown or Status=True
252-
the Severity should be SeverityNone.
273+
description: |-
274+
Severity provides a classification of Reason code, so the current situation is immediately
275+
understandable and could act accordingly.
276+
It is meant for situations where Status=False and it should be indicated if it is just
277+
informational, warning (next reconciliation might fix it) or an error (e.g. DB create issue
278+
and no actions to automatically resolve the issue can/should be done).
279+
For conditions where Status=Unknown or Status=True the Severity should be SeverityNone.
253280
type: string
254281
status:
255282
description: Status of the condition, one of True, False, Unknown.
@@ -268,18 +295,33 @@ spec:
268295
type: string
269296
description: Map of hashes to track e.g. job status
270297
type: object
298+
mysqldExporterExportedGaleras:
299+
description: List of galera CRs, which are being exported with mysqld_exporter
300+
items:
301+
type: string
302+
type: array
303+
x-kubernetes-list-type: atomic
304+
mysqldExporterHash:
305+
additionalProperties:
306+
type: string
307+
description: Map of hashes to track e.g. job status
308+
type: object
309+
mysqldExporterReadyCount:
310+
description: ReadyCount of mysqld_exporter instances
311+
format: int32
312+
type: integer
271313
networks:
272314
description: Networks in addtion to the cluster network, the service
273315
is attached to
274316
items:
275317
type: string
276318
type: array
277319
observedGeneration:
278-
description: ObservedGeneration - the most recent generation observed
279-
for this service. If the observed generation is less than the spec
280-
generation, then the controller has not processed the latest changes
281-
injected by the openstack-operator in the top-level CR (e.g. the
282-
ContainerImage)
320+
description: |-
321+
ObservedGeneration - the most recent generation observed for this
322+
service. If the observed generation is less than the spec generation,
323+
then the controller has not processed the latest changes injected by
324+
the openstack-operator in the top-level CR (e.g. the ContainerImage)
283325
format: int64
284326
type: integer
285327
readyCount:

‎api/bases/telemetry.openstack.org_loggings.yaml‎

Lines changed: 28 additions & 25 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: loggings.telemetry.openstack.org
98
spec:
109
group: telemetry.openstack.org
@@ -32,14 +31,19 @@ spec:
3231
description: Logging is the Schema for the loggings API
3332
properties:
3433
apiVersion:
35-
description: 'APIVersion defines the versioned schema of this representation
36-
of an object. Servers should convert recognized schemas to the latest
37-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
34+
description: |-
35+
APIVersion defines the versioned schema of this representation of an object.
36+
Servers should convert recognized schemas to the latest internal value, and
37+
may reject unrecognized values.
38+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3839
type: string
3940
kind:
40-
description: 'Kind is a string value representing the REST resource this
41-
object represents. Servers may infer this from the endpoint the client
42-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
41+
description: |-
42+
Kind is a string value representing the REST resource this object represents.
43+
Servers may infer this from the endpoint the client submits requests to.
44+
Cannot be updated.
45+
In CamelCase.
46+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4347
type: string
4448
metadata:
4549
type: object
@@ -98,10 +102,10 @@ spec:
98102
operational state.
99103
properties:
100104
lastTransitionTime:
101-
description: Last time the condition transitioned from one status
102-
to another. This should be when the underlying condition changed.
103-
If that is not known, then using the time when the API field
104-
changed is acceptable.
105+
description: |-
106+
Last time the condition transitioned from one status to another.
107+
This should be when the underlying condition changed. If that is not known, then using the time when
108+
the API field changed is acceptable.
105109
format: date-time
106110
type: string
107111
message:
@@ -113,14 +117,13 @@ spec:
113117
in CamelCase.
114118
type: string
115119
severity:
116-
description: Severity provides a classification of Reason code,
117-
so the current situation is immediately understandable and
118-
could act accordingly. It is meant for situations where Status=False
119-
and it should be indicated if it is just informational, warning
120-
(next reconciliation might fix it) or an error (e.g. DB create
121-
issue and no actions to automatically resolve the issue can/should
122-
be done). For conditions where Status=Unknown or Status=True
123-
the Severity should be SeverityNone.
120+
description: |-
121+
Severity provides a classification of Reason code, so the current situation is immediately
122+
understandable and could act accordingly.
123+
It is meant for situations where Status=False and it should be indicated if it is just
124+
informational, warning (next reconciliation might fix it) or an error (e.g. DB create issue
125+
and no actions to automatically resolve the issue can/should be done).
126+
For conditions where Status=Unknown or Status=True the Severity should be SeverityNone.
124127
type: string
125128
status:
126129
description: Status of the condition, one of True, False, Unknown.
@@ -140,11 +143,11 @@ spec:
140143
description: Map of hashes to track e.g. job status
141144
type: object
142145
observedGeneration:
143-
description: ObservedGeneration - the most recent generation observed
144-
for this service. If the observed generation is less than the spec
145-
generation, then the controller has not processed the latest changes
146-
injected by the openstack-operator in the top-level CR (e.g. the
147-
ContainerImage)
146+
description: |-
147+
ObservedGeneration - the most recent generation observed for this
148+
service. If the observed generation is less than the spec generation,
149+
then the controller has not processed the latest changes injected by
150+
the openstack-operator in the top-level CR (e.g. the ContainerImage)
148151
format: int64
149152
type: integer
150153
type: object

0 commit comments

Comments
 (0)