Fix errors with image names

Author: jlarriba

config/operator/default_images.yaml

@@ -55,7 +55,7 @@ spec:
           value: quay.io/podified-antelope-centos9/openstack-cinder-volume:current-podified
         - name: RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT
           value: quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-api:current
-        - name: RELATED_IMAGE_CLOUDKITTY_PROCESSOR_IMAGE_URL_DEFAULT
+        - name: RELATED_IMAGE_CLOUDKITTY_PROC_IMAGE_URL_DEFAULT
           value: quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-processor:current
         - name: RELATED_IMAGE_DESIGNATE_API_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-designate-api:current-podified

pkg/openstack/telemetry.go

@@ -383,6 +383,7 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
 
 		telemetry.Spec.Ceilometer.Enabled = ptr.To(*instance.Spec.Telemetry.Template.Ceilometer.Enabled)
 		telemetry.Spec.Autoscaling.Enabled = ptr.To(*instance.Spec.Telemetry.Template.Autoscaling.Enabled)
+		telemetry.Spec.CloudKitty.Enabled = ptr.To(*instance.Spec.Telemetry.Template.CloudKitty.Enabled)
 
 		telemetry.Spec.Ceilometer.CentralImage = *version.Status.ContainerImages.CeilometerCentralImage
 		telemetry.Spec.Ceilometer.ComputeImage = *version.Status.ContainerImages.CeilometerComputeImage

pkg/openstack/version.go

@@ -131,9 +131,9 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
 			CinderAPIImage:                getImg(instance.Spec.CustomContainerImages.CinderAPIImage, defaults.CinderAPIImage),
 			CinderBackupImage:             getImg(instance.Spec.CustomContainerImages.CinderBackupImage, defaults.CinderBackupImage),
 			CinderSchedulerImage:          getImg(instance.Spec.CustomContainerImages.CinderSchedulerImage, defaults.CinderSchedulerImage),
-			CloudKittyAPIImage:            getImg(instance.Spec.CustomContainerImages.CloudKittyAPIImage, defaults.CloudKittyAPIImage),
-			CloudKittyProcImage:           getImg(instance.Spec.CustomContainerImages.CloudKittyProcImage, defaults.CloudKittyProcImage),
-			DesignateAPIImage:             getImg(instance.Spec.CustomContainerImages.DesignateAPIImage, defaults.DesignateAPIImage),
+			CloudKittyAPIImage:  getImg(instance.Spec.CustomContainerImages.CloudKittyAPIImage, defaults.CloudKittyAPIImage),
+			CloudKittyProcImage: getImg(instance.Spec.CustomContainerImages.CloudKittyProcImage, defaults.CloudKittyProcImage),
+			DesignateAPIImage:   getImg(instance.Spec.CustomContainerImages.DesignateAPIImage, defaults.DesignateAPIImage),
 			DesignateBackendbind9Image:    getImg(instance.Spec.CustomContainerImages.DesignateBackendbind9Image, defaults.DesignateBackendbind9Image),
 			DesignateCentralImage:         getImg(instance.Spec.CustomContainerImages.DesignateCentralImage, defaults.DesignateCentralImage),
 			DesignateMdnsImage:            getImg(instance.Spec.CustomContainerImages.DesignateMdnsImage, defaults.DesignateMdnsImage),