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

Jump to bottom

chore: add support for lagoon-ui-oidc client values #691

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: add support for lagoon-ui-oidc client values #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 1 addition & 18 deletions charts/lagoon-core/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,4 @@ dependencies:
annotations:
artifacthub.io/changes: |
- kind: changed
description: update Lagoon appVersion to v2.21.0
links:
- name: lagoon-core v2.21.0 release
url: https://github.com/uselagoon/lagoon/releases/tag/v2.21.0
- kind: changed
description: update insights-handler to v0.0.6
links:
- name: insights-remote v0.0.6 release
url: https://github.com/uselagoon/insights-handler/releases/tag/v0.0.6
- kind: changed
description: update ssh-portal and ssh-token to v0.37.2
links:
- name: ssh-portal v0.37.2 release
url: https://github.com/uselagoon/lagoon-ssh-portal/releases/tag/v0.37.2
- kind: changed
description: add broker-flag-enable pre-upgrade job
- kind: changed
description: add KEYCLOAK_FRONTEND_URL variable to api deployment
description: add KEYCLOAK_LAGOON_UI_OIDC_CLIENT_SECRET variable to keycloak and ui deployment
2 changes: 2 additions & 0 deletions charts/lagoon-core/templates/keycloak.secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ This somewhat complex logic is intended to:
{{- $keycloakAPIClientSecret := coalesce .Values.keycloakAPIClientSecret (ternary uuidv4 (index $data "KEYCLOAK_API_CLIENT_SECRET" | default "" | b64dec) (index $data "KEYCLOAK_API_CLIENT_SECRET" | empty)) }}
{{- $keycloakAuthServerClientSecret := coalesce .Values.keycloakAuthServerClientSecret (ternary uuidv4 (index $data "KEYCLOAK_AUTH_SERVER_CLIENT_SECRET" | default "" | b64dec) (index $data "KEYCLOAK_AUTH_SERVER_CLIENT_SECRET" | empty)) }}
{{- $keycloakServiceAPIClientSecret := coalesce .Values.keycloakServiceAPIClientSecret (ternary uuidv4 (index $data "KEYCLOAK_SERVICE_API_CLIENT_SECRET" | default "" | b64dec) (index $data "KEYCLOAK_SERVICE_API_CLIENT_SECRET" | empty)) }}
{{- $keycloakLagoonUIOIDCClientSecret := coalesce .Values.keycloakLagoonUIOIDCClientSecret (ternary uuidv4 (index $data "KEYCLOAK_LAGOON_UI_OIDC_CLIENT_SECRET" | default "" | b64dec) (index $data "KEYCLOAK_LAGOON_UI_OIDC_CLIENT_SECRET" | empty)) }}
{{- $keycloakLagoonOpensearchSyncClientSecret := coalesce .Values.keycloakLagoonOpensearchSyncClientSecret (ternary uuidv4 (index $data "KEYCLOAK_LAGOON_OPENSEARCH_SYNC_CLIENT_SECRET" | default "" | b64dec) (index $data "KEYCLOAK_LAGOON_OPENSEARCH_SYNC_CLIENT_SECRET" | empty)) }}
{{- $keycloakLagoonAdminPassword := coalesce .Values.keycloakLagoonAdminPassword (ternary (randAlpha 32) (index $data "KEYCLOAK_LAGOON_ADMIN_PASSWORD" | default "" | b64dec) (index $data "KEYCLOAK_LAGOON_ADMIN_PASSWORD" | empty)) }}
{{/* set the variable globally for access in NOTES */}}
Expand All @@ -27,5 +28,6 @@ stringData:
KEYCLOAK_API_CLIENT_SECRET: {{ $keycloakAPIClientSecret }}
KEYCLOAK_AUTH_SERVER_CLIENT_SECRET: {{ $keycloakAuthServerClientSecret | quote }}
KEYCLOAK_SERVICE_API_CLIENT_SECRET: {{ $keycloakServiceAPIClientSecret | quote }}
KEYCLOAK_LAGOON_UI_OIDC_CLIENT_SECRET: {{ $keycloakLagoonUIOIDCClientSecret | quote }}
KEYCLOAK_LAGOON_OPENSEARCH_SYNC_CLIENT_SECRET: {{ $keycloakLagoonOpensearchSyncClientSecret | quote }}
KEYCLOAK_LAGOON_ADMIN_PASSWORD: {{ $keycloakLagoonAdminPassword | quote }}
5 changes: 5 additions & 0 deletions charts/lagoon-core/templates/ui.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ spec:
{{- else }}
value: http://{{ include "lagoon-core.keycloak.fullname" . }}:{{ .Values.keycloak.service.port }}/auth
{{- end }}
- name: KEYCLOAK_LAGOON_UI_OIDC_CLIENT_SECRET
valueFrom:
secretKeyRef:
name: {{ include "lagoon-core.keycloak.fullname" . }}
key: KEYCLOAK_LAGOON_UI_OIDC_CLIENT_SECRET
- name: WEBHOOK_URL
{{- if .Values.lagoonWebhookURL }}
value: {{ .Values.lagoonWebhookURL | quote }}
Expand Down
1 change: 1 addition & 0 deletions charts/lagoon-core/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
# keycloakAdminPassword:
# keycloakAPIClientSecret:
# keycloakAuthServerClientSecret:
# keycloakLagoonUIOIDCClientSecret:
# keycloakDBPassword:
# keycloakLagoonAdminPassword:
# logsDBAdminPassword:
Expand Down
Loading