Only init conditions for enabled services in InitConditions

Previously, InitConditions() added Unknown conditions for ALL services
regardless of whether they were enabled. When the controller short-
circuited before reaching a disabled service's reconciler (e.g., during
minor update gating), the disabled service's Unknown condition persisted
and was mirrored to the Ready condition, producing misleading status
like "Octavia not started" even when Octavia was disabled.

Only create conditions for services that are actually enabled. Always-on
conditions (CAs, Version, Infrastructure, BackupConfig, Client, Ready)
remain unconditional. The service reconcilers still handle the
enabled-to-disabled transition by removing their conditions.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Martin Schuppert <mschuppert@redhat.com>

Author: stuggi

api/core/v1beta1/openstackcontrolplane_types.go

@@ -1168,43 +1168,92 @@ func (instance *OpenStackControlPlane) InitConditions() {
 	if instance.Status.Conditions == nil {
 		instance.Status.Conditions = condition.Conditions{}
 	}
+
+	// Always-on conditions (no Enabled flag)
 	cl := condition.CreateList(
-		condition.UnknownCondition(OpenStackControlPlaneRabbitMQReadyCondition, condition.InitReason, OpenStackControlPlaneRabbitMQReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneOVNReadyCondition, condition.InitReason, OpenStackControlPlaneOVNReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneNeutronReadyCondition, condition.InitReason, OpenStackControlPlaneNeutronReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneMariaDBReadyCondition, condition.InitReason, OpenStackControlPlaneMariaDBReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneMemcachedReadyCondition, condition.InitReason, OpenStackControlPlaneMemcachedReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneKeystoneAPIReadyCondition, condition.InitReason, OpenStackControlPlaneKeystoneAPIReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlanePlacementAPIReadyCondition, condition.InitReason, OpenStackControlPlanePlacementAPIReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneGlanceReadyCondition, condition.InitReason, OpenStackControlPlaneGlanceReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneCinderReadyCondition, condition.InitReason, OpenStackControlPlaneCinderReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneNovaReadyCondition, condition.InitReason, OpenStackControlPlaneNovaReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneIronicReadyCondition, condition.InitReason, OpenStackControlPlaneIronicReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneClientReadyCondition, condition.InitReason, OpenStackControlPlaneClientReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneManilaReadyCondition, condition.InitReason, OpenStackControlPlaneManilaReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneHorizonReadyCondition, condition.InitReason, OpenStackControlPlaneHorizonReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneDNSReadyCondition, condition.InitReason, OpenStackControlPlaneDNSReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneTelemetryReadyCondition, condition.InitReason, OpenStackControlPlaneTelemetryReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneHeatReadyCondition, condition.InitReason, OpenStackControlPlaneHeatReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneSwiftReadyCondition, condition.InitReason, OpenStackControlPlaneSwiftReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneOctaviaReadyCondition, condition.InitReason, OpenStackControlPlaneOctaviaReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneDesignateReadyCondition, condition.InitReason, OpenStackControlPlaneDesignateReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneBarbicanReadyCondition, condition.InitReason, OpenStackControlPlaneBarbicanReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneRedisReadyCondition, condition.InitReason, OpenStackControlPlaneRedisReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneCAReadyCondition, condition.InitReason, OpenStackControlPlaneCAReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneOpenStackVersionInitializationReadyCondition, condition.InitReason, OpenStackControlPlaneOpenStackVersionInitializationReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneWatcherReadyCondition, condition.InitReason, OpenStackControlPlaneWatcherReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneInfrastructureReadyCondition, condition.InitReason, OpenStackControlPlaneInfrastructureReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneBackupConfigReadyCondition, condition.InitReason, OpenStackControlPlaneBackupConfigReadyInitMessage),
-
-		// Also add the overall status condition as Unknown
+		condition.UnknownCondition(OpenStackControlPlaneClientReadyCondition, condition.InitReason, OpenStackControlPlaneClientReadyInitMessage),
 		condition.UnknownCondition(condition.ReadyCondition, condition.InitReason, condition.ReadyInitMessage),
 	)
+
+	// Only init conditions for enabled services to avoid misleading status
+	// when the controller doesn't reach a disabled service's reconciler
+	// (e.g., during minor update gating).
+	if instance.Spec.Rabbitmq.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneRabbitMQReadyCondition, condition.InitReason, OpenStackControlPlaneRabbitMQReadyInitMessage))
+	}
+	if instance.Spec.Ovn.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneOVNReadyCondition, condition.InitReason, OpenStackControlPlaneOVNReadyInitMessage))
+	}
+	if instance.Spec.Neutron.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneNeutronReadyCondition, condition.InitReason, OpenStackControlPlaneNeutronReadyInitMessage))
+	}
+	if instance.Spec.Galera.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneMariaDBReadyCondition, condition.InitReason, OpenStackControlPlaneMariaDBReadyInitMessage))
+	}
+	if instance.Spec.Memcached.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneMemcachedReadyCondition, condition.InitReason, OpenStackControlPlaneMemcachedReadyInitMessage))
+	}
+	if instance.Spec.Keystone.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneKeystoneAPIReadyCondition, condition.InitReason, OpenStackControlPlaneKeystoneAPIReadyInitMessage))
+	}
+	if instance.Spec.Placement.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlanePlacementAPIReadyCondition, condition.InitReason, OpenStackControlPlanePlacementAPIReadyInitMessage))
+	}
+	if instance.Spec.Glance.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneGlanceReadyCondition, condition.InitReason, OpenStackControlPlaneGlanceReadyInitMessage))
+	}
+	if instance.Spec.Cinder.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneCinderReadyCondition, condition.InitReason, OpenStackControlPlaneCinderReadyInitMessage))
+	}
+	if instance.Spec.Nova.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneNovaReadyCondition, condition.InitReason, OpenStackControlPlaneNovaReadyInitMessage))
+	}
+	if instance.Spec.Ironic.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneIronicReadyCondition, condition.InitReason, OpenStackControlPlaneIronicReadyInitMessage))
+	}
+	if instance.Spec.Manila.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneManilaReadyCondition, condition.InitReason, OpenStackControlPlaneManilaReadyInitMessage))
+	}
+	if instance.Spec.Horizon.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneHorizonReadyCondition, condition.InitReason, OpenStackControlPlaneHorizonReadyInitMessage))
+	}
+	if instance.Spec.DNS.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneDNSReadyCondition, condition.InitReason, OpenStackControlPlaneDNSReadyInitMessage))
+	}
+	if instance.Spec.Telemetry.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneTelemetryReadyCondition, condition.InitReason, OpenStackControlPlaneTelemetryReadyInitMessage))
+	}
+	if instance.Spec.Heat.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneHeatReadyCondition, condition.InitReason, OpenStackControlPlaneHeatReadyInitMessage))
+	}
+	if instance.Spec.Swift.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneSwiftReadyCondition, condition.InitReason, OpenStackControlPlaneSwiftReadyInitMessage))
+	}
+	if instance.Spec.Octavia.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneOctaviaReadyCondition, condition.InitReason, OpenStackControlPlaneOctaviaReadyInitMessage))
+	}
+	if instance.Spec.Designate.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneDesignateReadyCondition, condition.InitReason, OpenStackControlPlaneDesignateReadyInitMessage))
+	}
+	if instance.Spec.Barbican.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneBarbicanReadyCondition, condition.InitReason, OpenStackControlPlaneBarbicanReadyInitMessage))
+	}
+	if instance.Spec.Redis.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneRedisReadyCondition, condition.InitReason, OpenStackControlPlaneRedisReadyInitMessage))
+	}
+	if instance.Spec.Watcher.Enabled {
+		cl.Set(condition.UnknownCondition(OpenStackControlPlaneWatcherReadyCondition, condition.InitReason, OpenStackControlPlaneWatcherReadyInitMessage))
+	}
+
 	// Init Topology condition if there's a reference
 	if instance.Spec.TopologyRef != nil {
-		c := condition.UnknownCondition(condition.TopologyReadyCondition, condition.InitReason, condition.TopologyReadyInitMessage)
-		cl.Set(c)
+		cl.Set(condition.UnknownCondition(condition.TopologyReadyCondition, condition.InitReason, condition.TopologyReadyInitMessage))
 	}
+
 	// initialize conditions used later as Status=Unknown
 	instance.Status.Conditions.Init(&cl)
 }

test/kuttl/tests/ctlplane-staged-deployment/01-assert-infrastructure-ready-paused.yaml

@@ -34,31 +34,16 @@ status:
   - reason: Init
     status: Unknown
     type: OpenStackControlPlaneClientReady
-  - reason: Init
-    status: Unknown
-    type: OpenStackControlPlaneDesignateReady
   - reason: Init
     status: Unknown
     type: OpenStackControlPlaneGlanceReady
-  - reason: Init
-    status: Unknown
-    type: OpenStackControlPlaneHeatReady
-  - reason: Init
-    status: Unknown
-    type: OpenStackControlPlaneHorizonReady
   - message: OpenStackControlPlane Infrastructure ready - deployment paused. Remove annotation to resume reconcile of OpenStack services
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneInfrastructureReady
-  - reason: Init
-    status: Unknown
-    type: OpenStackControlPlaneIronicReady
   - reason: Init
     status: Unknown
     type: OpenStackControlPlaneKeystoneAPIReady
-  - reason: Init
-    status: Unknown
-    type: OpenStackControlPlaneManilaReady
   - message: OpenStackControlPlane MariaDB completed
     reason: Ready
     status: "True"
@@ -77,9 +62,6 @@ status:
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneOVNReady
-  - reason: Init
-    status: Unknown
-    type: OpenStackControlPlaneOctaviaReady
   - message: OpenStackControlPlane OpenStackVersion initialized
     reason: Ready
     status: "True"
@@ -91,15 +73,9 @@ status:
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneRabbitMQReady
-  - reason: Init
-    status: Unknown
-    type: OpenStackControlPlaneRedisReady
   - reason: Init
     status: Unknown
     type: OpenStackControlPlaneSwiftReady
   - reason: Init
     status: Unknown
     type: OpenStackControlPlaneTelemetryReady
-  - reason: Init
-    status: Unknown
-    type: OpenStackControlPlaneWatcherReady