Merge pull request #414 from shiftstack/fix-image-import-status

mandre · web-flow · commit d90ac7023280 · 2025-05-20T18:10:48.000+02:00
image: Poll until image is ready
diff --git a/internal/controllers/image/status.go b/internal/controllers/image/status.go
@@ -69,7 +69,7 @@ func (imageStatusWriter) ResourceAvailableStatus(orcObject orcObjectPT, osResour
 	if osResource.Status == images.ImageStatusActive {
 		return metav1.ConditionTrue, nil
 	}
-	return metav1.ConditionFalse, nil
+	return metav1.ConditionFalse, progress.WaitingOnOpenStack(progress.WaitingOnReady, externalUpdatePollingPeriod)
 }
 
 func (imageStatusWriter) ApplyResourceStatus(log logr.Logger, osResource *osResourceT, statusApply statusApplyPT) {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (imageStatusWriter) ResourceAvailableStatus(orcObject orcObjectPT, osResour`
`69`	`69`	`if osResource.Status == images.ImageStatusActive {`
`70`	`70`	`return metav1.ConditionTrue, nil`
`71`	`71`	`}`
`72`		`- return metav1.ConditionFalse, nil`
	`72`	`+ return metav1.ConditionFalse, progress.WaitingOnOpenStack(progress.WaitingOnReady, externalUpdatePollingPeriod)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`func (imageStatusWriter) ApplyResourceStatus(log logr.Logger, osResource *osResourceT, statusApply statusApplyPT) {`