Skip to content

Commit a96012f

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1701 from jlarriba/18.0-fr-4_origin
[18.0-fr4] Add CloudKitty to the services deployed by Telemetry
2 parents 3feaf3f + 21f5842 commit a96012f

27 files changed

Lines changed: 4052 additions & 13 deletions

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 470 additions & 0 deletions
Large diffs are not rendered by default.

‎apis/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ spec:
8383
additionalProperties:
8484
type: string
8585
type: object
86+
cloudkittyAPIImage:
87+
type: string
88+
cloudkittyProcImage:
89+
type: string
8690
designateAPIImage:
8791
type: string
8892
designateBackendbind9Image:
@@ -315,6 +319,10 @@ spec:
315319
type: string
316320
cinderVolumeImage:
317321
type: string
322+
cloudkittyAPIImage:
323+
type: string
324+
cloudkittyProcImage:
325+
type: string
318326
designateAPIImage:
319327
type: string
320328
designateBackendbind9Image:
@@ -511,6 +519,10 @@ spec:
511519
additionalProperties:
512520
type: string
513521
type: object
522+
cloudkittyAPIImage:
523+
type: string
524+
cloudkittyProcImage:
525+
type: string
514526
designateAPIImage:
515527
type: string
516528
designateBackendbind9Image:
@@ -719,6 +731,10 @@ spec:
719731
additionalProperties:
720732
type: string
721733
type: object
734+
cloudkittyAPIImage:
735+
type: string
736+
cloudkittyProcImage:
737+
type: string
722738
designateAPIImage:
723739
type: string
724740
designateBackendbind9Image:

‎apis/core/v1beta1/openstackcontrolplane_types.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,11 @@ type TelemetrySection struct {
702702
// AodhAPIOverride, provides the ability to override the generated manifest of several child resources.
703703
AodhAPIOverride Override `json:"aodhApiOverride,omitempty"`
704704

705+
// +kubebuilder:validation:Optional
706+
// +operator-sdk:csv:customresourcedefinitions:type=spec
707+
// CloudKittyAPIOverride, provides the ability to override the generated manifest of several child resources.
708+
CloudKittyAPIOverride Override `json:"cloudKittyApiOverride,omitempty"`
709+
705710
// +kubebuilder:validation:Optional
706711
// +operator-sdk:csv:customresourcedefinitions:type=spec
707712
// PrometheusOverride, provides the ability to override the generated manifest of several child resources.

‎apis/core/v1beta1/openstackcontrolplane_webhook.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@ func (r *OpenStackControlPlane) checkDepsEnabled(name string) string {
253253
if !(r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {
254254
reqs = "RabbitMQ, Keystone"
255255
}
256+
case "Telemetry.CloudKitty":
257+
if !(r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {
258+
reqs = "RabbitMQ, Keystone"
259+
}
256260
case "Watcher":
257261
if !(r.Spec.Galera.Enabled && r.Spec.Memcached.Enabled && r.Spec.Rabbitmq.Enabled &&
258262
r.Spec.Keystone.Enabled && r.Spec.Telemetry.Enabled && *r.Spec.Telemetry.Template.Ceilometer.Enabled &&

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ type ContainerTemplate struct {
9696
CinderAPIImage *string `json:"cinderAPIImage,omitempty"`
9797
CinderBackupImage *string `json:"cinderBackupImage,omitempty"`
9898
CinderSchedulerImage *string `json:"cinderSchedulerImage,omitempty"`
99+
CloudKittyAPIImage *string `json:"cloudkittyAPIImage,omitempty"`
100+
CloudKittyProcImage *string `json:"cloudkittyProcImage,omitempty"`
99101
DesignateAPIImage *string `json:"designateAPIImage,omitempty"`
100102
DesignateBackendbind9Image *string `json:"designateBackendbind9Image,omitempty"`
101103
DesignateCentralImage *string `json:"designateCentralImage,omitempty"`

‎apis/core/v1beta1/zz_generated.deepcopy.go‎

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

‎apis/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251103075458-839beecbc0cf
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251103075458-bb52891ceb4a
2929
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251103075457-bf69b113b50f
30-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251103075744-567208b9e9b3
30+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251121101416-eac10e695be1
3131
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251103111045-bd934b3b0115
3232
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
3333
github.com/rhobs/observability-operator v0.3.1 // indirect

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2025092
158158
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
159159
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251103075457-bf69b113b50f h1:l7eV5siT7ApFRC+refY/ial8/otzJYZgzxGFyAl1VDE=
160160
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251103075457-bf69b113b50f/go.mod h1:mkV7Qi+cBajk0xLVXLWxUpQ69QQWi0f6uMGWNj4M6m0=
161-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251103075744-567208b9e9b3 h1:dj9vgsLgGQ2ob0NC8ZXAbi6WN4nURVaYHOTi6SrCJBI=
162-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251103075744-567208b9e9b3/go.mod h1:63WHEPz5AWu3bhyCDbK3RkSKNRDEemZIJO/GcJ23j9w=
161+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251121101416-eac10e695be1 h1:jTeG7SDGPl3z6Bfcio/hUUAAEbyB8EfRTgdydyZcc2Y=
162+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251121101416-eac10e695be1/go.mod h1:63WHEPz5AWu3bhyCDbK3RkSKNRDEemZIJO/GcJ23j9w=
163163
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251103111045-bd934b3b0115 h1:R44EqJojwnEcnG2g5ALgIEBv/QsFW481qerKMh3ttic=
164164
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251103111045-bd934b3b0115/go.mod h1:97n2fQ9lyGcJhPq1Gd+rvh4fB3//en6YQI5WsjElS8M=
165165
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

0 commit comments

Comments
 (0)