Skip to content

[DNM] 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

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
+3,951 −202
Open

[DNM] Add CloudKitty to the services deployed by Telemetry #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
86c1aef
Add CloudKitty to the services deployed by Telemetry
jlarriba Jul 1, 2025
47f199f
Merge branch 'main' into cloudkitty
jlarriba Sep 23, 2025
f96223b
Test unmerged version of the telemetry-operator
jlarriba Sep 23, 2025
05c41e1
Added cloudkitty to sample deployment
jlarriba Sep 23, 2025
d08b934
Adjust to use CloudKittyCore to avoid exposing images in the ControlP…
jlarriba Sep 29, 2025
4a15fb3
Update bindata for CloudKittySpecCore usage
jlarriba Sep 30, 2025
73fc732
Merge branch 'main' into cloudkitty
jlarriba Sep 30, 2025
52f4f07
Fixed go.mod
jlarriba Sep 30, 2025
8c6915f
Fix errors with image names
jlarriba Oct 1, 2025
28dd366
Use new version of Telemetry-Operator
jlarriba Oct 2, 2025
accf975
Merge branch 'main' into cloudkitty
jlarriba Oct 9, 2025
95eb6f9
Merge branch 'main' into cloudkitty
elfiesmelfie Oct 22, 2025
9d054ac
Merge branch 'main' into cloudkitty
elfiesmelfie Oct 23, 2025
b4898d8
Merge branch 'main' into cloudkitty
jlarriba Oct 28, 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
457 changes: 457 additions & 0 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Open in desktop

Large diffs are not rendered by default.

209 changes: 12 additions & 197 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 @@ -674,203 +686,6 @@ spec:
glanceWsgi:
type: string
type: object
trackedCustomImages:
additionalProperties:
properties:
agentImage:
type: string
ansibleeeImage:
type: string
aodhAPIImage:
type: string
aodhEvaluatorImage:
type: string
aodhListenerImage:
type: string
aodhNotifierImage:
type: string
apacheImage:
type: string
barbicanAPIImage:
type: string
barbicanKeystoneListenerImage:
type: string
barbicanWorkerImage:
type: string
ceilometerCentralImage:
type: string
ceilometerComputeImage:
type: string
ceilometerIpmiImage:
type: string
ceilometerMysqldExporterImage:
type: string
ceilometerNotificationImage:
type: string
ceilometerSgcoreImage:
type: string
cinderAPIImage:
type: string
cinderBackupImage:
type: string
cinderSchedulerImage:
type: string
cinderVolumeImages:
additionalProperties:
type: string
type: object
designateAPIImage:
type: string
designateBackendbind9Image:
type: string
designateCentralImage:
type: string
designateMdnsImage:
type: string
designateProducerImage:
type: string
designateUnboundImage:
type: string
designateWorkerImage:
type: string
edpmFrrImage:
type: string
edpmIscsidImage:
type: string
edpmKeplerImage:
type: string
edpmLogrotateCrondImage:
type: string
edpmMultipathdImage:
type: string
edpmNeutronDhcpAgentImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronOvnAgentImage:
type: string
edpmNeutronSriovAgentImage:
type: string
edpmNodeExporterImage:
type: string
edpmOpenstackNetworkExporterImage:
type: string
edpmOvnBgpAgentImage:
type: string
edpmPodmanExporterImage:
type: string
glanceAPIImage:
type: string
heatAPIImage:
type: string
heatCfnapiImage:
type: string
heatEngineImage:
type: string
horizonImage:
type: string
infraDnsmasqImage:
type: string
infraMemcachedImage:
type: string
infraRedisImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
type: string
keystoneAPIImage:
type: string
ksmImage:
type: string
manilaAPIImage:
type: string
manilaSchedulerImage:
type: string
manilaShareImages:
additionalProperties:
type: string
type: object
mariadbImage:
type: string
netUtilsImage:
type: string
neutronAPIImage:
type: string
novaAPIImage:
type: string
novaComputeImage:
type: string
novaConductorImage:
type: string
novaNovncImage:
type: string
novaSchedulerImage:
type: string
octaviaAPIImage:
type: string
octaviaHealthmanagerImage:
type: string
octaviaHousekeepingImage:
type: string
octaviaRsyslogImage:
type: string
octaviaWorkerImage:
type: string
openstackClientImage:
type: string
openstackNetworkExporterImage:
type: string
osContainerImage:
type: string
ovnControllerImage:
type: string
ovnControllerOvsImage:
type: string
ovnNbDbclusterImage:
type: string
ovnNorthdImage:
type: string
ovnSbDbclusterImage:
type: string
placementAPIImage:
type: string
rabbitmqImage:
type: string
swiftAccountImage:
type: string
swiftContainerImage:
type: string
swiftObjectImage:
type: string
swiftProxyImage:
type: string
telemetryNodeExporterImage:
type: string
testAnsibletestImage:
type: string
testHorizontestImage:
type: string
testTempestImage:
type: string
testTobikoImage:
type: string
watcherAPIImage:
type: string
watcherApplierImage:
type: string
watcherDecisionEngineImage:
type: string
type: object
type: object
type: object
type: object
served: true
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.

3 changes: 3 additions & 0 deletions apis/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,6 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.13 //allow-merging
replace k8s.io/component-base => k8s.io/component-base v0.31.13 //allow-merging

replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging

// Test CloudKitty
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20251002075820-bed9eb4c0105 //allow-merging
2 changes: 2 additions & 0 deletions apis/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ github.com/gophercloud/gophercloud/v2 v2.8.0 h1:of2+8tT6+FbEYHfYC8GBu8TXJNsXYSNm
github.com/gophercloud/gophercloud/v2 v2.8.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk=
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20251002075820-bed9eb4c0105 h1:bTNbiwut7yXBio/YZQrbE0Xrl7hBWBar76sEWo8H+P4=
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20251002075820-bed9eb4c0105/go.mod h1:v4Stbc6YFVR3r7ofSuErpTJ9Ki2Ka9Fs8S+dgiNqx60=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE=
Expand Down
Loading
Loading