Merge branch 'mluds-master' into master

[arvados-k8s.git] / charts / arvados / values.yaml

diff --git a/charts/arvados/values.yaml b/charts/arvados/values.yaml
index facdcd5609cc58cd4e3602ce6b77d6faeb114ee8..1336eed66a46c08bbe1d4220364c6dba77bf1a50 100644 (file)
--- a/charts/arvados/values.yaml
+++ b/charts/arvados/values.yaml
@@ -13,6 +13,17 @@ image:
 # Must be set to a valid IP address, e.g. by using --set when invoking helm
 externalIP: ~
 
+loadBalancer:
+  # Annotations to add to all LoadBalancer Services.
+  # This is required for MetalLB, since the same externalIP is reused for all
+  # services, and sharing is disabled by default.
+  # metallb.universe.tf/allow-shared-ip: arbitrary-sharing-key
+  annotations:
+
+  # externalTrafficPolicy for the api-server-service
+  # Set to Cluster if using MetalLB, otherwise an externalIP won't be allocated
+  apiServerExternalTrafficPolicy: Local
+
 # The default e-mail address and password for the initial cluster admin user
 adminUserEmail: "test@example.com"
 adminUserPassword: "passw0rd"
@@ -41,6 +52,7 @@ arvados:
       arvadosGitHttpd: 2.0.2-1
       arvadosHealth: 2.0.2-1
       arvadosWorkbench: 2.0.2-1
+      arvadosWorkbench2: 2.0.2-1
       arvadosWs: 2.0.2-1
       arvadosSSOServer: 1.1.4-1
       crunchDispatchSlurm: 2.0.2-1
@@ -57,3 +69,8 @@ arvados:
       arvados: 2.0.2
       arvadosCLI: 2.0.2
       arvadosLoginSync: 2.0.2
+
+# A custom bundle of CA certificates to use.
+# Useful for corporate networks with TLS proxies.
+# Set it by using the --set-file Helm argument.
+customCABundle: ""