Skip to content

[OSPRH-21888] Allow customizing config files of Aodh, Ceilometer and CloudKitty #813

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 3 commits into from
Jan 8, 2026
+809 −36
Merged

[OSPRH-21888] Allow customizing config files of Aodh, Ceilometer and CloudKitty #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e070a20
Allow customizing cloudkitty configs
vyzigold Nov 28, 2025
f8af70f
Allow customizing aodh config files
vyzigold Nov 27, 2025
c1e829a
Allow customizing ceilometer config files
vyzigold Nov 26, 2025
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
6 changes: 6 additions & 0 deletions api/bases/telemetry.openstack.org_autoscalings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ spec:
default: 60
description: APITimeout for Route and Apache
type: integer
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/aodh/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
default: '# add your customization here'
description: |-
Expand Down
6 changes: 6 additions & 0 deletions api/bases/telemetry.openstack.org_ceilometers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ spec:
type: string
computeImage:
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/ceilometer/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
default: '# add your customization here'
description: |-
Expand Down
12 changes: 12 additions & 0 deletions api/bases/telemetry.openstack.org_cloudkitties.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL (will
be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down Expand Up @@ -363,6 +369,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL (will
be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down
6 changes: 6 additions & 0 deletions api/bases/telemetry.openstack.org_cloudkittyapis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL (will
be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down
6 changes: 6 additions & 0 deletions api/bases/telemetry.openstack.org_cloudkittyprocs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL (will
be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down
24 changes: 24 additions & 0 deletions api/bases/telemetry.openstack.org_telemetries.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ spec:
default: 60
description: APITimeout for Route and Apache
type: integer
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/aodh/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
default: '# add your customization here'
description: |-
Expand Down Expand Up @@ -437,6 +443,12 @@ spec:
type: string
computeImage:
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/ceilometer/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
default: '# add your customization here'
description: |-
Expand Down Expand Up @@ -610,6 +622,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL
(will be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down Expand Up @@ -922,6 +940,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL
(will be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down
6 changes: 6 additions & 0 deletions api/v1beta1/autoscaling_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,12 @@ type AodhCore struct {
// TopologyRef to apply the Topology defined by the associated CR referenced
// by name
TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"`

// +kubebuilder:validation:Optional
// A name of a secret containing custom configuration files. Files
// from this secret will get copied into /etc/aodh/ and they'll
// overwrite any default files already present there.
CustomConfigsSecretName string `json:"customConfigsSecretName,omitempty"`
}

// AutoscalingSpec defines the desired state of Autoscaling
Expand Down
6 changes: 6 additions & 0 deletions api/v1beta1/ceilometer_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,12 @@ type CeilometerSpecCore struct {
// TopologyRef to apply the Topology defined by the associated CR referenced
// by name
TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"`

// +kubebuilder:validation:Optional
// A name of a secret containing custom configuration files. Files
// from this secret will get copied into /etc/ceilometer/ and they'll
// overwrite any default files already present there.
CustomConfigsSecretName string `json:"customConfigsSecretName,omitempty"`
}

// CeilometerStatus defines the observed state of Ceilometer
Expand Down
6 changes: 6 additions & 0 deletions api/v1beta1/cloudkittyapi_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ type CloudKittyAPITemplateCore struct {
// +operator-sdk:csv:customresourcedefinitions:type=spec
// TLS - Parameters related to the TLS
TLS tls.API `json:"tls,omitempty"`

// +kubebuilder:validation:Optional
// A name of a secret containing custom configuration files. Files
// from this secret will get copied into /etc/cloudkitty/ and they'll
// overwrite any default files already present there.
CustomConfigsSecretName string `json:"customConfigsSecretName,omitempty"`
}

// CloudKittyAPITemplate defines the input parameters for the CloudKitty API service
Expand Down
6 changes: 6 additions & 0 deletions api/v1beta1/cloudkittyproc_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ type CloudKittyProcTemplateCore struct {
// +operator-sdk:csv:customresourcedefinitions:type=spec
// TLS - Parameters related to the TLS
TLS tls.SimpleService `json:"tls,omitempty"`

// +kubebuilder:validation:Optional
// A name of a secret containing custom configuration files. Files
// from this secret will get copied into /etc/cloudkitty/ and they'll
// overwrite any default files already present there.
CustomConfigsSecretName string `json:"customConfigsSecretName,omitempty"`
}

// CloudKittyProcTemplate defines the input parameters for the CloudKitty Processor service
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/telemetry.openstack.org_autoscalings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ spec:
default: 60
description: APITimeout for Route and Apache
type: integer
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/aodh/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
default: '# add your customization here'
description: |-
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/telemetry.openstack.org_ceilometers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ spec:
type: string
computeImage:
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/ceilometer/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
default: '# add your customization here'
description: |-
Expand Down
12 changes: 12 additions & 0 deletions config/crd/bases/telemetry.openstack.org_cloudkitties.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL (will
be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down Expand Up @@ -363,6 +369,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL (will
be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/telemetry.openstack.org_cloudkittyapis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL (will
be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/telemetry.openstack.org_cloudkittyprocs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL (will
be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down
24 changes: 24 additions & 0 deletions config/crd/bases/telemetry.openstack.org_telemetries.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ spec:
default: 60
description: APITimeout for Route and Apache
type: integer
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/aodh/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
default: '# add your customization here'
description: |-
Expand Down Expand Up @@ -437,6 +443,12 @@ spec:
type: string
computeImage:
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/ceilometer/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
default: '# add your customization here'
description: |-
Expand Down Expand Up @@ -610,6 +622,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL
(will be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down Expand Up @@ -922,6 +940,12 @@ spec:
description: ContainerImage - CloudKitty Container Image URL
(will be set to environmental default if empty)
type: string
customConfigsSecretName:
description: |-
A name of a secret containing custom configuration files. Files
from this secret will get copied into /etc/cloudkitty/ and they'll
overwrite any default files already present there.
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
Expand Down
10 changes: 5 additions & 5 deletions internal/autoscaling/aodh_statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ func AodhStatefulSet(
}

// create Volume and VolumeMounts
volumes := getVolumes()
apiVolumeMounts := getVolumeMounts("aodh-api")
evaluatorVolumeMounts := getVolumeMounts("aodh-evaluator")
notifierVolumeMounts := getVolumeMounts("aodh-notifier")
listenerVolumeMounts := getVolumeMounts("aodh-listener")
volumes := getVolumes(instance)
apiVolumeMounts := getVolumeMounts(instance, "aodh-api")
evaluatorVolumeMounts := getVolumeMounts(instance, "aodh-evaluator")
notifierVolumeMounts := getVolumeMounts(instance, "aodh-notifier")
listenerVolumeMounts := getVolumeMounts(instance, "aodh-listener")

// add openstack CA cert if defined
if instance.Spec.Aodh.TLS.CaBundleSecretName != "" {
Expand Down
4 changes: 2 additions & 2 deletions internal/autoscaling/dbsync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ func DbSyncJob(instance *autoscalingv1beta1.Autoscaling, labels map[string]strin
args = append(args, dbSyncCommand)

// create Volume and VolumeMounts
volumes := getVolumes()
volumeMounts := getVolumeMounts("aodh-dbsync")
volumes := getVolumes(instance)
volumeMounts := getVolumeMounts(instance, "aodh-dbsync")
// add CA cert if defined
if instance.Spec.Aodh.TLS.CaBundleSecretName != "" {
volumes = append(volumes, instance.Spec.Aodh.TLS.CreateVolume())
Expand Down
Loading