Merge pull request #999 from jlarriba/ceilometer_proxy_image

Replace Ceilometer's ProxyImage with a generic one to avoid duplicati…
openstack-k8s-operators · Aug 9, 2024 · 6987743 · 6987743
2 parents 3d86526 + 99698b2
commit 6987743
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 29 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -17519,8 +17519,6 @@ spec:
                     type: string
                   ceilometerNotificationImage:
                     type: string
-                  ceilometerProxyImage:
-                    type: string
                   ceilometerSgcoreImage:
                     type: string
                   cinderAPIImage:

diff --git a/apis/bases/core.openstack.org_openstackversions.yaml b/apis/bases/core.openstack.org_openstackversions.yaml
@@ -67,8 +67,6 @@ spec:
                     type: string
                   ceilometerNotificationImage:
                     type: string
-                  ceilometerProxyImage:
-                    type: string
                   ceilometerSgcoreImage:
                     type: string
                   cinderAPIImage:
@@ -272,8 +270,6 @@ spec:
                       type: string
                     ceilometerNotificationImage:
                       type: string
-                    ceilometerProxyImage:
-                      type: string
                     ceilometerSgcoreImage:
                       type: string
                     cinderAPIImage:
@@ -442,8 +438,6 @@ spec:
                     type: string
                   ceilometerNotificationImage:
                     type: string
-                  ceilometerProxyImage:
-                    type: string
                   ceilometerSgcoreImage:
                     type: string
                   cinderAPIImage:

diff --git a/apis/core/v1beta1/openstackversion_types.go b/apis/core/v1beta1/openstackversion_types.go
@@ -83,7 +83,6 @@ type ContainerTemplate struct {
 	CeilometerIpmiImage           *string `json:"ceilometerIpmiImage,omitempty"`
 	CeilometerNotificationImage   *string `json:"ceilometerNotificationImage,omitempty"`
 	CeilometerSgcoreImage         *string `json:"ceilometerSgcoreImage,omitempty"`
-	CeilometerProxyImage          *string `json:"ceilometerProxyImage,omitempty"`
 	CinderAPIImage                *string `json:"cinderAPIImage,omitempty"`
 	CinderBackupImage             *string `json:"cinderBackupImage,omitempty"`
 	CinderSchedulerImage          *string `json:"cinderSchedulerImage,omitempty"`

diff --git a/apis/core/v1beta1/zz_generated.deepcopy.go b/apis/core/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -17519,8 +17519,6 @@ spec:
                     type: string
                   ceilometerNotificationImage:
                     type: string
-                  ceilometerProxyImage:
-                    type: string
                   ceilometerSgcoreImage:
                     type: string
                   cinderAPIImage:

diff --git a/config/crd/bases/core.openstack.org_openstackversions.yaml b/config/crd/bases/core.openstack.org_openstackversions.yaml
@@ -67,8 +67,6 @@ spec:
                     type: string
                   ceilometerNotificationImage:
                     type: string
-                  ceilometerProxyImage:
-                    type: string
                   ceilometerSgcoreImage:
                     type: string
                   cinderAPIImage:
@@ -272,8 +270,6 @@ spec:
                       type: string
                     ceilometerNotificationImage:
                       type: string
-                    ceilometerProxyImage:
-                      type: string
                     ceilometerSgcoreImage:
                       type: string
                     cinderAPIImage:
@@ -442,8 +438,6 @@ spec:
                     type: string
                   ceilometerNotificationImage:
                     type: string
-                  ceilometerProxyImage:
-                    type: string
                   ceilometerSgcoreImage:
                     type: string
                   cinderAPIImage:

diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh
@@ -34,7 +34,6 @@ export RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT=quay.io/podified-antel
 export RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-notification:current-podified
 export RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified
 export RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT=quay.io/infrawatch/sg-core:v5.2.0-nextgen
-export RELATED_IMAGE_CEILOMETER_PROXY_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-api:current-podified
 export RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-api:current-podified
 export RELATED_IMAGE_AODH_EVALUATOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-evaluator:current-podified
 export RELATED_IMAGE_AODH_NOTIFIER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-notifier:current-podified

diff --git a/pkg/openstack/telemetry.go b/pkg/openstack/telemetry.go
@@ -46,7 +46,7 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
 		instance.Status.ContainerImages.CeilometerIpmiImage = nil
 		instance.Status.ContainerImages.CeilometerNotificationImage = nil
 		instance.Status.ContainerImages.CeilometerSgcoreImage = nil
-		instance.Status.ContainerImages.CeilometerProxyImage = nil
+		instance.Status.ContainerImages.ApacheImage = nil
 		instance.Status.ContainerImages.AodhAPIImage = nil
 		instance.Status.ContainerImages.AodhEvaluatorImage = nil
 		instance.Status.ContainerImages.AodhNotifierImage = nil
@@ -250,7 +250,7 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
 		telemetry.Spec.Ceilometer.IpmiImage = *version.Status.ContainerImages.CeilometerIpmiImage
 		telemetry.Spec.Ceilometer.NotificationImage = *version.Status.ContainerImages.CeilometerNotificationImage
 		telemetry.Spec.Ceilometer.SgCoreImage = *version.Status.ContainerImages.CeilometerSgcoreImage
-		telemetry.Spec.Ceilometer.ProxyImage = *version.Status.ContainerImages.CeilometerProxyImage
+		telemetry.Spec.Ceilometer.ProxyImage = *version.Status.ContainerImages.ApacheImage
 		telemetry.Spec.Autoscaling.AutoscalingSpec.Aodh.APIImage = *version.Status.ContainerImages.AodhAPIImage
 		telemetry.Spec.Autoscaling.AutoscalingSpec.Aodh.EvaluatorImage = *version.Status.ContainerImages.AodhEvaluatorImage
 		telemetry.Spec.Autoscaling.AutoscalingSpec.Aodh.NotifierImage = *version.Status.ContainerImages.AodhNotifierImage
@@ -297,7 +297,7 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
 		instance.Status.ContainerImages.CeilometerIpmiImage = version.Status.ContainerImages.CeilometerIpmiImage
 		instance.Status.ContainerImages.CeilometerNotificationImage = version.Status.ContainerImages.CeilometerNotificationImage
 		instance.Status.ContainerImages.CeilometerSgcoreImage = version.Status.ContainerImages.CeilometerSgcoreImage
-		instance.Status.ContainerImages.CeilometerProxyImage = version.Status.ContainerImages.CeilometerProxyImage
+		instance.Status.ContainerImages.ApacheImage = version.Status.ContainerImages.ApacheImage
 		instance.Status.ContainerImages.AodhAPIImage = version.Status.ContainerImages.AodhAPIImage
 		instance.Status.ContainerImages.AodhEvaluatorImage = version.Status.ContainerImages.AodhEvaluatorImage
 		instance.Status.ContainerImages.AodhNotifierImage = version.Status.ContainerImages.AodhNotifierImage
@@ -323,7 +323,7 @@ func TelemetryImageMatch(controlPlane *corev1beta1.OpenStackControlPlane, versio
 			!stringPointersEqual(controlPlane.Status.ContainerImages.CeilometerIpmiImage, version.Status.ContainerImages.CeilometerIpmiImage) ||
 			!stringPointersEqual(controlPlane.Status.ContainerImages.CeilometerNotificationImage, version.Status.ContainerImages.CeilometerNotificationImage) ||
 			!stringPointersEqual(controlPlane.Status.ContainerImages.CeilometerSgcoreImage, version.Status.ContainerImages.CeilometerSgcoreImage) ||
-			!stringPointersEqual(controlPlane.Status.ContainerImages.CeilometerProxyImage, version.Status.ContainerImages.CeilometerProxyImage) ||
+			!stringPointersEqual(controlPlane.Status.ContainerImages.ApacheImage, version.Status.ContainerImages.ApacheImage) ||
 			!stringPointersEqual(controlPlane.Status.ContainerImages.AodhAPIImage, version.Status.ContainerImages.AodhAPIImage) ||
 			!stringPointersEqual(controlPlane.Status.ContainerImages.AodhEvaluatorImage, version.Status.ContainerImages.AodhEvaluatorImage) ||
 			!stringPointersEqual(controlPlane.Status.ContainerImages.AodhNotifierImage, version.Status.ContainerImages.AodhNotifierImage) ||

diff --git a/pkg/openstack/version.go b/pkg/openstack/version.go
@@ -91,7 +91,6 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
 			CeilometerIpmiImage:           getImg(instance.Spec.CustomContainerImages.CeilometerIpmiImage, defaults.CeilometerIpmiImage),
 			CeilometerNotificationImage:   getImg(instance.Spec.CustomContainerImages.CeilometerNotificationImage, defaults.CeilometerNotificationImage),
 			CeilometerSgcoreImage:         getImg(instance.Spec.CustomContainerImages.CeilometerSgcoreImage, defaults.CeilometerSgcoreImage),
-			CeilometerProxyImage:          getImg(instance.Spec.CustomContainerImages.CeilometerProxyImage, defaults.CeilometerProxyImage),
 			CinderAPIImage:                getImg(instance.Spec.CustomContainerImages.CinderAPIImage, defaults.CinderAPIImage),
 			CinderBackupImage:             getImg(instance.Spec.CustomContainerImages.CinderBackupImage, defaults.CinderBackupImage),
 			CinderSchedulerImage:          getImg(instance.Spec.CustomContainerImages.CinderSchedulerImage, defaults.CinderSchedulerImage),

diff --git a/tests/functional/ctlplane/openstackversion_controller_test.go b/tests/functional/ctlplane/openstackversion_controller_test.go
@@ -113,7 +113,6 @@ var _ = Describe("OpenStackOperator controller", func() {
 				g.Expect(version.Status.ContainerImages.CeilometerComputeImage).ShouldNot(BeNil())
 				g.Expect(version.Status.ContainerImages.CeilometerNotificationImage).ShouldNot(BeNil())
 				g.Expect(version.Status.ContainerImages.CeilometerSgcoreImage).ShouldNot(BeNil())
-				g.Expect(version.Status.ContainerImages.CeilometerProxyImage).ShouldNot(BeNil())
 				g.Expect(version.Status.ContainerImages.CinderAPIImage).ShouldNot(BeNil())
 				g.Expect(version.Status.ContainerImages.CinderBackupImage).ShouldNot(BeNil())
 				g.Expect(version.Status.ContainerImages.CinderSchedulerImage).ShouldNot(BeNil())