Merge pull request #394 from fmount/no_replicas

openshift-merge-bot[bot] · web-flow · commit d1753ea7881c · 2023-12-18T09:55:23.000Z
Do not report network related errors if replicas=0
diff --git a/controllers/glanceapi_controller.go b/controllers/glanceapi_controller.go
@@ -600,7 +600,7 @@ func (r *GlanceAPIReconciler) reconcileNormal(ctx context.Context, instance *gla
 	}
 
 	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)

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,7 @@ func (r GlanceAPIReconciler) reconcileNormal(ctx context.Context, instance gla`
`600`	`600`	`}`
`601`	`601`
`602`	`602`	`instance.Status.NetworkAttachments = networkAttachmentStatus`
`603`		`- if networkReady {`
	`603`	`+ if networkReady \|\| *instance.Spec.Replicas == 0 {`
`604`	`604`	`instance.Status.Conditions.MarkTrue(condition.NetworkAttachmentsReadyCondition, condition.NetworkAttachmentsReadyMessage)`
`605`	`605`	`} else {`
`606`	`606`	`err := fmt.Errorf("not all pods have interfaces with ips as configured in NetworkAttachments: %s", instance.Spec.NetworkAttachments)`