Merge pull request #295 from cschwede/fix-networkready-zero-replicas

Fix NetworkReadyCondition if using zero replicas
openstack-k8s-operators · Nov 5, 2024 · 810e13b · 810e13b
2 parents 6b7166f + 3a50b3e
commit 810e13b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controllers/swiftproxy_controller.go b/controllers/swiftproxy_controller.go
@@ -660,7 +660,7 @@ func (r *SwiftProxyReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		}
 
 		instance.Status.NetworkAttachments = networkAttachmentStatus
-		if networkReady {
+		if networkReady || *instance.Spec.Replicas == 0 {
 			instance.Status.Conditions.MarkTrue(condition.NetworkAttachmentsReadyCondition, condition.NetworkAttachmentsReadyMessage)
 		} else {
 			err := fmt.Errorf("not all pods have interfaces with ips as configured in NetworkAttachments: %s", instance.Spec.NetworkAttachments)

diff --git a/controllers/swiftstorage_controller.go b/controllers/swiftstorage_controller.go
@@ -319,7 +319,7 @@ func (r *SwiftStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		}
 
 		instance.Status.NetworkAttachments = networkAttachmentStatus
-		if networkReady {
+		if networkReady || *instance.Spec.Replicas == 0 {
 			instance.Status.Conditions.MarkTrue(condition.NetworkAttachmentsReadyCondition, condition.NetworkAttachmentsReadyMessage)
 		} else {
 			err := fmt.Errorf("not all pods have interfaces with ips as configured in NetworkAttachments: %s", instance.Spec.NetworkAttachments)