From ab5b4711a7a8230f4d3bb97a314d956b5f469f63 Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge <gthiemon@redhat.com> Date: Thu, 18 Apr 2024 14:06:46 +0000 Subject: [PATCH] Add missing default for Octavia ApacheImage --- pkg/openstack/octavia.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/openstack/octavia.go b/pkg/openstack/octavia.go index fe4af24bb..dac7390e6 100644 --- a/pkg/openstack/octavia.go +++ b/pkg/openstack/octavia.go @@ -158,6 +158,7 @@ func ReconcileOctavia(ctx context.Context, instance *corev1beta1.OpenStackContro octavia.Spec.OctaviaWorker.ContainerImage = *version.Status.ContainerImages.OctaviaWorkerImage octavia.Spec.OctaviaHealthManager.ContainerImage = *version.Status.ContainerImages.OctaviaHealthmanagerImage octavia.Spec.OctaviaHousekeeping.ContainerImage = *version.Status.ContainerImages.OctaviaHousekeepingImage + octavia.Spec.ApacheContainerImage = *version.Status.ContainerImages.ApacheImage err := controllerutil.SetControllerReference(helper.GetBeforeObject(), octavia, helper.GetScheme()) if err != nil { @@ -184,6 +185,7 @@ func ReconcileOctavia(ctx context.Context, instance *corev1beta1.OpenStackContro instance.Status.ContainerImages.OctaviaWorkerImage = version.Status.ContainerImages.OctaviaWorkerImage instance.Status.ContainerImages.OctaviaHealthmanagerImage = version.Status.ContainerImages.OctaviaHealthmanagerImage instance.Status.ContainerImages.OctaviaHousekeepingImage = version.Status.ContainerImages.OctaviaHousekeepingImage + instance.Status.ContainerImages.ApacheImage = version.Status.ContainerImages.ApacheImage instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneOctaviaReadyCondition, corev1beta1.OpenStackControlPlaneOctaviaReadyMessage) } else { instance.Status.Conditions.Set(condition.FalseCondition(