Skip to content

Commit

Permalink
feat: add support for setting keycloak redirect URIs for lagoon UI
Browse files Browse the repository at this point in the history
  • Loading branch information
rocketeerbkw committed Sep 9, 2024
1 parent a62046c commit 35435ca
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
8 changes: 3 additions & 5 deletions charts/lagoon-core/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type: application
# time you make changes to the chart and its templates, including the app
# version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.47.0
version: 1.48.0

# This is the version number of the application being deployed. This version
# number should be incremented each time you make changes to the application.
Expand All @@ -40,7 +40,5 @@ dependencies:
# Valid supported kinds are added, changed, deprecated, removed, fixed and security
annotations:
artifacthub.io/changes: |
- kind: changed
description: add support for injecting hostkeys in core ssh service
- kind: changed
description: update Lagoon appVersion to v2.20.1
- kind: added
description: add support for setting keycloak redirect URIs for lagoon UI
10 changes: 10 additions & 0 deletions charts/lagoon-core/templates/keycloak.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@ spec:
{{- else }}
value: http://{{ include "lagoon-core.keycloak.fullname" . }}:{{ .Values.keycloak.service.port }}/auth
{{- end }}
- name: KEYCLOAK_LAGOON_UI_CLIENT_REDIRECT_URIS
{{- if .Values.keycloakLagoonUIClientRedirectUris }}
value: {{ .Values.keycloakLagoonUIClientRedirectUris | quote }}
{{- else if .Values.lagoonUIURL }}
value: {{ .Values.lagoonUIURL }}/*
{{- else if .Values.ui.ingress.enabled }}
value: https://{{ index .Values.ui.ingress.hosts 0 "host" }}/*
{{- else }}
value: http://{{ include "lagoon-core.ui.fullname" . }}:{{ .Values.ui.service.port }}/*
{{- end }}
{{- with .Values.keycloakAdminEmail }}
- name: KEYCLOAK_ADMIN_EMAIL
value: {{ . | quote }}
Expand Down
2 changes: 2 additions & 0 deletions charts/lagoon-core/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ k8upS3Endpoint: ""
keycloakAdminUser: admin
# this is required if email sending is to be enabled in keycloak
# keycloakAdminEmail: [email protected]
# Override list of valid UI Redirect URIs
# keycloakLagoonUIClientRedirectUris: https://ui.example.com/*,https://dev-ui.example.com/*

buildDeployImage:
edge:
Expand Down

0 comments on commit 35435ca

Please sign in to comment.