[arvados] updated: 2.6.0-473-ge805640e7

git repository hosting git at public.arvados.org
Wed Aug 9 13:33:51 UTC 2023


Summary of changes:
 build/package-build-dockerfiles/rocky8/Dockerfile  |   2 +-
 build/package-test-dockerfiles/rocky8/Dockerfile   |   2 +-
 doc/_includes/_download_installer.liquid           |   6 +-
 .../_multi_host_install_custom_certificates.liquid |   2 +-
 doc/architecture/singularity.html.textile.liquid   |   2 +-
 ...ll-compute-node-singularity.html.textile.liquid |   6 +-
 doc/install/salt-multi-host.html.textile.liquid    | 154 +++++--
 go.mod                                             |   2 +-
 go.sum                                             |   4 +-
 lib/cloud/cloudtest/tester.go                      |  10 +-
 lib/cmd/cmd.go                                     |  12 +-
 lib/config/config.default.yml                      |   6 +-
 lib/crunchrun/docker.go                            |   2 +-
 lib/crunchrun/logging.go                           |   6 +-
 lib/dispatchcloud/dispatcher_test.go               |   1 +
 lib/dispatchcloud/test/stub_driver.go              |   6 +-
 lib/install/deps.go                                |  10 +-
 lib/install/deps_go_version_test.go                |  12 +-
 sdk/go/manifest/manifest.go                        |  17 +-
 services/api/Gemfile.lock                          |   2 +-
 services/dockercleaner/arvados_docker/cleaner.py   |   2 +-
 services/dockercleaner/setup.py                    |  15 +-
 services/dockercleaner/tests/test_cleaner.py       |  12 +-
 services/keep-web/doc.go                           |  99 +++--
 services/keepproxy/keepproxy.go                    |   6 +-
 services/keepproxy/keepproxy_test.go               |  22 +-
 services/keepstore/handler_test.go                 |  78 ++--
 services/keepstore/handlers.go                     |  34 +-
 services/keepstore/keepstore.go                    |   2 -
 services/keepstore/trash_worker.go                 |   7 +-
 services/keepstore/trash_worker_test.go            |  43 +-
 services/keepstore/unix_volume.go                  |  12 +-
 services/keepstore/volume_generic_test.go          |   7 +-
 services/keepstore/work_queue.go                   |   4 -
 services/ws/doc.go                                 |   4 +-
 tools/compute-images/scripts/base.sh               |   2 +-
 .../crunchstat_summary/__init__.py                 |   5 +-
 .../crunchstat_summary/summarizer.py               |  21 +
 tools/crunchstat-summary/tests/test_examples.py    |  48 ++-
 tools/keep-exercise/keep-exercise.go               |   1 -
 tools/salt-install/common.sh                       |  53 +++
 .../multi_host/aws/pillars/arvados.sls             |  25 +-
 ....sls => letsencrypt_balancer_configuration.sls} |   2 +-
 .../aws/pillars/nginx_balancer_configuration.sls   | 129 ++++++
 .../aws/pillars/nginx_controller_configuration.sls |  33 +-
 .../multi_host/aws/pillars/nginx_passenger.sls     |  35 +-
 .../multi_host/aws/pillars/postgresql.sls          |  12 +-
 .../multi_host/aws/pillars/prometheus_server.sls   |  32 +-
 tools/salt-install/installer.sh                    |  31 +-
 .../local.params.example.multiple_hosts            |  49 ++-
 tools/salt-install/local.params.secrets.example    |   1 +
 tools/salt-install/provision.sh                    | 472 +++++++++++----------
 .../salt-install/terraform/aws/services/locals.tf  |   3 +-
 .../terraform/aws/vpc/terraform.tfvars             |  29 +-
 tools/salt-install/terraform/aws/vpc/variables.tf  |   2 +-
 55 files changed, 1013 insertions(+), 583 deletions(-)
 create mode 100644 tools/salt-install/common.sh
 copy tools/salt-install/config_examples/multi_host/aws/pillars/{letsencrypt_controller_configuration.sls => letsencrypt_balancer_configuration.sls} (85%)
 create mode 100644 tools/salt-install/config_examples/multi_host/aws/pillars/nginx_balancer_configuration.sls

       via  e805640e7904dc282f00be82a2edb53d496a87bb (commit)
       via  01533060c76fde7a8a2c1e5c994bc5240390ff3e (commit)
       via  8d47832e4637a40710838b9f4dc3353b58a28c93 (commit)
       via  eb8850ab27ddfb0fc2e393e6b687394348078ca3 (commit)
       via  0b296b5a965890a01e392e96161a61156a1f6155 (commit)
       via  912fd82a23277fc4f0dbd2c1587c8dfd6af52aa5 (commit)
       via  aa6ca6f50268f29c7cce987f5957796826bfeeed (commit)
       via  8df1faa0df51eabe211fb2c7ece3aec27edf5ec1 (commit)
       via  b5706a159950720d692790a7577170091f29bc6a (commit)
       via  864592f6892f3a7a9268a5649430b6af77170122 (commit)
       via  65393f3e8c6636734c32efc34cc33a7fbcac529e (commit)
       via  9cc06669c3e8694cb1b34ec5183ebcdeeaa29fcd (commit)
       via  3dd5dc39765ef59d2ea6101b80975133ca628af9 (commit)
       via  4cfc3fe8c03fdf9c583ec7f1225acac1b0648ae8 (commit)
       via  9121aabce004cf42f60c775eb191c93020b9be42 (commit)
       via  c071d7aaed53241f68bad09d8dd8d20b21b8bb40 (commit)
       via  ea3ab84513005da15795894bf8a85eb06b131ed0 (commit)
       via  077af72625dda6760b426f566cc52ff1523fe7b8 (commit)
       via  34a5530a0844fb66270e54f4e53fb7179746a0c0 (commit)
       via  d32c7034ae35872f7dda683b46bdddff17d8b2cd (commit)
       via  d9152312a29c8b8e257cc0c42afd43801eafd7f5 (commit)
       via  f1d43dafa707b667c603492af0dfe67d8a7ea476 (commit)
       via  ab02ec1ea50277118bf5abc9431b2a1ef165f4ae (commit)
       via  f24437860fa2c4f8fd57f626780f7a1389efa862 (commit)
       via  656d3511fb4ddac015382214e6efe4a988e04bed (commit)
       via  eb6f1aca749391e603911b92f6f04ae9c24cbffb (commit)
       via  49c153fed482e6911333d984ce88bdec1a426396 (commit)
       via  3c1de8915ddc274136786e35dd3fecd0495f5e84 (commit)
       via  bac58f7cf76f347f4eeb5e2436412e5ccbdebf7f (commit)
       via  39f741f8e4ca8eb8aa2538df0bedc6ae143a038a (commit)
       via  bc7bbb6bfb85a68059572519cf6d6cb33d9778f6 (commit)
       via  c68b2408668c3bc2092bc7bc372a04154216c52c (commit)
       via  746a4b3877acad15f5c58c649a15c873127573c9 (commit)
       via  d121cf6f26a78225df4213155f31e6b26ee93a43 (commit)
       via  89da894c27064b96186de343d421e6422ff1c7d6 (commit)
       via  f2511051643bbbdbfcfe26c4d9b009903dc8f5de (commit)
       via  dc15f94ae63b217a09ee0a8b8f4e024d134fcbdd (commit)
       via  3664b849b6f4f12a11f7ea9509b28c0a9a74fac1 (commit)
       via  8d438557f4f3da941eb9fa695da905d488c6301b (commit)
       via  c07ebf7af530652d49f03222b4098e5ac4e15ca7 (commit)
       via  12f5ee701ad89bdbea4149e4f55b0dc9d31b40ba (commit)
       via  f5c6eb8491fb0d0a94bc1699ad7d84b054e0fec0 (commit)
       via  4ac2b369a544ef3af5ccc8cc5fff69575c175032 (commit)
       via  0a038ad220c098896a66e6a9b5630af1e36a608b (commit)
       via  6346b3b3b78f5ef838d71945b7b03bc60cb4868a (commit)
       via  1bc272d03b72e21ec95318a56303547dc1833af3 (commit)
       via  f76c285eb00543bc612d144556171c6fe9f50893 (commit)
       via  5741ee2bffbb565d946a064f7712dac7f7059f99 (commit)
      from  ad5eb020d76da3ef5927b3d8c364390d42493ddd (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 e805640e7904dc282f00be82a2edb53d496a87bb
Merge: 01533060c 8d47832e4
Author: Tom Clegg <tom at curii.com>
Date:   Wed Aug 9 09:33:34 2023 -0400

    20755: Merge branch 'main' into 20755-ec2-multiple-subnets
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>


commit 01533060c76fde7a8a2c1e5c994bc5240390ff3e
Author: Tom Clegg <tom at curii.com>
Date:   Wed Aug 9 09:32:37 2023 -0400

    20755: Fix test case by accepting empty DriverParameters.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/cloud/cloudtest/tester.go b/lib/cloud/cloudtest/tester.go
index 24a80da38..f7c2a3c73 100644
--- a/lib/cloud/cloudtest/tester.go
+++ b/lib/cloud/cloudtest/tester.go
@@ -61,10 +61,12 @@ type tester struct {
 // Currently this means run once for each configured SubnetID.
 func (t *tester) Run() bool {
 	var dp map[string]interface{}
-	err := json.Unmarshal(t.DriverParameters, &dp)
-	if err != nil {
-		t.Logger.WithError(err).Error("error decoding configured CloudVMs.DriverParameters")
-		return false
+	if len(t.DriverParameters) > 0 {
+		err := json.Unmarshal(t.DriverParameters, &dp)
+		if err != nil {
+			t.Logger.WithError(err).Error("error decoding configured CloudVMs.DriverParameters")
+			return false
+		}
 	}
 	subnets, ok := dp["SubnetID"].([]interface{})
 	if !ok || len(subnets) <= 1 {

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list