Merge branch 'main' into dependabot/go_modules/golang.org/x/time-0.6.0

cmd/cli/serve/serve.go

@@ -118,6 +118,11 @@ func serve(cmd *cobra.Command, cfg types.Bacalhau, fsRepo *repo.FsRepo) error {
 	isRequesterNode := cfg.Orchestrator.Enabled
 	isComputeNode := cfg.Compute.Enabled
 
+	if !(isComputeNode || isRequesterNode) {
+		log.Warn().Msg("neither --compute nor --orchestrator were provided, defaulting to orchestrator node.")
+		isRequesterNode = true
+	}
+
 	networkConfig, err := getNetworkConfig(cfg)
 	if err != nil {
 		return err

pkg/config/types/default_config.go

@@ -31,7 +31,7 @@ var Default = Bacalhau{
 	},
 	NameProvider: "puuid",
 	Orchestrator: Orchestrator{
-		Enabled: true,
+		Enabled: false,
 		Host:    "0.0.0.0",
 		Port:    4222,
 		NodeManager: NodeManager{

pkg/setup/setup.go

@@ -70,6 +70,8 @@ func SetupBacalhauRepoForTesting(t testing.TB) (*repo.FsRepo, types.Bacalhau) {
 	t.Setenv(config.KeyAsEnvVar(types.UpdateConfigIntervalKey), "0")
 	cfgValues := map[string]any{
 		types.DataDirKey: path,
+		// callers of this method currently assume it creates an orchestrator node.
+		types.OrchestratorEnabledKey: true,
 	}
 
 	// the BACALHAU_NODE_IPFS_CONNECT env var is only bound if it's corresponding flags are registered.