waitOcpVersionsInitialized with len of list

Author: Tof1973

pkg/frontend/changefeed.go

@@ -120,19 +120,26 @@ func (f *frontend) updateOcpVersions(docs []*api.OpenShiftVersionDocument) {
 }
 
 func (f *frontend) waitOcpVersionsInitialized() error {
+	f.ocpVersionsMu.RLock()
+	defer f.ocpVersionsMu.RUnlock()
+
 	timeout := time.After(10 * time.Second)
 	ticker := time.NewTicker(500 * time.Millisecond)
 	defer ticker.Stop()
 
-	for f.lastOcpVersionsChangefeed.Load() == nil {
-		f.baseLog.Infof("OCP versions not yet initialized, waiting for it...")
+	for len(f.enabledOcpVersions) == 0 {
+		f.ocpVersionsMu.RUnlock()
+		// Leave some time for changefeed to define versions in updateOcpVersions
+		f.baseLog.Infof("No, OCP version list defined yet, waiting for it...")
 		select {
-		case <-ticker.C:
 		case <-timeout:
-			f.baseLog.Error("Server do not have initialized OCP version within timeout")
-			return api.NewCloudError(http.StatusInternalServerError, api.CloudErrorCodeInternalServerError, "properties.clusterProfile.version", "No OpenShift version list defined on server side.")
+			f.baseLog.Error("Cluster creation failed with internal server error because server do not have any version list defined.")
+			return api.NewCloudError(http.StatusInternalServerError, api.CloudErrorCodeInternalServerError, "properties.clusterProfile.version", "No OpenShift version list defined.")
+		case <-ticker.C:
+			f.ocpVersionsMu.RLock()
 		}
 	}
+
 	return nil
 }