Skip to content

Add CloudKitty to the services deployed by Telemetry #1614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Nov 20, 2025
Merged

Add CloudKitty to the services deployed by Telemetry #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
470 changes: 470 additions & 0 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions apis/bases/core.openstack.org_openstackversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ spec:
additionalProperties:
type: string
type: object
cloudkittyAPIImage:
type: string
cloudkittyProcImage:
type: string
designateAPIImage:
type: string
designateBackendbind9Image:
Expand Down Expand Up @@ -315,6 +319,10 @@ spec:
type: string
cinderVolumeImage:
type: string
cloudkittyAPIImage:
type: string
cloudkittyProcImage:
type: string
designateAPIImage:
type: string
designateBackendbind9Image:
Expand Down Expand Up @@ -511,6 +519,10 @@ spec:
additionalProperties:
type: string
type: object
cloudkittyAPIImage:
type: string
cloudkittyProcImage:
type: string
designateAPIImage:
type: string
designateBackendbind9Image:
Expand Down Expand Up @@ -719,6 +731,10 @@ spec:
additionalProperties:
type: string
type: object
cloudkittyAPIImage:
type: string
cloudkittyProcImage:
type: string
designateAPIImage:
type: string
designateBackendbind9Image:
Expand Down
5 changes: 5 additions & 0 deletions apis/core/v1beta1/openstackcontrolplane_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,11 @@ type TelemetrySection struct {
// AodhAPIOverride, provides the ability to override the generated manifest of several child resources.
AodhAPIOverride Override `json:"aodhApiOverride,omitempty"`

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// CloudKittyAPIOverride, provides the ability to override the generated manifest of several child resources.
CloudKittyAPIOverride Override `json:"cloudKittyApiOverride,omitempty"`

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// PrometheusOverride, provides the ability to override the generated manifest of several child resources.
Expand Down
4 changes: 4 additions & 0 deletions apis/core/v1beta1/openstackcontrolplane_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,10 @@ func (r *OpenStackControlPlane) checkDepsEnabled(name string) string {
if !(r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {
reqs = "RabbitMQ, Keystone"
}
case "Telemetry.CloudKitty":
if !(r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {
reqs = "RabbitMQ, Keystone"
}
case "Watcher":
if !(r.Spec.Galera.Enabled && r.Spec.Memcached.Enabled && r.Spec.Rabbitmq.Enabled &&
r.Spec.Keystone.Enabled && r.Spec.Telemetry.Enabled && *r.Spec.Telemetry.Template.Ceilometer.Enabled &&
Expand Down
2 changes: 2 additions & 0 deletions apis/core/v1beta1/openstackversion_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ type ContainerTemplate struct {
CinderAPIImage *string `json:"cinderAPIImage,omitempty"`
CinderBackupImage *string `json:"cinderBackupImage,omitempty"`
CinderSchedulerImage *string `json:"cinderSchedulerImage,omitempty"`
CloudKittyAPIImage *string `json:"cloudkittyAPIImage,omitempty"`
CloudKittyProcImage *string `json:"cloudkittyProcImage,omitempty"`
DesignateAPIImage *string `json:"designateAPIImage,omitempty"`
DesignateBackendbind9Image *string `json:"designateBackendbind9Image,omitempty"`
DesignateCentralImage *string `json:"designateCentralImage,omitempty"`
Expand Down
11 changes: 11 additions & 0 deletions apis/core/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251111072459-1ceb14e1eab0
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251112201103-7583889cdb89
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251112213455-cc9071dc6aa0
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251105154519-2bcf8bd1e585
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251120134433-6280f54c4d86
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251112134615-47fb2954fea8
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
github.com/rhobs/observability-operator v0.3.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions apis/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2025092
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251112213455-cc9071dc6aa0 h1:lTWnuB7HUP5Wee4QC0lS+PKD4Ep3wsxlk8LAKGU6j1s=
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251112213455-cc9071dc6aa0/go.mod h1:ei5t/R+qRHpQkj+2Rtidx7V9t3GStquMRuB8xooLvPU=
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251105154519-2bcf8bd1e585 h1:KbSzdbRm3M64sf2JUJFoO3jOMt5+U4DmUt6cgNUSP9Y=
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251105154519-2bcf8bd1e585/go.mod h1:1DjlpLaA81y5pzBXP2mE6PcdMyobYu2AiArhbLlbBn8=
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251120134433-6280f54c4d86 h1:8nH646IJdpnjZTvaUAFPW94WrjQsd2O4wZqg8R8Tekc=
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251120134433-6280f54c4d86/go.mod h1:1DjlpLaA81y5pzBXP2mE6PcdMyobYu2AiArhbLlbBn8=
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251112134615-47fb2954fea8 h1:dSFlDD6W8ezsg8pBSbcbdRkrcYeOu/ZrzQtVEhfCtmE=
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251112134615-47fb2954fea8/go.mod h1:nln30Bm/OC/TuBVnYmia35eaV8MEQm/IZa9gC4PMbOc=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down
Loading