[ARVADOS] updated: 2.1.0-847-g0ec724dfa
Git user
git at public.arvados.org
Tue May 25 21:13:16 UTC 2021
Summary of changes:
apps/workbench/Gemfile.lock | 4 +-
apps/workbench/app/models/arvados_resource_list.rb | 1 +
apps/workbench/app/views/users/welcome.html.erb | 22 +++---
doc/_config.yml | 4 +
doc/admin/upgrading.html.textile.liquid | 4 +
doc/api/methods/users.html.textile.liquid | 15 ++++
doc/api/requests.html.textile.liquid | 32 ++++----
doc/api/tokens.html.textile.liquid | 38 +++++++---
.../container-shell-access.html.textile.liquid | 44 +++++++++++
...nstall-manual-prerequisites.html.textile.liquid | 5 +-
doc/install/setup-login.html.textile.liquid | 6 +-
doc/user/cwl/costanalyzer.html.textile.liquid | 86 ++++++++++++++++++++++
.../container-shell-access.html.textile.liquid | 79 ++++++++++++++++++++
lib/config/config.default.yml | 19 ++++-
lib/config/export.go | 2 +
lib/config/generated_config.go | 19 ++++-
lib/controller/auth_test.go | 2 +
lib/controller/federation/list.go | 5 ++
lib/controller/integration_test.go | 2 +
lib/controller/localdb/login.go | 20 ++---
lib/controller/localdb/login_oidc.go | 63 +++++++++++++---
lib/controller/localdb/login_oidc_test.go | 54 ++++++++++++--
lib/costanalyzer/costanalyzer.go | 27 +++----
lib/crunchrun/copier.go | 4 +-
lib/crunchrun/copier_test.go | 18 +++--
lib/crunchrun/crunchrun.go | 2 +
lib/crunchrun/docker.go | 2 +-
lib/crunchrun/integration_test.go | 5 ++
sdk/go/arvados/config.go | 2 +
sdk/go/arvadostest/oidc_provider.go | 15 ++--
services/api/Gemfile.lock | 4 +-
services/keep-web/cache.go | 2 +-
services/keep-web/handler_test.go | 56 ++++++++++++++
.../config_examples/multi_host/aws/certs/README.md | 2 +-
.../multi_host/aws/pillars/arvados.sls | 2 +-
.../multi_host/aws/pillars/letsencrypt.sls | 14 +---
.../pillars/letsencrypt_keepweb_configuration.sls | 1 +
.../aws/pillars/nginx_controller_configuration.sls | 1 -
.../aws/pillars/nginx_keepproxy_configuration.sls | 1 -
.../aws/pillars/nginx_keepweb_configuration.sls | 5 +-
.../aws/pillars/nginx_webshell_configuration.sls | 1 -
.../aws/pillars/nginx_websocket_configuration.sls | 1 -
.../aws/pillars/nginx_workbench2_configuration.sls | 1 -
.../aws/pillars/nginx_workbench_configuration.sls | 1 -
tools/salt-install/provision.sh | 14 ++--
45 files changed, 579 insertions(+), 128 deletions(-)
create mode 100644 doc/install/container-shell-access.html.textile.liquid
create mode 100644 doc/user/cwl/costanalyzer.html.textile.liquid
create mode 100644 doc/user/debugging/container-shell-access.html.textile.liquid
via 0ec724dfa221b25170205e05bfb30219d821d6de (commit)
via e522f0285d8214484d09e9342c97a1b97d7768c5 (commit)
via f42ea5c9f8a46b8d97d5424ce036ec0a8c1812ca (commit)
via 44b720099723353ac9b81370809ef71319b8a3f8 (commit)
via 2b02edb33f3f9ed61970e15463ff5cc07c0b27d5 (commit)
via 5e5fc4b5d73b70f416c6d08099a096619bb39f45 (commit)
via 2ff5dd54e5daf4dfed3dfd07d161681fc87fe8ff (commit)
via 7dd7506b850130fe2ad1a9ca09d31207ba949a23 (commit)
via f752aedfc96b47b3d88e30681820100bc8069203 (commit)
via e2d0ebb4cdeeb572226fc22a46bf60c507e111ea (commit)
via f1aec3387f765a3f8a2f3f2c22d3a53fb4f9f1f3 (commit)
via e0b63c68db6c398aeb7a5820ac0ff5553d33bb40 (commit)
via 8cf467878d09a862054800604c247c64c84b4955 (commit)
via c041cb963a9edd95d17d2ea44ce03b3e51c0c11a (commit)
via 691bb7a4b5d2d2f30ce7c6914d6c6789e250658a (commit)
via 89e9f940678b8f60166d3c2f7dd9be856bbc5557 (commit)
via 8daccc2ab3f2178745d12bc54ec9a8d06d88864a (commit)
via 250b93d70472dacb03400edc62d1d377aec342a2 (commit)
via 7c5a4e0eb8529c7bf19a67ac85e52f61dff4ceb0 (commit)
via ecef6ad8ac0724b311c545412518b8fd1dc72b79 (commit)
via 341fd46d3a5188f3ce312aefc5599796c9d825d4 (commit)
via 74e92e7fe4f0b9561432a5b706a294c0f10eeff6 (commit)
via 1b606b2933ddad031dbf17a689fee1b312b6c091 (commit)
via ac2d92d5fe740273966eae1b74908de2eec92d77 (commit)
via 979cfb38e02404453509f8fdcba4cceba8658ae2 (commit)
via 52a04643aff653c4302fb20d147e9a4dc551298d (commit)
via c33ff9b8343639cb000df03cfd2d2e2f35d11d58 (commit)
via 65d25630f34296f30c50cd78f232713f23f70bc3 (commit)
via 4b281cbb08215ba079841e796de4bdb483098164 (commit)
via 941b5806c2d25ec54a5ab8506a759aaec564fdaf (commit)
via 7c0fcad91b7ed31ebec9c9ca07269aaa4fa9d1df (commit)
via f0f77a857e065550a5ca07be127a5a120528e6ef (commit)
via b38a068842cb353c1a511022f464267eb35c8de8 (commit)
via 8db3bb4650ea151c4fd1d4e7a8195beae6080754 (commit)
via e850f145a8c770d592a89b7c82ce01650a1bc5ba (commit)
via 44aa688953d658a23c32581a2bad01342007a191 (commit)
via 2d0fb353b939cd2eaf0bb99afc369f30059723f7 (commit)
via 98d5f1dac75a312cc9fb1ef55acf41fb4cd6fc88 (commit)
via 5aa4fc745af335240a3782146dc0f6fcd93346ba (commit)
via 6fa1fbd935fd665494ea87716aef901144d14479 (commit)
via 3751d9e286c214dbe8c0cf078b4919c94a7c3407 (commit)
via 1915e6b0d2a35af51041726a4398cf91a6095859 (commit)
from 443cfe50d76ea0a2632dd7f0b8212c5bc7ed85e4 (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 0ec724dfa221b25170205e05bfb30219d821d6de
Author: Tom Clegg <tom at curii.com>
Date: Tue May 25 17:11:38 2021 -0400
17296: Avoid memory-limiting feature in tests.
Tests should pass if the kernel feature is not enabled.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/crunchrun/docker.go b/lib/crunchrun/docker.go
index 32c60e699..a39b754b3 100644
--- a/lib/crunchrun/docker.go
+++ b/lib/crunchrun/docker.go
@@ -85,7 +85,7 @@ func (e *dockerExecutor) Create(spec containerSpec) error {
for k, v := range spec.Env {
cfg.Env = append(cfg.Env, k+"="+v)
}
- if spec.RAM < minDockerRAM {
+ if spec.RAM > 0 && spec.RAM < minDockerRAM {
spec.RAM = minDockerRAM
}
hostCfg := dockercontainer.HostConfig{
commit e522f0285d8214484d09e9342c97a1b97d7768c5
Merge: f42ea5c9f 5e5fc4b5d
Author: Tom Clegg <tom at curii.com>
Date: Tue May 25 17:05:20 2021 -0400
17296: Merge branch 'master'
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
commit f42ea5c9f8a46b8d97d5424ce036ec0a8c1812ca
Author: Tom Clegg <tom at curii.com>
Date: Tue May 25 15:28:49 2021 -0400
17296: Skip integration tests if docker is not installed.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index 04a15bcea..50136e51d 100644
--- a/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@ -36,6 +36,11 @@ type integrationSuite struct {
}
func (s *integrationSuite) SetUpSuite(c *C) {
+ _, err := exec.LookPath("docker")
+ if err != nil {
+ c.Skip("looks like docker is not installed")
+ }
+
arvadostest.StartKeep(2, true)
out, err := exec.Command("docker", "load", "--input", busyboxDockerImage(c)).CombinedOutput()
commit 44b720099723353ac9b81370809ef71319b8a3f8
Author: Tom Clegg <tom at curii.com>
Date: Tue May 25 15:28:44 2021 -0400
17296: Log when/why gateway server is disabled.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index 77cfcf68b..5638e81e4 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -1695,9 +1695,11 @@ func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, s
if gwAuthSecret == "" {
// not safe to run a gateway service without an auth
// secret
+ cr.CrunchLog.Printf("Not starting a gateway server (GatewayAuthSecret was not provided by dispatcher)")
} else if gwListen := os.Getenv("GatewayAddress"); gwListen == "" {
// dispatcher did not tell us which external IP
// address to advertise --> no gateway service
+ cr.CrunchLog.Printf("Not starting a gateway server (GatewayAddress was not provided by dispatcher)")
} else if de, ok := cr.executor.(*dockerExecutor); ok {
cr.gateway = Gateway{
Address: gwListen,
commit 2b02edb33f3f9ed61970e15463ff5cc07c0b27d5
Author: Tom Clegg <tom at curii.com>
Date: Tue May 25 15:27:53 2021 -0400
17296: Document changed handling of unusual image collections.
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 6d1736fb5..6386aa96e 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -39,6 +39,10 @@ h2(#main). development main (as of 2020-12-10)
"Upgrading from 2.1.0":#v2_1_0
+h3. Multi-file docker image collections
+
+Typically a docker image collection contains a single @.tar@ file at the top level. Handling of atypical cases has changed. If a docker image collection contains files with extensions other than @.tar@, they will be ignored (previously they could cause errors). If a docker image collection contains multiple @.tar@ files, it will cause an error at runtime, "cannot choose from multiple tar files in image collection" (previously one of the @.tar@ files was selected). Subdirectories are ignored. The @arv keep docker@ command always creates a collection with a single @.tar@ file, and never uses subdirectories, so this change will not affect most users.
+
h3. New spelling of S3 credential configs
If you use the S3 driver for Keep volumes and specify credentials in your configuration file (as opposed to using an IAM role), you should change the spelling of the @AccessKey@ and @SecretKey@ config keys to @AccessKeyID@ and @SecretAccessKey at . If you don't update them, the previous spellings will still be accepted, but warnings will be logged at server startup.
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list