Merge master into PR #11672

kumahq · Oct 9, 2024 · 758a206 · 758a206
2 parents ad6bcde + 7d7fd8f
commit 758a206
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/plugins/runtime/k8s/plugin.go b/pkg/plugins/runtime/k8s/plugin.go
@@ -81,7 +81,7 @@ func addControllers(mgr kube_ctrl.Manager, rt core_runtime.Runtime, converter k8
 	if err := addServiceReconciler(mgr); err != nil {
 		return err
 	}
-	if err := addMeshServiceReconciler(mgr, converter); err != nil {
+	if err := addMeshServiceReconciler(mgr, rt, converter); err != nil {
 		return err
 	}
 	if err := addMeshReconciler(mgr, rt); err != nil {
@@ -138,7 +138,10 @@ func addServiceReconciler(mgr kube_ctrl.Manager) error {
 	return reconciler.SetupWithManager(mgr)
 }
 
-func addMeshServiceReconciler(mgr kube_ctrl.Manager, converter k8s_common.Converter) error {
+func addMeshServiceReconciler(mgr kube_ctrl.Manager, rt core_runtime.Runtime, converter k8s_common.Converter) error {
+	if rt.Config().Mode == config_core.Global {
+		return nil
+	}
 	reconciler := &k8s_controllers.MeshServiceReconciler{
 		Client:            mgr.GetClient(),
 		Log:               core.Log.WithName("controllers").WithName("MeshService"),