diff --git a/main.go b/main.go index 3747357da6a..7e4e9971142 100644 --- a/main.go +++ b/main.go @@ -214,6 +214,21 @@ func main() { //nolint:funlen } } + // Create default DSC CR for managed RHODS + if platform == cluster.ManagedRhods { + var createDefaultDSCFunc manager.RunnableFunc = func(ctx context.Context) error { + err := upgrade.CreateDefaultDSC(context.TODO(), setupClient) + if err != nil { + setupLog.Error(err, "unable to create default DSC CR by the operator") + } + return err + } + err := mgr.Add(createDefaultDSCFunc) + if err != nil { + setupLog.Error(err, "error scheduling DSC creation") + os.Exit(1) + } + } // Cleanup resources from previous v2 releases var cleanExistingResourceFunc manager.RunnableFunc = func(ctx context.Context) error { if err = upgrade.CleanupExistingResource(ctx, setupClient, platform, dscApplicationsNamespace, dscMonitoringNamespace); err != nil { @@ -222,13 +237,6 @@ func main() { //nolint:funlen return err } - // Create default DSC CR for managed RHODS - if platform == cluster.ManagedRhods { - if err := upgrade.CreateDefaultDSC(context.TODO(), setupClient); err != nil { - setupLog.Error(err, "unable to create default DSC CR by the operator") - os.Exit(1) - } - } err = mgr.Add(cleanExistingResourceFunc) if err != nil { setupLog.Error(err, "error remove deprecated resources from previous version") diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go index 064bc087a8a..b2e478198fb 100644 --- a/pkg/upgrade/upgrade.go +++ b/pkg/upgrade/upgrade.go @@ -102,7 +102,7 @@ func CreateDefaultDSC(ctx context.Context, cli client.Client) error { }, }, } - err := cli.Create(ctx, releaseDataScienceCluster) + err := cluster.CreateWithRetry(ctx, cli, releaseDataScienceCluster, 1) // 1 min timeout switch { case err == nil: fmt.Printf("created DataScienceCluster resource\n")