From 61cd3aa9cc6a4f89e394f655b562def8b51510ca Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Tue, 17 Aug 2021 21:32:42 +0300
Subject: [PATCH] Plugin registry is deployed after devfile registry (#1013)

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 controllers/che/checluster_controller.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/controllers/che/checluster_controller.go b/controllers/che/checluster_controller.go
index 06e27afe2..40cf5c8c4 100644
--- a/controllers/che/checluster_controller.go
+++ b/controllers/che/checluster_controller.go
@@ -543,6 +543,17 @@ func (r *CheClusterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error)
 		}
 	}
 
+	devfileRegistry := devfileregistry.NewDevfileRegistry(deployContext)
+	if !instance.Spec.Server.ExternalDevfileRegistry {
+		done, err := devfileRegistry.SyncAll()
+		if !done {
+			if err != nil {
+				logrus.Error(err)
+			}
+			return ctrl.Result{}, err
+		}
+	}
+
 	if !instance.Spec.Server.ExternalPluginRegistry {
 		pluginRegistry := pluginregistry.NewPluginRegistry(deployContext)
 		done, err := pluginRegistry.SyncAll()
@@ -561,17 +572,6 @@ func (r *CheClusterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error)
 		}
 	}
 
-	devfileRegistry := devfileregistry.NewDevfileRegistry(deployContext)
-	if !instance.Spec.Server.ExternalDevfileRegistry {
-		done, err := devfileRegistry.SyncAll()
-		if !done {
-			if err != nil {
-				logrus.Error(err)
-			}
-			return ctrl.Result{}, err
-		}
-	}
-
 	d := dashboard.NewDashboard(deployContext)
 	done, err = d.SyncAll()
 	if !done {