From 086d776902a05ea913606f6768bf0a8355b1db15 Mon Sep 17 00:00:00 2001 From: Andrew Eckart Date: Thu, 5 Nov 2020 22:12:15 -0600 Subject: [PATCH 1/2] Add DISABLE_USER_MGMT config value to Flask app --- DEPLOYMENT.md | 1 + servicex/templates/app/configmap.yaml | 3 +++ servicex/values.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md index b51bcd370..ed7b5e95d 100644 --- a/DEPLOYMENT.md +++ b/DEPLOYMENT.md @@ -162,6 +162,7 @@ or [mino](https://github.com/helm/charts/tree/master/stable/minio#configuration) | `app.rabbitmq.retry_interval` | Number of seconds to wait between RabbitMQ retries on startup | 10 | | `app.replicas` | Number of App pods to start. Experimental! | 1 | | `app.auth` | Enable authentication or allow unfettered access (Python boolean string) | `false` | +| `app.disableUserMgmt` | Opt out of built-in ServiceX user management system | `false` | `app.globusClientID` | Globus application Client ID | - | | `app.globusClientSecret` | Globus application Client Secret | - | | `app.adminEmail` | Email address for initial admin user | admin@example.com | diff --git a/servicex/templates/app/configmap.yaml b/servicex/templates/app/configmap.yaml index c4eaadc65..e54d4e27a 100644 --- a/servicex/templates/app/configmap.yaml +++ b/servicex/templates/app/configmap.yaml @@ -24,6 +24,9 @@ data: # Enable JWT auth on public endpoints ENABLE_AUTH={{- ternary "True" "False" .Values.app.auth }} + # Disable user management system + DISABLE_USER_MGMT = {{ ternary "True" "False" .Values.app.disableUserMgmt }} + # Globus configuration GLOBUS_CLIENT_ID = '{{ .Values.app.globusClientID }}' GLOBUS_CLIENT_SECRET = '{{ .Values.app.globusClientSecret }}' diff --git a/servicex/values.yaml b/servicex/values.yaml index 438993758..16ad72c81 100644 --- a/servicex/values.yaml +++ b/servicex/values.yaml @@ -24,6 +24,7 @@ app: pullPolicy: Always replicas: 1 auth: false + disableUserMgmt: false validateTransformerImage: true # Globus configuration - obtain these at https://auth.globus.org/v2/web/developers From ad5480e3b4ecff0b806b9115554bf56f03fcdc02 Mon Sep 17 00:00:00 2001 From: Andrew Eckart Date: Mon, 26 Apr 2021 12:41:29 -0500 Subject: [PATCH 2/2] Add app.disableUserMgmt to chart reference table --- docs/deployment/reference.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/deployment/reference.md b/docs/deployment/reference.md index c59ad7418..635a6a915 100644 --- a/docs/deployment/reference.md +++ b/docs/deployment/reference.md @@ -13,6 +13,7 @@ parameters for the [rabbitMQ](https://github.com/bitnami/charts/tree/master/bitn | `app.rabbitmq.retry_interval` | Number of seconds to wait between RabbitMQ retries on startup | 10 | | `app.replicas` | Number of App pods to start. Experimental! | 1 | | `app.auth` | Enable authentication or allow unfettered access (Python boolean string) | `false` | +| `app.disableUserMgmt` | Opt out of built-in ServiceX user management system | `false` | | `app.globusClientID` | Globus application Client ID | - | | `app.globusClientSecret` | Globus application Client Secret | - | | `app.adminEmail` | Email address for initial admin user | admin@example.com |