[arvados] updated: 2.7.0-5360-g4bdddf57db
git repository hosting
git at public.arvados.org
Mon Nov 13 20:48:06 UTC 2023
Summary of changes:
doc/_config.yml | 1 -
doc/admin/upgrading.html.textile.liquid | 13 +++
...nstall-manual-prerequisites.html.textile.liquid | 2 +-
doc/install/install-webshell.html.textile.liquid | 2 +-
.../install-workbench-app.html.textile.liquid | 106 ---------------------
lib/config/cmd_test.go | 4 -
lib/config/config.default.yml | 70 --------------
sdk/go/arvados/config.go | 34 ++-----
8 files changed, 24 insertions(+), 208 deletions(-)
delete mode 100644 doc/install/install-workbench-app.html.textile.liquid
via 4bdddf57dbfe6565fe7f1a583fc15be4024a21b1 (commit)
via 242c4a91f9cead9b55ee621e216be15368e3fe6d (commit)
via 0e7429733c395b07640ddee571b355a024c4a78c (commit)
from 80d78568ad6db963963df50428d84d6433331493 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 4bdddf57dbfe6565fe7f1a583fc15be4024a21b1
Author: Tom Clegg <tom at curii.com>
Date: Mon Nov 13 15:48:01 2023 -0500
20690: Add upgrade note about removing workbench1.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index e8441dd5f0..739a08b5b3 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -32,6 +32,19 @@ h2(#main). development main
"previous: Upgrading to 2.7.0":#v2_7_0
+h3. Remove Workbench1 packages and configuration
+
+The Workbench1 application has been removed from the Arvados distribution. We recommend the following follow-up steps.
+* Remove the Workbench1 package from any service node where it is installed (e.g., @apt remove arvados-workbench@).
+* In your Nginx configuration, add your Workbench1 URL host (from @Services.Workbench1.ExternalURL@) to the @server_name@ directive in the Workbench2 section. For example: <notextile><pre>server {
+ listen 443 ssl;
+ server_name workbench.ClusterID.example.com workbench2.ClusterID.example.com;
+ ...
+}</pre></notextile>
+* In your Nginx configuration, remove the @upstream@ and @server@ sections for Workbench1.
+* Remove the @Services.Workbench1.InternalURLs@ section of your configuration file. (Do not remove @ExternalURL at .)
+* Run @arvados-server config-check@ to identify any Workbench1-specific entries in your configuration file, and remove them.
+
h3. Check implications of Containers.MaximumPriceFactor 1.5
When scheduling a container, Arvados now considers using instance types other than the lowest-cost type consistent with the container's resource constraints. If a larger instance is already running and idle, or the cloud provider reports that the optimal instance type is not currently available, Arvados will select a larger instance type, provided the cost does not exceed 1.5x the optimal instance type cost.
commit 242c4a91f9cead9b55ee621e216be15368e3fe6d
Author: Tom Clegg <tom at curii.com>
Date: Mon Nov 13 15:06:21 2023 -0500
20690: Remove workbench1 steps from install guide.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/doc/_config.yml b/doc/_config.yml
index bddf6d4944..e51b653822 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -235,7 +235,6 @@ navbar:
- User interface:
- install/setup-login.html.textile.liquid
- install/install-ws.html.textile.liquid
- - install/install-workbench-app.html.textile.liquid
- install/install-workbench2-app.html.textile.liquid
- install/workbench.html.textile.liquid
# - install/install-composer.html.textile.liquid
diff --git a/doc/install/install-manual-prerequisites.html.textile.liquid b/doc/install/install-manual-prerequisites.html.textile.liquid
index 67b9f0de33..8819b0210f 100644
--- a/doc/install/install-manual-prerequisites.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites.html.textile.liquid
@@ -43,7 +43,7 @@ table(table table-bordered table-condensed).
|"Keep-web":install-keep-web.html |Gateway service providing read/write HTTP and WebDAV support on top of Keep.|Required to access files from Workbench.|
|"Keep-balance":install-keep-balance.html |Storage cluster maintenance daemon responsible for moving blocks to their optimal server location, adjusting block replication levels, and trashing unreferenced blocks.|Required to free deleted data from underlying storage, and to ensure proper replication and block distribution (including support for storage classes).|
|\3=. *User interface*|
-|"Workbench":install-workbench-app.html, "Workbench2":install-workbench2-app.html |Primary graphical user interface for working with file collections and running containers.|Optional. Depends on API server, keep-web, websockets server.|
+|"Workbench2":install-workbench2-app.html |Primary graphical user interface for working with file collections and running containers.|Optional. Depends on API server, keep-web, websockets server.|
|\3=. *Additional services*|
|"Websockets server":install-ws.html |Event distribution server.|Required to view streaming container logs in Workbench.|
|"Shell server":install-shell-server.html |Grant Arvados users access to Unix shell accounts on dedicated shell nodes.|Optional.|
diff --git a/doc/install/install-webshell.html.textile.liquid b/doc/install/install-webshell.html.textile.liquid
index 8de6fb5959..12b413d5d3 100644
--- a/doc/install/install-webshell.html.textile.liquid
+++ b/doc/install/install-webshell.html.textile.liquid
@@ -26,7 +26,7 @@ Arvados supports @webshell@, which allows ssh access to shell nodes via the brow
h2(#prerequisites). Prerequisites
-# "Install workbench":{{site.baseurl}}/install/install-workbench-app.html
+# "Install Workbench 2":{{site.baseurl}}/install/install-workbench2-app.html
# "Set up a shell node":{{site.baseurl}}/install/install-shell-server.html
h2(#configure). Update config.yml
diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
deleted file mode 100644
index 7ee8db92f1..0000000000
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ /dev/null
@@ -1,106 +0,0 @@
----
-layout: default
-navsection: installguide
-title: Install Workbench
-...
-{% comment %}
-Copyright (C) The Arvados Authors. All rights reserved.
-
-SPDX-License-Identifier: CC-BY-SA-3.0
-{% endcomment %}
-
-# "Install dependencies":#dependencies
-# "Update config.yml":#update-config
-# "Update Nginx configuration":#update-nginx
-# "Trusted client flag":#trusted_client
-# "Install arvados-workbench":#install-packages
-# "Restart the API server and controller":#restart-api
-# "Confirm working installation":#confirm-working
-
-h2(#dependencies). Install dependencies
-
-# "Install Ruby and Bundler":ruby.html
-# "Install nginx":nginx.html
-# "Install Phusion Passenger":https://www.phusionpassenger.com/library/walkthroughs/deploy/ruby/ownserver/nginx/oss/install_passenger_main.html
-
-h2(#configure). Update config.yml
-
-Edit @config.yml@ to set the keys below. The full set of configuration options are in the "Workbench section of config.yml":{{site.baseurl}}/admin/config.html
-
-<notextile>
-<pre><code> Services:
- Workbench1:
- ExternalURL: <span class="userinput">"https://workbench.ClusterID.example.com"</span>
- Workbench:
- SecretKeyBase: <span class="userinput">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</span>
- Users:
- AutoAdminFirstUser: true
-</code></pre>
-</notextile>
-
-This application needs a secret token. Generate a new secret:
-
-<notextile>
-<pre><code>~$ <span class="userinput">ruby -e 'puts rand(2**400).to_s(36)'</span>
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-</code></pre>
-</notextile>
-
-Then put that value in the @Workbench.SecretKeyBase@ field.
-
-You probably want to enable @Users.AutoAdminFirstUser@ . The first user to log in when no other admin user exists will automatically be made an admin.
-
-h2(#update-nginx). Update nginx configuration
-
-Use a text editor to create a new file @/etc/nginx/conf.d/arvados-workbench.conf@ with the following configuration. Options that need attention are marked in <span class="userinput">red</span>.
-
-<notextile>
-<pre><code>server {
- listen 80;
- server_name workbench.<span class="userinput">ClusterID.example.com</span>;
- return 301 https://workbench.<span class="userinput">ClusterID.example.com</span>$request_uri;
-}
-
-server {
- listen 443 ssl;
- server_name workbench.<span class="userinput">ClusterID.example.com</span>;
-
- ssl_certificate <span class="userinput">/YOUR/PATH/TO/cert.pem</span>;
- ssl_certificate_key <span class="userinput">/YOUR/PATH/TO/cert.key</span>;
-
- root /var/www/arvados-workbench/current/public;
- index index.html;
-
- passenger_enabled on;
- # If you're using RVM, uncomment the line below.
- #passenger_ruby /usr/local/rvm/wrappers/default/ruby;
-
- # `client_max_body_size` should match the corresponding setting in
- # the API.MaxRequestSize and Controller's server's Nginx configuration.
- client_max_body_size 128m;
-}
-</code></pre>
-</notextile>
-
-h2(#trusted_client). Trusted client flag
-
-In the <strong>API server</strong> project root, start the Rails console. {% include 'install_rails_command' %}
-
-Create an ApiClient record for your Workbench installation with the @is_trusted@ flag set.
-
-<notextile><pre><code>irb(main):001:0> <span class="userinput">include CurrentApiClient</span>
-=> true
-irb(main):002:0> <span class="userinput">act_as_system_user do ApiClient.create!(url_prefix: "https://workbench.ClusterID.example.com/", is_trusted: true) end</span>
-=> #<ApiClient id: 2, uuid: "...", owner_uuid: "...", modified_by_client_uuid: nil, modified_by_user_uuid: "...", modified_at: "2019-12-16 14:19:10", name: nil, url_prefix: "https://workbench.ClusterID.example.com/", created_at: "2019-12-16 14:19:10", updated_at: "2019-12-16 14:19:10", is_trusted: true>
-</code></pre>
-</notextile>
-
-{% assign arvados_component = 'arvados-workbench' %}
-
-{% include 'install_packages' %}
-
-{% include 'restart_api' %}
-
-h2(#confirm-working). Confirm working installation
-
-Visit @https://workbench.ClusterID.example.com@ in a browser. You should be able to log in using the login method you configured in the previous step. If @Users.AutoAdminFirstUser@ is true, you will be an admin user.
commit 0e7429733c395b07640ddee571b355a024c4a78c
Author: Tom Clegg <tom at curii.com>
Date: Mon Nov 13 15:03:15 2023 -0500
20690: Remove workbench1-specific configs.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/config/cmd_test.go b/lib/config/cmd_test.go
index 9503a54d2d..d94eea89df 100644
--- a/lib/config/cmd_test.go
+++ b/lib/config/cmd_test.go
@@ -69,8 +69,6 @@ Clusters:
Type: select
Options:
fuchsia: {}
- ApplicationMimetypesWithViewIcon:
- whitespace: {}
`
code := CheckCommand.RunCommand("arvados config-check", []string{"-config", "-"}, bytes.NewBufferString(in), &stdout, &stderr)
c.Check(code, check.Equals, 0)
@@ -124,8 +122,6 @@ Clusters:
Type: select
Options:
fuchsia: {}
- ApplicationMimetypesWithViewIcon:
- whitespace: {}
`
code := CheckCommand.RunCommand("arvados config-check", []string{"-config", "-"}, bytes.NewBufferString(in), &stdout, &stderr)
c.Check(code, check.Equals, 1)
diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 24d626aae5..79889565a0 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1822,18 +1822,12 @@ Clusters:
ArvadosDocsite: https://doc.arvados.org
ArvadosPublicDataDocURL: https://playground.arvados.org/projects/public
ShowUserAgreementInline: false
- SecretKeyBase: ""
# Set this configuration to true to avoid providing an easy way for users
# to share data with unauthenticated users; this may be necessary on
# installations where strict data access controls are needed.
DisableSharingURLsUI: false
- # Scratch directory used by the remote repository browsing
- # feature. If it doesn't exist, it (and any missing parents) will be
- # created using mkdir_p.
- RepositoryCache: /var/www/arvados-workbench/current/tmp/git
-
# Below is a sample setting of user_profile_form_fields config parameter.
# This configuration parameter should be set to either false (to disable) or
# to a map as shown below.
@@ -1880,71 +1874,7 @@ Clusters:
# to display on the profile page.
UserProfileFormMessage: 'Welcome to Arvados. All <span style="color:red">required fields</span> must be completed before you can proceed.'
- # Mimetypes of applications for which the view icon
- # would be enabled in a collection's show page.
- # It is sufficient to list only applications here.
- # No need to list text and image types.
- ApplicationMimetypesWithViewIcon:
- cwl: {}
- fasta: {}
- go: {}
- javascript: {}
- json: {}
- pdf: {}
- python: {}
- x-python: {}
- r: {}
- rtf: {}
- sam: {}
- x-sh: {}
- vnd.realvnc.bed: {}
- xml: {}
- xsl: {}
- SAMPLE: {}
-
- # The maximum number of bytes to load in the log viewer
- LogViewerMaxBytes: 1M
-
- # When anonymous_user_token is configured, show public projects page
- EnablePublicProjectsPage: true
-
- # By default, disable the "Getting Started" popup which is specific to Arvados playground
- EnableGettingStartedPopup: false
-
- # Ask Arvados API server to compress its response payloads.
- APIResponseCompression: true
-
- # Timeouts for API requests.
- APIClientConnectTimeout: 2m
- APIClientReceiveTimeout: 5m
-
- # Maximum number of historic log records of a running job to fetch
- # and display in the Log tab, while subscribing to web sockets.
- RunningJobLogRecordsToFetch: 2000
-
- # In systems with many shared projects, loading of dashboard and topnav
- # can be slow due to collections indexing; use the following parameters
- # to suppress these properties
- ShowRecentCollectionsOnDashboard: true
- ShowUserNotifications: true
-
- # Enable/disable "multi-site search" in top nav ("true"/"false"), or
- # a link to the multi-site search page on a "home" Workbench site.
- #
- # Example:
- # https://workbench.zzzzz.arvadosapi.com/collections/multisite
- MultiSiteSearch: ""
-
- # Should workbench allow management of local git repositories? Set to false if
- # the jobs api is disabled and there are no local git repositories.
- Repositories: true
-
SiteName: Arvados Workbench
- ProfilingEnabled: false
-
- # This is related to obsolete Google OpenID 1.0 login
- # but some workbench stuff still expects it to be set.
- DefaultOpenIdPrefix: "https://www.google.com/accounts/o8/id"
# Workbench2 configs
FileViewersConfigURL: ""
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index ea01cc3c68..7b9bd847d1 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -269,31 +269,15 @@ type Cluster struct {
StorageClasses map[string]StorageClassConfig
Volumes map[string]Volume
Workbench struct {
- ActivationContactLink string
- APIClientConnectTimeout Duration
- APIClientReceiveTimeout Duration
- APIResponseCompression bool
- ApplicationMimetypesWithViewIcon StringSet
- ArvadosDocsite string
- ArvadosPublicDataDocURL string
- DefaultOpenIdPrefix string
- DisableSharingURLsUI bool
- EnableGettingStartedPopup bool
- EnablePublicProjectsPage bool
- FileViewersConfigURL string
- LogViewerMaxBytes ByteSize
- MultiSiteSearch string
- ProfilingEnabled bool
- Repositories bool
- RepositoryCache string
- RunningJobLogRecordsToFetch int
- SecretKeyBase string
- ShowRecentCollectionsOnDashboard bool
- ShowUserAgreementInline bool
- ShowUserNotifications bool
- SiteName string
- Theme string
- UserProfileFormFields map[string]struct {
+ ActivationContactLink string
+ ArvadosDocsite string
+ ArvadosPublicDataDocURL string
+ DisableSharingURLsUI bool
+ FileViewersConfigURL string
+ ShowUserAgreementInline bool
+ SiteName string
+ Theme string
+ UserProfileFormFields map[string]struct {
Type string
FormFieldTitle string
FormFieldDescription string
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list