[18.0-fr4] Add CloudKitty to the services deployed by Telemetry

Author: jlarriba

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -83,6 +83,10 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  cloudkittyAPIImage:
+                    type: string
+                  cloudkittyProcImage:
+                    type: string
                   designateAPIImage:
                     type: string
                   designateBackendbind9Image:
@@ -315,6 +319,10 @@ spec:
                       type: string
                     cinderVolumeImage:
                       type: string
+                    cloudkittyAPIImage:
+                      type: string
+                    cloudkittyProcImage:
+                      type: string
                     designateAPIImage:
                       type: string
                     designateBackendbind9Image:
@@ -511,6 +519,10 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  cloudkittyAPIImage:
+                    type: string
+                  cloudkittyProcImage:
+                    type: string
                   designateAPIImage:
                     type: string
                   designateBackendbind9Image:
@@ -719,6 +731,10 @@ spec:
                       additionalProperties:
                         type: string
                       type: object
+                    cloudkittyAPIImage:
+                      type: string
+                    cloudkittyProcImage:
+                      type: string
                     designateAPIImage:
                       type: string
                     designateBackendbind9Image:

apis/bases/core.openstack.org_openstackversions.yaml

@@ -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.

apis/core/v1beta1/openstackcontrolplane_types.go

@@ -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 &&

apis/core/v1beta1/openstackcontrolplane_webhook.go

@@ -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"`