Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sso term changes #383

Merged
merged 3 commits into from
Feb 4, 2025
Merged

Sso term changes #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66b9ed8
replace sso with SocialLogin
shaykeren Feb 4, 2025
06d935b
bump
shaykeren Feb 4, 2025
975ab73
ui bump
shaykeren Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/digma-ng/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
annotations:
category: Application
apiVersion: v2
appVersion: 0.3.214
appVersion: 0.3.215
dependencies:
- name: kafka
repository: oci://registry-1.docker.io/bitnamicharts
Expand Down Expand Up @@ -41,5 +41,5 @@ description: A Helm chart containing Digma's services
home: https://github.com/digma-ai/digma
icon: https://digma.ai/wp-content/uploads/2024/02/logo-alt-1.svg
type: application
version: 1.0.281
version: 1.0.282

14 changes: 7 additions & 7 deletions charts/digma-ng/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# digma-ng

![Version: 1.0.281](https://img.shields.io/badge/Version-1.0.281-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.214](https://img.shields.io/badge/AppVersion-0.3.214-informational?style=flat-square)
![Version: 1.0.282](https://img.shields.io/badge/Version-1.0.282-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.215](https://img.shields.io/badge/AppVersion-0.3.215-informational?style=flat-square)

A Helm chart containing Digma's services

Expand Down Expand Up @@ -199,18 +199,18 @@ How It Works
| digma.externals.postgresql.password | string | `""` | Password of an external PostgreSQL instance to connect (only if postgresql.enabled=false) |
| digma.externals.postgresql.port | int | `5432` | Port of an external PostgreSQL instance to connect (only if postgresql.enabled=false) |

### SSO
### Social Login

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| digma.sso.enabled | bool | `false` | enable sso |
| digma.sso.google.clientId | string | `nil` | google clientId |
| digma.socialLogin.enabled | bool | `false` | enable social login |
| digma.socialLogin.google.clientId | string | `nil` | google clientId |

### SSO
### Social Login

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| digma.sso.google.secret | string | `nil` | google secret |
| digma.socialLogin.google.secret | string | `nil` | google secret |

### Observability parameters

Expand Down Expand Up @@ -512,7 +512,7 @@ How It Works
| nginx.readinessProbe.timeoutSeconds | int | `10` | Timeout seconds for readinessProbe |
| nginx.readinessProbe.failureThreshold | int | `24` | Failure threshold for readinessProbe |
| nginx.readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe |
| ui.artifactsVersion | string | `"6.12.0"` | ui version |
| ui.artifactsVersion | string | `"6.13.0"` | ui version |
| ui.service.type | string | `"ClusterIP"` | service type |
| ui.service.annotations | object | `{}` | Additional custom annotations for service |
| ui.service.ports.http | int | `80` | HTTP service port |
Expand Down
10 changes: 5 additions & 5 deletions charts/digma-ng/templates/analytics/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ spec:
{{- if .Values.analyticsApi.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.analyticsApi.extraEnvVars "context" $) | nindent 8 }}
{{- end }}
{{ if .Values.digma.sso.enabled }}
- name: SSO__Google__ClientId
value: {{ .Values.digma.sso.google.clientId | quote}}
- name: SSO__Google__ClientSecret
value: {{ .Values.digma.sso.google.secret | quote}}
{{ if .Values.digma.socialLogin.enabled }}
- name: SocialLogin__Google__ClientId
value: {{ .Values.digma.socialLogin.google.clientId | quote}}
- name: SocialLogin__Google__ClientSecret
value: {{ .Values.digma.socialLogin.google.secret | quote}}
{{- end }}
- name: GlobalExceptionSettings__ExposeInternalDetails
value: "true"
Expand Down
4 changes: 2 additions & 2 deletions charts/digma-ng/templates/ui/ui-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ data:
window.theme = "dark-jetbrains";
window.postHogApiKey = "phc_5sy6Kuv1EYJ9GAdWPeGl7gx31RAw7BR7NHnOuLCUQZK";
window.postHogHost = "https://us.i.posthog.com";
{{ if .Values.digma.sso.enabled }}
window.googleClientId = "{{ .Values.digma.sso.google.clientId }}";
{{ if .Values.digma.socialLogin.enabled }}
window.googleClientId = "{{ .Values.digma.socialLogin.google.clientId }}";
{{- end }}
12 changes: 6 additions & 6 deletions charts/digma-ng/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ digma:
# -- Email gateway URL
# @section -- Global Digma parameters
url:
sso:
# -- enable sso
# @section -- SSO
socialLogin:
# -- enable social login
# @section -- Social Login
enabled: false
google:
# -- google clientId
# @section -- SSO
# @section -- Social Login
clientId:
# -- google secret
# @section -- SSO
# @section -- Social Login
secret:
externals:
postgresql:
Expand Down Expand Up @@ -1230,7 +1230,7 @@ nginx:
ui:
# -- ui version
# @section -- UI parameters
artifactsVersion: 6.12.0
artifactsVersion: 6.13.0
sandboxEnabled: false
service:
# -- service type
Expand Down