seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plugin registry is deployed after devfile registry (#1013) 

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/1017/head
Anatolii Bazko 2021-08-17 21:32:42 +03:00 committed by GitHub
parent 62f7a25ee4
commit 61cd3aa9cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
controllers/che/checluster_controller.go
View File

@ -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 {