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>

diff --combined charts/arvados/values.yaml
index 3caaec47fe7b8031eb497c7a709649505514230c,2fd94a306e587d678c3922df36725156674368e3..cf196364557b4a7d76ccb99fb4cea17a03d739ea
--- 1/charts/arvados/values.yaml
--- 2/charts/arvados/values.yaml
+++ b/charts/arvados/values.yaml
@@@ -13,6 -13,14 +13,14 @@@ image
  # Must be set to a valid IP address, e.g. by using --set when invoking helm
  externalIP: ~
  
+ # A list of CIDRs that have direct access to the Keep store service. All other
+ # IP addresses will use the Keep proxy.
+ # If hosts outside your cluster are in the default range (10.0.0.0/8), change
+ # this to the exact CIDR of your cluster.
+ # If using MetaLB with apiServerExternalTrafficPolicy set to Cluster, set this
+ # to an empty list, since the source IP will be obscured.
+ internalIPs: [10.0.0.0/8]
+ 
  loadBalancer:
    # Annotations to add to all LoadBalancer Services.
    # This is required for MetalLB, since the same externalIP is reused for all
@@@ -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.