diff --git a/cmd/main.go b/cmd/main.go index 8ec5ff4..601a868 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -136,6 +136,9 @@ func main() { debug.SetMemoryLimit(gibibytes_per_bytes) go printMemUsage(ctrl.Log.WithName("memory-usage")) + server.InitializeManagerInstance(ctx, mgr.GetConfig(), mgr.GetClient(), scheme, + httpPort, ctrl.Log.WithName("gin")) + startSveltosClusterController(mgr) startClusterSummaryController(mgr) startClusterProfileController(mgr) @@ -146,9 +149,6 @@ func main() { go startClusterController(ctx, mgr, setupLog) - server.InitializeManagerInstance(ctx, mgr.GetConfig(), mgr.GetClient(), scheme, - httpPort, ctrl.Log.WithName("gin")) - setupLog.Info("starting manager") if err := mgr.Start(ctx); err != nil { setupLog.Error(err, "problem running manager") diff --git a/internal/controller/cluster_controller.go b/internal/controller/cluster_controller.go index 1c2a07c..5df9941 100644 --- a/internal/controller/cluster_controller.go +++ b/internal/controller/cluster_controller.go @@ -78,6 +78,10 @@ func (r *ClusterReconciler) removeCAPICluster(clusterNamespace, clusterName stri logger.V(logs.LogInfo).Info("Reconciling Cluster delete") manager := server.GetManagerInstance() + if manager == nil { + logger.V(logs.LogInfo).Info("Manager not initialized yet, skipping") + return + } manager.RemoveCAPICluster(clusterNamespace, clusterName) @@ -88,6 +92,10 @@ func (r *ClusterReconciler) reconcileNormal(cluster *clusterv1.Cluster, logger l logger.V(logs.LogInfo).Info("Reconciling Cluster normal") manager := server.GetManagerInstance() + if manager == nil { + logger.V(logs.LogInfo).Info("Manager not initialized yet, skipping") + return + } manager.AddCAPICluster(cluster) diff --git a/internal/controller/clusterprofile_controller.go b/internal/controller/clusterprofile_controller.go index 6829b63..75656d5 100644 --- a/internal/controller/clusterprofile_controller.go +++ b/internal/controller/clusterprofile_controller.go @@ -79,6 +79,10 @@ func (r *ClusterProfileReconciler) removeClusterProfile(clusterProfileName strin logger.V(logs.LogInfo).Info("Reconciling ClusterProfile delete") manager := server.GetManagerInstance() + if manager == nil { + logger.V(logs.LogInfo).Info("Manager not initialized yet, skipping") + return + } profileRef := &corev1.ObjectReference{ Kind: configv1beta1.ClusterProfileKind, @@ -95,6 +99,10 @@ func (r *ClusterProfileReconciler) reconcileNormal(clusterProfile *configv1beta1 logger.V(logs.LogInfo).Info("Reconciling ClusterProfile normal") manager := server.GetManagerInstance() + if manager == nil { + logger.V(logs.LogInfo).Info("Manager not initialized yet, skipping") + return + } profileRef := &corev1.ObjectReference{ Kind: configv1beta1.ClusterProfileKind, diff --git a/internal/controller/clustersummary_controller.go b/internal/controller/clustersummary_controller.go index fac1cf5..510c68c 100644 --- a/internal/controller/clustersummary_controller.go +++ b/internal/controller/clustersummary_controller.go @@ -59,6 +59,10 @@ func (r *ClusterSummaryReconciler) removeClusterSummary(clusterSummaryNamespace, logger.V(logs.LogInfo).Info("Reconciling Cluster delete") manager := server.GetManagerInstance() + if manager == nil { + logger.V(logs.LogInfo).Info("Manager not initialized yet, skipping") + return + } manager.RemoveClusterProfileStatus(clusterSummaryNamespace, clusterSummaryName) @@ -69,6 +73,10 @@ func (r *ClusterSummaryReconciler) reconcileNormal(clusterSummary *configv1beta1 logger.V(logs.LogInfo).Info("Reconciling new ClusterSummary") manager := server.GetManagerInstance() + if manager == nil { + logger.V(logs.LogInfo).Info("Manager not initialized yet, skipping") + return + } manager.AddClusterProfileStatus(clusterSummary) diff --git a/internal/controller/profile_controller.go b/internal/controller/profile_controller.go index 16798f4..6cb1b85 100644 --- a/internal/controller/profile_controller.go +++ b/internal/controller/profile_controller.go @@ -79,6 +79,10 @@ func (r *ProfileReconciler) removeProfile(profileNamespace, profileName string, logger.V(logs.LogInfo).Info("Reconciling Profile delete") manager := server.GetManagerInstance() + if manager == nil { + logger.V(logs.LogInfo).Info("Manager not initialized yet, skipping") + return + } profileRef := &corev1.ObjectReference{ Kind: configv1beta1.ProfileKind, @@ -96,6 +100,10 @@ func (r *ProfileReconciler) reconcileNormal(profile *configv1beta1.Profile, logg logger.V(logs.LogInfo).Info("Reconciling Profile normal") manager := server.GetManagerInstance() + if manager == nil { + logger.V(logs.LogInfo).Info("Manager not initialized yet, skipping") + return + } profileRef := &corev1.ObjectReference{ Kind: configv1beta1.ProfileKind, diff --git a/internal/controller/sveltoscluster_controller.go b/internal/controller/sveltoscluster_controller.go index e7c6bb9..5c0bdf1 100644 --- a/internal/controller/sveltoscluster_controller.go +++ b/internal/controller/sveltoscluster_controller.go @@ -79,6 +79,10 @@ func (r *SveltosClusterReconciler) removeSveltosCluster(sveltosClusterNamespace, logger.V(logs.LogInfo).Info("Reconciling SveltosCluster delete") manager := server.GetManagerInstance() + if manager == nil { + logger.V(logs.LogInfo).Info("Manager not initialized yet, skipping") + return + } manager.RemoveSveltosCluster(sveltosClusterNamespace, sveltosClusterName) @@ -89,6 +93,10 @@ func (r *SveltosClusterReconciler) reconcileNormal(sveltosCluster *libsveltosv1b logger.V(logs.LogInfo).Info("Reconciling SveltosCluster normal") manager := server.GetManagerInstance() + if manager == nil { + logger.V(logs.LogInfo).Info("Manager not initialized yet, skipping") + return + } manager.AddSveltosCluster(sveltosCluster)