From e2439dd6789537ce08c234a31c08489fc6f4df54 Mon Sep 17 00:00:00 2001 From: John O'Gara Date: Fri, 26 Feb 2021 08:12:45 +0000 Subject: [PATCH 01/20] Add a base domain configuration --- templates/deployment_jobs.yaml | 2 ++ values.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/templates/deployment_jobs.yaml b/templates/deployment_jobs.yaml index 588f775b..bc32ba4d 100644 --- a/templates/deployment_jobs.yaml +++ b/templates/deployment_jobs.yaml @@ -58,6 +58,8 @@ spec: value: JOBS_RUNNER - name: COOKIE_INSECURE value: {{ .Values.config.useInsecureCookies | quote }} + - name: BASE_DOMAIN + value: {{ .Values.config.baseDomain | quote }} - name: POSTGRES_HOST value: {{ template "retool.postgresql.host" . }} - name: POSTGRES_PORT diff --git a/values.yaml b/values.yaml index f30fc8ca..8acdb38e 100644 --- a/values.yaml +++ b/values.yaml @@ -11,6 +11,7 @@ config: domain: encryptionKey: jwtSecret: + baseDomain: postgresql: {} # Specify if postgresql subchart is disabled From 4e4fb0e6fce610408e5fb18ac20480b64f7f26a9 Mon Sep 17 00:00:00 2001 From: John O'Gara Date: Fri, 26 Feb 2021 11:39:52 +0000 Subject: [PATCH 02/20] Bump version --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index 1bde4554..d69fc96c 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: retool description: A Helm chart for Kubernetes type: application -version: 4.2.0 +version: 4.2.1 appVersion: "2.66.14" maintainers: - name: Retool Engineering From 4fbf140fd3bd437dedd7f18e2dbd40c9a6f5da68 Mon Sep 17 00:00:00 2001 From: John O'Gara Date: Fri, 26 Feb 2021 15:41:17 +0000 Subject: [PATCH 03/20] Move the BASE_DOMAIN setup --- Chart.yaml | 2 +- templates/deployment_jobs.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index d69fc96c..caa4c7a3 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: retool description: A Helm chart for Kubernetes type: application -version: 4.2.1 +version: 4.2.2 appVersion: "2.66.14" maintainers: - name: Retool Engineering diff --git a/templates/deployment_jobs.yaml b/templates/deployment_jobs.yaml index bc32ba4d..66d86a26 100644 --- a/templates/deployment_jobs.yaml +++ b/templates/deployment_jobs.yaml @@ -58,8 +58,6 @@ spec: value: JOBS_RUNNER - name: COOKIE_INSECURE value: {{ .Values.config.useInsecureCookies | quote }} - - name: BASE_DOMAIN - value: {{ .Values.config.baseDomain | quote }} - name: POSTGRES_HOST value: {{ template "retool.postgresql.host" . }} - name: POSTGRES_PORT @@ -102,6 +100,8 @@ spec: key: google-client-secret - name: RESTRICTED_DOMAIN value: {{ default "" .Values.config.auth.google.domain }} + - name: BASE_DOMAIN + value: {{ .Values.config.baseDomain | quote }} {{- end }} {{- range $key, $value := .Values.env }} - name: "{{ $key }}" From cfdee10ee20e8514ec36dd2d45f0135c2feb3b6d Mon Sep 17 00:00:00 2001 From: John O'Gara Date: Fri, 26 Feb 2021 15:56:49 +0000 Subject: [PATCH 04/20] Add the base domain change in the right place --- Chart.yaml | 2 +- templates/deployment_backend.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index caa4c7a3..52e2b132 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: retool description: A Helm chart for Kubernetes type: application -version: 4.2.2 +version: 4.2.3 appVersion: "2.66.14" maintainers: - name: Retool Engineering diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index 223e877c..2f594d26 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -101,6 +101,8 @@ spec: key: google-client-secret - name: RESTRICTED_DOMAIN value: {{ default "" .Values.config.auth.google.domain }} + - name: BASE_DOMAIN + value: {{ default "" .Values.config.baseDomain }} {{- end }} {{- range $key, $value := .Values.env }} - name: "{{ $key }}" From c4cc0cca2ea52d88e4d33e318b254c26dab74f25 Mon Sep 17 00:00:00 2001 From: John O'Gara Date: Tue, 20 Apr 2021 17:19:51 +0100 Subject: [PATCH 05/20] Bump to latest appVersion provided by retool --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index 52e2b132..a5fc190b 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -3,7 +3,7 @@ name: retool description: A Helm chart for Kubernetes type: application version: 4.2.3 -appVersion: "2.66.14" +appVersion: "2.66.83" maintainers: - name: Retool Engineering email: engineering+helm@retool.com From aee228b2c7d98bdf1c3db8625038bf4182c7d05e Mon Sep 17 00:00:00 2001 From: John O'Gara Date: Mon, 3 May 2021 15:33:35 +0100 Subject: [PATCH 06/20] Add support for github app configuration (#2) --- templates/deployment_backend.yaml | 6 ++++++ values.yaml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index 2f594d26..e5fb5c48 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -103,6 +103,12 @@ spec: value: {{ default "" .Values.config.auth.google.domain }} - name: BASE_DOMAIN value: {{ default "" .Values.config.baseDomain }} + - name: GITHUB_APP_ID + value: {{ default "" .Values.config.githubAppId }} + - name: GITHUB_APP_INSTALLATION_ID + value: {{ default "" .Values.config.githubAppInstallationId }} + - name: GITHUB_APP_PRIVATE_KEY + value: {{ default "" .Values.config.githubAppPrivateKey }} {{- end }} {{- range $key, $value := .Values.env }} - name: "{{ $key }}" diff --git a/values.yaml b/values.yaml index 8acdb38e..d050b4ca 100644 --- a/values.yaml +++ b/values.yaml @@ -12,6 +12,9 @@ config: encryptionKey: jwtSecret: baseDomain: + githubAppId: + githubAppInstallationId: + githubAppPrivateKey: postgresql: {} # Specify if postgresql subchart is disabled From 966f7fc2027a6bc8768d9d4bc70b7eb0b35fab8a Mon Sep 17 00:00:00 2001 From: John O'Gara Date: Mon, 3 May 2021 16:36:50 +0100 Subject: [PATCH 07/20] Update the deployment jobs to match deployment_backend (#3) --- templates/deployment_jobs.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/deployment_jobs.yaml b/templates/deployment_jobs.yaml index 66d86a26..c7ecb409 100644 --- a/templates/deployment_jobs.yaml +++ b/templates/deployment_jobs.yaml @@ -102,6 +102,12 @@ spec: value: {{ default "" .Values.config.auth.google.domain }} - name: BASE_DOMAIN value: {{ .Values.config.baseDomain | quote }} + - name: GITHUB_APP_ID + value: {{ default "" .Values.config.githubAppId }} + - name: GITHUB_APP_INSTALLATION_ID + value: {{ default "" .Values.config.githubAppInstallationId }} + - name: GITHUB_APP_PRIVATE_KEY + value: {{ default "" .Values.config.githubAppPrivateKey }} {{- end }} {{- range $key, $value := .Values.env }} - name: "{{ $key }}" From bd7d369d81887561455fe631ad08f61d4762eb72 Mon Sep 17 00:00:00 2001 From: John O'Gara Date: Mon, 3 May 2021 16:57:49 +0100 Subject: [PATCH 08/20] Quote github values for env vars (#4) --- templates/deployment_backend.yaml | 6 +++--- templates/deployment_jobs.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index e5fb5c48..59c362dd 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -104,11 +104,11 @@ spec: - name: BASE_DOMAIN value: {{ default "" .Values.config.baseDomain }} - name: GITHUB_APP_ID - value: {{ default "" .Values.config.githubAppId }} + value: {{ .Values.config.githubAppId | default "" | quote }} - name: GITHUB_APP_INSTALLATION_ID - value: {{ default "" .Values.config.githubAppInstallationId }} + value: {{ .Values.config.githubAppInstallationId | default "" | quote }} - name: GITHUB_APP_PRIVATE_KEY - value: {{ default "" .Values.config.githubAppPrivateKey }} + value: {{ .Values.config.githubAppPrivateKey | default "" | quote }} {{- end }} {{- range $key, $value := .Values.env }} - name: "{{ $key }}" diff --git a/templates/deployment_jobs.yaml b/templates/deployment_jobs.yaml index c7ecb409..b0c852f8 100644 --- a/templates/deployment_jobs.yaml +++ b/templates/deployment_jobs.yaml @@ -103,11 +103,11 @@ spec: - name: BASE_DOMAIN value: {{ .Values.config.baseDomain | quote }} - name: GITHUB_APP_ID - value: {{ default "" .Values.config.githubAppId }} + value: {{ .Values.config.githubAppId | default "" | quote }} - name: GITHUB_APP_INSTALLATION_ID - value: {{ default "" .Values.config.githubAppInstallationId }} + value: {{ .Values.config.githubAppInstallationId | default "" | quote }} - name: GITHUB_APP_PRIVATE_KEY - value: {{ default "" .Values.config.githubAppPrivateKey }} + value: {{ .Values.config.githubAppPrivateKey | default "" | quote }} {{- end }} {{- range $key, $value := .Values.env }} - name: "{{ $key }}" From 65732bbe117df1c9a639b4011ebfae8862be249e Mon Sep 17 00:00:00 2001 From: Daniel Sellergren Date: Fri, 14 May 2021 08:52:54 -0400 Subject: [PATCH 09/20] Updates Retool to 2.66.91 (#5) --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index a5fc190b..af745401 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -3,7 +3,7 @@ name: retool description: A Helm chart for Kubernetes type: application version: 4.2.3 -appVersion: "2.66.83" +appVersion: "2.66.91" maintainers: - name: Retool Engineering email: engineering+helm@retool.com From 35d43565d7ca2fbc4b1e57c0e41915b798d3af7c Mon Sep 17 00:00:00 2001 From: Daniel Sellergren Date: Mon, 17 May 2021 12:00:18 -0400 Subject: [PATCH 10/20] Adds VERSION_CONTROL_LOCKED ENV var (#6) --- templates/deployment_backend.yaml | 2 ++ templates/deployment_jobs.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index 59c362dd..b8a29ba4 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -109,6 +109,8 @@ spec: value: {{ .Values.config.githubAppInstallationId | default "" | quote }} - name: GITHUB_APP_PRIVATE_KEY value: {{ .Values.config.githubAppPrivateKey | default "" | quote }} + - name: VERSION_CONTROL_LOCKED + value: {{ .Values.config.versionControlLocked | default "" | quote }} {{- end }} {{- range $key, $value := .Values.env }} - name: "{{ $key }}" diff --git a/templates/deployment_jobs.yaml b/templates/deployment_jobs.yaml index b0c852f8..5fb0a874 100644 --- a/templates/deployment_jobs.yaml +++ b/templates/deployment_jobs.yaml @@ -108,6 +108,8 @@ spec: value: {{ .Values.config.githubAppInstallationId | default "" | quote }} - name: GITHUB_APP_PRIVATE_KEY value: {{ .Values.config.githubAppPrivateKey | default "" | quote }} + - name: VERSION_CONTROL_LOCKED + value: {{ .Values.config.versionControlLocked | default "" | quote }} {{- end }} {{- range $key, $value := .Values.env }} - name: "{{ $key }}" From 40f110b66b4a047ab17cde65283dd6fcaeccec14 Mon Sep 17 00:00:00 2001 From: Daniel Sellergren Date: Wed, 28 Jul 2021 10:31:39 -0400 Subject: [PATCH 11/20] Upgrades Retool to 2.70.21 (#7) --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index af745401..e788d2fa 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -3,7 +3,7 @@ name: retool description: A Helm chart for Kubernetes type: application version: 4.2.3 -appVersion: "2.66.91" +appVersion: "2.70.21" maintainers: - name: Retool Engineering email: engineering+helm@retool.com From eae1b33b35ea9f11cc83d5b30fd0b3baaf4f9bfa Mon Sep 17 00:00:00 2001 From: danielsellergren Date: Thu, 9 Sep 2021 12:11:26 -0400 Subject: [PATCH 12/20] Adds OneLogin requirements --- templates/secret.yaml | 5 +++++ values.yaml | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/templates/secret.yaml b/templates/secret.yaml index eb06ded3..9df2460d 100644 --- a/templates/secret.yaml +++ b/templates/secret.yaml @@ -12,6 +12,11 @@ metadata: type: Opaque data: license-key: {{ .Values.config.licenseKey | b64enc | quote }} + custom_oauth2_sso_client_id: {{ .Values.config.auth.onelogin.customOauth2SsoClientId | b64enc | quote }} + custom_oauth2_sso_client_secret: {{ .Values.config.auth.onelogin.customOauth2SsoClientSecret | b64enc | quote }} + custom_oauth2_sso_auth_url: {{ .Values.config.auth.onelogin.customOauth2SsoAuthUrl | b64enc | quote }} + trigger_oauth_2_sso_login_automatically: {{ .Values.config.auth.onelogin.triggerOauth2SsoLoginAutomatically | b64enc | quote }} + trigger_saml_login_automatically: {{ .Values.config.auth.onelogin.triggerSamlLoginAutomatically | b64enc | quote }} {{ if .Values.config.jwtSecret }} jwt-secret: {{ .Values.config.jwtSecret | b64enc | quote }} diff --git a/values.yaml b/values.yaml index d050b4ca..2b1f5484 100644 --- a/values.yaml +++ b/values.yaml @@ -9,6 +9,12 @@ config: clientId: clientSecret: domain: + onelogin: + customOauth2SsoClientId: + customOauth2SsoClientSecret: + customOauth2SsoAuthUrl: + triggerOauth2SsoLoginAutomatically: + triggerSamlLoginAutomatically: encryptionKey: jwtSecret: baseDomain: From 89dff982c3a9395a5f6528f60e6fca71048d0b02 Mon Sep 17 00:00:00 2001 From: Joan Porta Date: Fri, 10 Sep 2021 06:53:56 +0200 Subject: [PATCH 13/20] fix ident --- values.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/values.yaml b/values.yaml index 2b1f5484..10ab351a 100644 --- a/values.yaml +++ b/values.yaml @@ -9,12 +9,12 @@ config: clientId: clientSecret: domain: - onelogin: - customOauth2SsoClientId: - customOauth2SsoClientSecret: - customOauth2SsoAuthUrl: - triggerOauth2SsoLoginAutomatically: - triggerSamlLoginAutomatically: + onelogin: + customOauth2SsoClientId: + customOauth2SsoClientSecret: + customOauth2SsoAuthUrl: + triggerOauth2SsoLoginAutomatically: + triggerSamlLoginAutomatically: encryptionKey: jwtSecret: baseDomain: From 7f604ffcaa518fc8201423c28a1adc55e38153ff Mon Sep 17 00:00:00 2001 From: Joan Porta Date: Fri, 10 Sep 2021 07:01:23 +0200 Subject: [PATCH 14/20] change chart version --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index e788d2fa..4128b4d1 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: retool description: A Helm chart for Kubernetes type: application -version: 4.2.3 +version: 4.3.0 appVersion: "2.70.21" maintainers: - name: Retool Engineering From 038db7080db8add173a6e23b73b0608eb96d344e Mon Sep 17 00:00:00 2001 From: Joan Porta Date: Fri, 10 Sep 2021 10:44:25 +0200 Subject: [PATCH 15/20] add retool onelogin values --- templates/deployment_backend.yaml | 10 ++++++++++ templates/secret.yaml | 6 ------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index b8a29ba4..2b323e4c 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -49,6 +49,16 @@ spec: {{ toYaml .Values.commandline.args | indent 10 }} {{- end }} env: + - name: CUSTOM_OAUTH2_SSO_CLIENT_ID + value: {{ .Values.config.auth.onelogin.custom_oauth2_sso_client_id | quote }} + - name: CUSTOM_OAUTH2_SSO_CLIENT_SECRET + value: {{ .Values.config.auth.onelogin.custom_oauth2_sso_client_secret | quote }} + - name: CUSTOM_OAUTH2_SSO_AUTH_URL + value: {{ .Values.config.auth.onelogin.custom_oauth2_sso_client_secret | quote }} + - name: TRIGGER_OAUTH_2_SSO_LOGIN_AUTOMATICALLY + value: {{ .Values.config.auth.onelogin.trigger_oauth_2_sso_login_automatically | quote }} + - name: TRIGGER_SAML_LOGIN_AUTOMATICALLY + value: {{ .Values.config.auth.onelogin.trigger_saml_login_automatically | quote }} - name: NODE_ENV value: production {{- if gt (int (toString (.Values.replicaCount))) 1 }} diff --git a/templates/secret.yaml b/templates/secret.yaml index 9df2460d..687abefb 100644 --- a/templates/secret.yaml +++ b/templates/secret.yaml @@ -12,12 +12,6 @@ metadata: type: Opaque data: license-key: {{ .Values.config.licenseKey | b64enc | quote }} - custom_oauth2_sso_client_id: {{ .Values.config.auth.onelogin.customOauth2SsoClientId | b64enc | quote }} - custom_oauth2_sso_client_secret: {{ .Values.config.auth.onelogin.customOauth2SsoClientSecret | b64enc | quote }} - custom_oauth2_sso_auth_url: {{ .Values.config.auth.onelogin.customOauth2SsoAuthUrl | b64enc | quote }} - trigger_oauth_2_sso_login_automatically: {{ .Values.config.auth.onelogin.triggerOauth2SsoLoginAutomatically | b64enc | quote }} - trigger_saml_login_automatically: {{ .Values.config.auth.onelogin.triggerSamlLoginAutomatically | b64enc | quote }} - {{ if .Values.config.jwtSecret }} jwt-secret: {{ .Values.config.jwtSecret | b64enc | quote }} {{ else }} From 2d8636d1332846ce4ffe2bf785f1d885aa024af0 Mon Sep 17 00:00:00 2001 From: Joan Porta Date: Fri, 10 Sep 2021 11:11:04 +0200 Subject: [PATCH 16/20] add retool onelogin values --- templates/deployment_backend.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index 2b323e4c..fe2b7a4e 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -50,15 +50,15 @@ spec: {{- end }} env: - name: CUSTOM_OAUTH2_SSO_CLIENT_ID - value: {{ .Values.config.auth.onelogin.custom_oauth2_sso_client_id | quote }} + value: {{ .Values.config.auth.onelogin.customOauth2SsoClientId | quote }} - name: CUSTOM_OAUTH2_SSO_CLIENT_SECRET - value: {{ .Values.config.auth.onelogin.custom_oauth2_sso_client_secret | quote }} + value: {{ .Values.config.auth.onelogin.customOauth2SsoClientSecret | quote }} - name: CUSTOM_OAUTH2_SSO_AUTH_URL - value: {{ .Values.config.auth.onelogin.custom_oauth2_sso_client_secret | quote }} + value: {{ .Values.config.auth.onelogin.customOauth2SsoAuthUrl | quote }} - name: TRIGGER_OAUTH_2_SSO_LOGIN_AUTOMATICALLY - value: {{ .Values.config.auth.onelogin.trigger_oauth_2_sso_login_automatically | quote }} + value: {{ .Values.config.auth.onelogin.triggerOauth2SsoLoginAutomatically | quote }} - name: TRIGGER_SAML_LOGIN_AUTOMATICALLY - value: {{ .Values.config.auth.onelogin.trigger_saml_login_automatically | quote }} + value: {{ .Values.config.auth.onelogin.triggerSamlLoginAutomatically | quote }} - name: NODE_ENV value: production {{- if gt (int (toString (.Values.replicaCount))) 1 }} From 460d7f7b35731b5bc3ea79e914c68a18b246aa2b Mon Sep 17 00:00:00 2001 From: Joan Porta Date: Wed, 15 Sep 2021 13:28:50 +0200 Subject: [PATCH 17/20] Add onelogin var --- templates/deployment_backend.yaml | 2 ++ values.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index fe2b7a4e..26fdb964 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -55,6 +55,8 @@ spec: value: {{ .Values.config.auth.onelogin.customOauth2SsoClientSecret | quote }} - name: CUSTOM_OAUTH2_SSO_AUTH_URL value: {{ .Values.config.auth.onelogin.customOauth2SsoAuthUrl | quote }} + - name: CUSTOM_OAUTH2_SSO_TOKEN_URL + value: { { .Values.config.auth.onelogin.customOauth2SsoTokenUrl | quote } } - name: TRIGGER_OAUTH_2_SSO_LOGIN_AUTOMATICALLY value: {{ .Values.config.auth.onelogin.triggerOauth2SsoLoginAutomatically | quote }} - name: TRIGGER_SAML_LOGIN_AUTOMATICALLY diff --git a/values.yaml b/values.yaml index 10ab351a..4cc54f3c 100644 --- a/values.yaml +++ b/values.yaml @@ -13,6 +13,7 @@ config: customOauth2SsoClientId: customOauth2SsoClientSecret: customOauth2SsoAuthUrl: + customOauth2SsoTokenUrl: triggerOauth2SsoLoginAutomatically: triggerSamlLoginAutomatically: encryptionKey: From f6ef8a2205f756fca4294d8c5df0c80ddd88d283 Mon Sep 17 00:00:00 2001 From: Joan Porta Date: Thu, 16 Sep 2021 03:29:37 +0200 Subject: [PATCH 18/20] remove SSO Google --- templates/deployment_backend.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index 26fdb964..09309d9a 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -104,15 +104,15 @@ spec: name: {{ template "retool.fullname" . }} {{- end }} key: postgresql-password - - name: CLIENT_ID - value: {{ default "" .Values.config.auth.google.clientId }} - - name: CLIENT_SECRET - valueFrom: - secretKeyRef: - name: {{ template "retool.fullname" . }} - key: google-client-secret - - name: RESTRICTED_DOMAIN - value: {{ default "" .Values.config.auth.google.domain }} + #- name: CLIENT_ID + # value: {{ default "" .Values.config.auth.google.clientId }} + #- name: CLIENT_SECRET + # valueFrom: + # secretKeyRef: + # name: {{ template "retool.fullname" . }} + # key: google-client-secret + #- name: RESTRICTED_DOMAIN + # value: {{ default "" .Values.config.auth.google.domain }} - name: BASE_DOMAIN value: {{ default "" .Values.config.baseDomain }} - name: GITHUB_APP_ID From caf70267b6174df4ee04a7f34f4143923719e276 Mon Sep 17 00:00:00 2001 From: Joan Porta Date: Thu, 16 Sep 2021 03:31:54 +0200 Subject: [PATCH 19/20] remove SSO Google --- templates/deployment_backend.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index 09309d9a..0645059a 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -56,7 +56,7 @@ spec: - name: CUSTOM_OAUTH2_SSO_AUTH_URL value: {{ .Values.config.auth.onelogin.customOauth2SsoAuthUrl | quote }} - name: CUSTOM_OAUTH2_SSO_TOKEN_URL - value: { { .Values.config.auth.onelogin.customOauth2SsoTokenUrl | quote } } + value: {{ .Values.config.auth.onelogin.customOauth2SsoTokenUrl | quote }} - name: TRIGGER_OAUTH_2_SSO_LOGIN_AUTOMATICALLY value: {{ .Values.config.auth.onelogin.triggerOauth2SsoLoginAutomatically | quote }} - name: TRIGGER_SAML_LOGIN_AUTOMATICALLY From e9933de0f1c6df614231bf46a740c00a204b75e9 Mon Sep 17 00:00:00 2001 From: Joan Porta Date: Fri, 17 Sep 2021 07:07:11 +0200 Subject: [PATCH 20/20] troubleshooting Onelogin --- templates/deployment_backend.yaml | 14 ++------------ values.yaml | 7 +------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index 0645059a..51352527 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -49,18 +49,8 @@ spec: {{ toYaml .Values.commandline.args | indent 10 }} {{- end }} env: - - name: CUSTOM_OAUTH2_SSO_CLIENT_ID - value: {{ .Values.config.auth.onelogin.customOauth2SsoClientId | quote }} - - name: CUSTOM_OAUTH2_SSO_CLIENT_SECRET - value: {{ .Values.config.auth.onelogin.customOauth2SsoClientSecret | quote }} - - name: CUSTOM_OAUTH2_SSO_AUTH_URL - value: {{ .Values.config.auth.onelogin.customOauth2SsoAuthUrl | quote }} - - name: CUSTOM_OAUTH2_SSO_TOKEN_URL - value: {{ .Values.config.auth.onelogin.customOauth2SsoTokenUrl | quote }} - - name: TRIGGER_OAUTH_2_SSO_LOGIN_AUTOMATICALLY - value: {{ .Values.config.auth.onelogin.triggerOauth2SsoLoginAutomatically | quote }} - - name: TRIGGER_SAML_LOGIN_AUTOMATICALLY - value: {{ .Values.config.auth.onelogin.triggerSamlLoginAutomatically | quote }} + - name: SCIM_AUTH_TOKEN + value: {{ .Values.config.auth.onelogin.scimAuthToken | quote }} - name: NODE_ENV value: production {{- if gt (int (toString (.Values.replicaCount))) 1 }} diff --git a/values.yaml b/values.yaml index 4cc54f3c..461d7aaf 100644 --- a/values.yaml +++ b/values.yaml @@ -10,12 +10,7 @@ config: clientSecret: domain: onelogin: - customOauth2SsoClientId: - customOauth2SsoClientSecret: - customOauth2SsoAuthUrl: - customOauth2SsoTokenUrl: - triggerOauth2SsoLoginAutomatically: - triggerSamlLoginAutomatically: + scimAuthToken: encryptionKey: jwtSecret: baseDomain: