From: Tom Clegg Date: Wed, 25 Oct 2023 19:52:58 +0000 (-0400) Subject: 20846: Disable workbench1 in `arvados-server boot`. X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b541d548386847893df54c89c8edad75ede65714?hp=ab753afe981dc91df13bb50906813ca648b3242e 20846: Disable workbench1 in `arvados-server boot`. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go index 41a2dab5ed..3d653e97af 100644 --- a/lib/boot/cmd.go +++ b/lib/boot/cmd.go @@ -69,7 +69,7 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std flags.StringVar(&super.ClusterType, "type", "production", "cluster `type`: development, test, or production") flags.StringVar(&super.ListenHost, "listen-host", "127.0.0.1", "host name or interface address for internal services whose InternalURLs are not configured") flags.StringVar(&super.ControllerAddr, "controller-address", ":0", "desired controller address, `host:port` or `:port`") - flags.BoolVar(&super.NoWorkbench1, "no-workbench1", false, "do not run workbench1") + flags.BoolVar(&super.NoWorkbench1, "no-workbench1", true, "do not run workbench1") flags.BoolVar(&super.NoWorkbench2, "no-workbench2", false, "do not run workbench2") flags.BoolVar(&super.OwnTemporaryDatabase, "own-temporary-database", false, "bring up a postgres server and create a temporary database") timeout := flags.Duration("timeout", 0, "maximum time to wait for cluster to be ready") diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go index e913a7fe08..abec2b0f4a 100644 --- a/lib/boot/supervisor.go +++ b/lib/boot/supervisor.go @@ -371,10 +371,7 @@ func (super *Supervisor) runCluster() error { }}, } if !super.NoWorkbench1 { - tasks = append(tasks, - installPassenger{src: "apps/workbench", varlibdir: "workbench1", depends: []supervisedTask{railsDatabase{}}}, // dependency ensures workbench doesn't delay api install/startup - runPassenger{src: "apps/workbench", varlibdir: "workbench1", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench", varlibdir: "workbench1"}}}, - ) + return errors.New("workbench1 is no longer supported") } if !super.NoWorkbench2 { tasks = append(tasks,