Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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")
Expand Down
8 changes: 8 additions & 0 deletions internal/controller/cluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand Down
8 changes: 8 additions & 0 deletions internal/controller/clusterprofile_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
8 changes: 8 additions & 0 deletions internal/controller/clustersummary_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand Down
8 changes: 8 additions & 0 deletions internal/controller/profile_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
8 changes: 8 additions & 0 deletions internal/controller/sveltoscluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand Down