From: Ward Vandewege <ward@curii.com>
Date: Mon, 30 Nov 2020 15:15:44 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/mluds/arvados-k8s into mluds-master
X-Git-Url: https://git.arvados.org/arvados-k8s.git/commitdiff_plain/0b4b8840bce43383830bd8d5e8f91088eeceb1f1

Merge branch 'master' of https://github.com/mluds/arvados-k8s into mluds-master

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

0b4b8840bce43383830bd8d5e8f91088eeceb1f1
diff --cc charts/arvados/values.yaml
index 3caaec4,2fd94a3..cf19636
--- a/charts/arvados/values.yaml
+++ b/charts/arvados/values.yaml
@@@ -47,28 -55,40 +55,40 @@@ uuidPrefix: vwxy
  arvados:
    versions:
      distribution:
 -      arvadosApiServer: 2.1.0-1
 -      arvadosController: 2.1.0-1
 -      arvadosGitHttpd: 2.1.0-1
 -      arvadosHealth: 2.1.0-1
 -      arvadosWorkbench: 2.1.0-1
 -      arvadosWorkbench2: 2.1.0-1
 -      arvadosWs: 2.1.0-1
 -      crunchDispatchSlurm: 2.1.0-1
 -      crunchRun: 2.1.0-1
 -      crunchRunner: 2.1.0-1
 -      keepBalance: 2.1.0-1
 -      keepStore: 2.1.0-1
 -      keepWeb: 2.1.0-1
 -      keepProxy: 2.1.0-1
 -      libPamArvados: 2.1.0-1
 -      pythonArvadosFuse: 2.1.0-1
 -      pythonArvadosPythonClient: 2.1.0-1
 +      arvadosApiServer: 2.1.1-1
 +      arvadosController: 2.1.1-1
 +      arvadosGitHttpd: 2.1.1-1
 +      arvadosHealth: 2.1.1-1
 +      arvadosWorkbench: 2.1.1-1
 +      arvadosWorkbench2: 2.1.1-1
 +      arvadosWs: 2.1.1-1
 +      crunchDispatchSlurm: 2.1.1-1
 +      crunchRun: 2.1.1-1
 +      crunchRunner: 2.1.1-1
 +      keepBalance: 2.1.1-1
 +      keepStore: 2.1.1-1
 +      keepWeb: 2.1.1-1
 +      keepProxy: 2.1.1-1
 +      libPamArvados: 2.1.1-1
 +      pythonArvadosFuse: 2.1.1-1
 +      pythonArvadosPythonClient: 2.1.1-1
      gem:
 -      arvados: 2.1.0
 -      arvadosCLI: 2.1.0
 -      arvadosLoginSync: 2.1.0
 +      arvados: 2.1.1
 +      arvadosCLI: 2.1.1
 +      arvadosLoginSync: 2.1.1
  
+ postgres:
+   persistence:
+     enabled: true
+     storageClass: ~
+     size: 8Gi
+ 
+ keep:
+   persistence:
+     enabled: true
+     storageClass: ~
+     size: 64Gi
+ 
  # A custom bundle of CA certificates to use.
  # Useful for corporate networks with TLS proxies.
  # Set it by using the --set-file Helm argument.