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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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 882c846f1fa2e2ef3cd02b44eab41a17f8d6d9e8 Mon Sep 17 00:00:00 2001 From: Joan Porta Date: Thu, 9 Sep 2021 17:28:44 +0200 Subject: [PATCH 12/13] feat: add OneLogin auth env vars --- templates/secret.yaml | 7 +++++++ values.yaml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/templates/secret.yaml b/templates/secret.yaml index eb06ded3..b7a9b070 100644 --- a/templates/secret.yaml +++ b/templates/secret.yaml @@ -13,6 +13,12 @@ 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 }} @@ -34,4 +40,5 @@ data: {{ if not .Values.postgresql.enabled }} postgresql-password: {{ .Values.config.postgresql.password | default "" | b64enc | quote }} {{ end }} + {{- end }} diff --git a/values.yaml b/values.yaml index d050b4ca..62a18a41 100644 --- a/values.yaml +++ b/values.yaml @@ -9,6 +9,13 @@ config: clientId: clientSecret: domain: + onelogin: + customOauth2SsoClientId: + customOauth2SsoClientSecret: + customOauth2SsoAuthUrl: + triggerOauth2SsoLoginAutomatically: + triggerSamlLoginAutomatically: + encryptionKey: jwtSecret: baseDomain: From d31c68c4faa77a1ffcf5b5ce2903e1f0a22fe94a Mon Sep 17 00:00:00 2001 From: Joan Porta Date: Thu, 9 Sep 2021 17:40:32 +0200 Subject: [PATCH 13/13] fix removed things --- templates/deployment_jobs.yaml | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/templates/deployment_jobs.yaml b/templates/deployment_jobs.yaml index b9656ad8..d522cca1 100644 --- a/templates/deployment_jobs.yaml +++ b/templates/deployment_jobs.yaml @@ -64,39 +64,22 @@ spec: value: {{ template "retool.postgresql.port" . }} - name: POSTGRES_DB value: {{ template "retool.postgresql.db" . }} - - name: POSTGRES_SSL_ENABLED - value: {{ template "retool.postgresql.ssl_enabled" . }} {{- if not .Values.externalSecrets.enabled }} - name: LICENSE_KEY valueFrom: secretKeyRef: - {{- if .Values.config.licenseKeySecretName }} - name: {{ .Values.config.licenseKeySecretName }} - key: {{ .Values.config.licenseKeySecretKey | default "license-key" }} - {{- else }} name: {{ template "retool.fullname" . }} key: license-key - {{- end }} - name: JWT_SECRET valueFrom: secretKeyRef: - {{- if .Values.config.jwtSecretSecretName }} - name: {{ .Values.config.jwtSecretSecretName }} - key: {{ .Values.config.jwtSecretSecretKey | default "jwt-secret" }} - {{- else }} name: {{ template "retool.fullname" . }} key: jwt-secret - {{- end }} - name: ENCRYPTION_KEY valueFrom: secretKeyRef: - {{- if .Values.config.encryptionKeySecretName }} - name: {{ .Values.config.encryptionKeySecretName }} - key: {{ .Values.config.encryptionKeySecretKey | default "encryption-key" }} - {{- else }} name: {{ template "retool.fullname" . }} key: encryption-key - {{- end }} - name: POSTGRES_USER value: {{ template "retool.postgresql.user" . }} - name: POSTGRES_PASSWORD @@ -104,28 +87,17 @@ spec: secretKeyRef: {{- if .Values.postgresql.enabled }} name: {{ template "retool.postgresql.fullname" . }} - key: postgresql-password - {{- else }} - {{- if .Values.config.postgresql.passwordSecretName }} - name: {{ .Values.config.postgresql.passwordSecretName }} - key: {{ .Values.config.postgresql.passwordSecretKey | default "postgresql-password" }} - {{- else }} + {{- else }} name: {{ template "retool.fullname" . }} - key: postgresql-password - {{- end }} {{- end }} + key: postgresql-password - name: CLIENT_ID value: {{ default "" .Values.config.auth.google.clientId }} - name: CLIENT_SECRET valueFrom: secretKeyRef: - {{- if .Values.config.auth.google.clientSecretSecretName }} - name: {{ .Values.config.auth.google.clientSecretSecretName }} - key: {{ .Values.config.auth.google.clientSecretSecretKey | default "google-client-secret" }} - {{- else }} name: {{ template "retool.fullname" . }} key: google-client-secret - {{- end }} - name: RESTRICTED_DOMAIN value: {{ default "" .Values.config.auth.google.domain }} - name: BASE_DOMAIN @@ -195,4 +167,4 @@ spec: {{- if .Values.extraVolumes }} {{ toYaml .Values.extraVolumes | indent 8 }} {{- end }} -{{- end }} +{{- end }} \ No newline at end of file