diff --git a/Chart.yaml b/Chart.yaml index 1bde4554..4128b4d1 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: retool description: A Helm chart for Kubernetes type: application -version: 4.2.0 -appVersion: "2.66.14" +version: 4.3.0 +appVersion: "2.70.21" maintainers: - name: Retool Engineering email: engineering+helm@retool.com diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index 223e877c..51352527 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -49,6 +49,8 @@ spec: {{ toYaml .Values.commandline.args | indent 10 }} {{- end }} env: + - name: SCIM_AUTH_TOKEN + value: {{ .Values.config.auth.onelogin.scimAuthToken | quote }} - name: NODE_ENV value: production {{- if gt (int (toString (.Values.replicaCount))) 1 }} @@ -92,15 +94,25 @@ 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 + value: {{ .Values.config.githubAppId | default "" | quote }} + - name: GITHUB_APP_INSTALLATION_ID + 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 588f775b..5fb0a874 100644 --- a/templates/deployment_jobs.yaml +++ b/templates/deployment_jobs.yaml @@ -100,6 +100,16 @@ spec: key: google-client-secret - name: RESTRICTED_DOMAIN value: {{ default "" .Values.config.auth.google.domain }} + - name: BASE_DOMAIN + value: {{ .Values.config.baseDomain | quote }} + - name: GITHUB_APP_ID + value: {{ .Values.config.githubAppId | default "" | quote }} + - name: GITHUB_APP_INSTALLATION_ID + 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/secret.yaml b/templates/secret.yaml index eb06ded3..687abefb 100644 --- a/templates/secret.yaml +++ b/templates/secret.yaml @@ -12,7 +12,6 @@ metadata: type: Opaque data: license-key: {{ .Values.config.licenseKey | b64enc | quote }} - {{ if .Values.config.jwtSecret }} jwt-secret: {{ .Values.config.jwtSecret | b64enc | quote }} {{ else }} diff --git a/values.yaml b/values.yaml index f30fc8ca..461d7aaf 100644 --- a/values.yaml +++ b/values.yaml @@ -9,8 +9,14 @@ config: clientId: clientSecret: domain: + onelogin: + scimAuthToken: encryptionKey: jwtSecret: + baseDomain: + githubAppId: + githubAppInstallationId: + githubAppPrivateKey: postgresql: {} # Specify if postgresql subchart is disabled