Skip to content

Commit 6cf4f10

Browse files
committed
Merge branch 'main' into bramwelt/additional-services
Signed-off-by: Trevor Bramwell <[email protected]>
2 parents 42547b1 + 46e19d7 commit 6cf4f10

File tree

6 files changed

+104
-15
lines changed

6 files changed

+104
-15
lines changed

.cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"contextualizers",
1010
"crds",
1111
"dadrus",
12+
"daemonset",
1213
"dbname",
1314
"finalizer",
1415
"gelf",

charts/lfx-platform/Chart.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies:
44
version: 36.2.0
55
- name: openfga
66
repository: https://openfga.github.io/helm-charts
7-
version: 0.2.43
7+
version: 0.2.44
88
- name: heimdall
99
repository: oci://ghcr.io/dadrus/heimdall/chart
1010
version: 0.15.8
@@ -34,10 +34,10 @@ dependencies:
3434
version: v0.18.0
3535
- name: lfx-v2-query-service
3636
repository: oci://ghcr.io/linuxfoundation/lfx-v2-query-service/chart
37-
version: 0.4.4
37+
version: 0.4.7
3838
- name: lfx-v2-project-service
3939
repository: oci://ghcr.io/linuxfoundation/lfx-v2-project-service/chart
40-
version: 0.4.3
40+
version: 0.4.6
4141
- name: lfx-v2-fga-sync
4242
repository: oci://ghcr.io/linuxfoundation/lfx-v2-fga-sync/chart
4343
version: 0.2.3
@@ -46,15 +46,15 @@ dependencies:
4646
version: 0.2.3
4747
- name: lfx-v2-indexer-service
4848
repository: oci://ghcr.io/linuxfoundation/lfx-v2-indexer-service/chart
49-
version: 0.2.0
49+
version: 0.4.4
5050
- name: lfx-v2-committee-service
5151
repository: oci://ghcr.io/linuxfoundation/lfx-v2-committee-service/chart
5252
version: 0.1.1
5353
- name: lfx-v2-meeting-service
5454
repository: oci://ghcr.io/linuxfoundation/lfx-v2-meeting-service/chart
55-
version: 0.4.3
55+
version: 0.1.1
5656
- name: lfx-v2-auth-service
5757
repository: oci://ghcr.io/linuxfoundation/lfx-v2-auth-service/chart
58-
version: 0.1.1
59-
digest: sha256:5694f4680e1a9e638879d26fbfa8a3ca219e07894971253ded7f302a402db88f
60-
generated: "2025-09-25T08:36:20.482743-03:00"
58+
version: 0.2.5
59+
digest: sha256:762d9c09282b2130f84066a2ba188317a88d3922c3befa86db83ca695345490f
60+
generated: "2025-10-07T14:43:56.084279178-07:00"

charts/lfx-platform/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dependencies:
5454
condition: trustManagerEnabled
5555
- name: lfx-v2-query-service
5656
repository: oci://ghcr.io/linuxfoundation/lfx-v2-query-service/chart
57-
version: ~0.4.4
57+
version: ~0.4.6
5858
condition: lfx-v2-query-service.enabled
5959
- name: lfx-v2-project-service
6060
repository: oci://ghcr.io/linuxfoundation/lfx-v2-project-service/chart
@@ -70,7 +70,7 @@ dependencies:
7070
condition: lfx-v2-access-check.enabled
7171
- name: lfx-v2-indexer-service
7272
repository: oci://ghcr.io/linuxfoundation/lfx-v2-indexer-service/chart
73-
version: ~0.4.1
73+
version: ~0.4.4
7474
condition: lfx-v2-indexer-service.enabled
7575
- name: lfx-v2-committee-service
7676
repository: oci://ghcr.io/linuxfoundation/lfx-v2-committee-service/chart
@@ -82,5 +82,5 @@ dependencies:
8282
condition: lfx-v2-meeting-service.enabled
8383
- name: lfx-v2-auth-service
8484
repository: oci://ghcr.io/linuxfoundation/lfx-v2-auth-service/chart
85-
version: ~0.1.0
85+
version: ~0.2.2
8686
condition: lfx-v2-auth-service.enabled

charts/lfx-platform/templates/mailpit/https-redirect-httproute.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The Linux Foundation and each contributor to LFX.
22
# SPDX-License-Identifier: MIT
33
---
4-
{{ if and .Values.mailpit.enabled (include "lfx-platform.https-enabled" .) (or
4+
{{ if and .Values.mailpit.enabled (eq (include "lfx-platform.https-enabled" .) "true") (or
55
.Values.gateway.enabled .Values.lfx.parentGateway.enabled) -}}
66
apiVersion: gateway.networking.k8s.io/v1
77
kind: HTTPRoute

charts/lfx-platform/templates/openfga/model.yaml

Lines changed: 72 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ spec:
1919
- patch: Modifications of define
2020
*/}}
2121
- version:
22-
major: 4
22+
major: 5
2323
minor: 3
24-
patch: 1
24+
patch: 2
2525
authorizationModel: |
2626
model
2727
schema 1.1
@@ -107,7 +107,7 @@ spec:
107107
# meeting become obsolete if the meeting is deleted.
108108
define meeting: [meeting]
109109
# The auditor relation identifies a user who can audit this meeting.
110-
define auditor: auditor from project or auditor from meeting
110+
define auditor: organizer or auditor from project or auditor from meeting
111111
# The organizer relation identifies a user who can manage this one past meeting.
112112
# That means they can update the past meeting details, update the participants, etc.
113113
define organizer: [user] or meeting_coordinator from project or writer from project or organizer from meeting
@@ -121,4 +121,73 @@ spec:
121121
# If the past meeting is public, then any user can view it; but if it is private, then
122122
# only certain privileged users can view it.
123123
define viewer: [user:*] or attendee or invitee or organizer or auditor
124+
125+
# The past_meeting_recording type identifies a recording of a past meeting.
126+
# Access to a recording is limited to one of the following groups:
127+
# - Only meeting hosts
128+
# - Only meeting participants
129+
# - Public (anyone)
130+
type past_meeting_recording
131+
relations
132+
define past_meeting: [past_meeting]
133+
define writer: organizer from past_meeting
134+
define auditor: auditor from past_meeting
135+
define host: host from past_meeting
136+
define participant: invitee from past_meeting or attendee from past_meeting
137+
# The viewer relation needs to be kept up-to-date separately from the other relations
138+
# because it depends on the past meeting artifact_visibility setting. Auditors and writers
139+
# do however by default have access to view the recording.
140+
#
141+
# If the artifact_visibility is public, then every user should be a viewer
142+
# If it is set to only meeting participants, then only the meeting participants
143+
# should be able to view the recording.
144+
# If it is set to only meeting hosts, then only the meeting hosts should be able
145+
# to view the recording.
146+
define viewer: [user:*] or writer or auditor
147+
148+
# The past_meeting_transcript type identifies a transcript of a past meeting.
149+
# Access to a transcript is limited to one of the following groups:
150+
# - Only meeting hosts
151+
# - Only meeting participants
152+
# - Public (anyone)
153+
type past_meeting_transcript
154+
relations
155+
define past_meeting: [past_meeting]
156+
define writer: organizer from past_meeting
157+
define auditor: auditor from past_meeting
158+
define host: host from past_meeting
159+
define participant: invitee from past_meeting or attendee from past_meeting
160+
# The viewer relation needs to be kept up-to-date separately from the other relations
161+
# because it depends on the past meeting artifact_visibility setting. Auditors and writers
162+
# do however by default have access to view the transcript.
163+
#
164+
# If the artifact_visibility is public, then every user should be a viewer
165+
# If it is set to only meeting participants, then only the meeting participants
166+
# should be able to view the transcript.
167+
# If it is set to only meeting hosts, then only the meeting hosts should be able
168+
# to view the transcript.
169+
define viewer: [user:*] or writer or auditor
170+
171+
# The past_meeting_summary type identifies a summary of a past meeting.
172+
# Access to a summary is limited to one of the following groups:
173+
# - Only meeting hosts
174+
# - Only meeting participants
175+
# - Public (anyone)
176+
type past_meeting_summary
177+
relations
178+
define past_meeting: [past_meeting]
179+
define writer: organizer from past_meeting
180+
define auditor: auditor from past_meeting
181+
define host: host from past_meeting
182+
define participant: invitee from past_meeting or attendee from past_meeting
183+
# The viewer relation needs to be kept up-to-date separately from the other relations
184+
# because it depends on the past meeting artifact_visibility setting. Auditors and writers
185+
# do however by default have access to view the summary.
186+
#
187+
# If the artifact_visibility is public, then every user should be a viewer
188+
# If it is set to only meeting participants, then only the meeting participants
189+
# should be able to view the summary.
190+
# If it is set to only meeting hosts, then only the meeting hosts should be able
191+
# to view the summary.
192+
define viewer: [user:*] or writer or auditor
124193
{{- end }}

charts/lfx-platform/values.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,3 +553,22 @@ lfx-v2-auth-service:
553553
enabled: true
554554
lfx:
555555
domain: k8s.orb.local
556+
app:
557+
environment:
558+
# Repository type for user management
559+
# It can be authelia, auth0 or mock
560+
# In case of auth0, please refer to the following documentation
561+
## https://github.com/linuxfoundation/lfx-v2-auth-service?tab=readme-ov-file#auth0-configuration
562+
USER_REPOSITORY_TYPE:
563+
value: mock
564+
# Authelia configuration
565+
## Required when using "authelia" repository type
566+
## For more information, see the [Local Development Support documentation](https://github.com/linuxfoundation/lfx-v2-auth-service/blob/main/README.md#local-development-support)
567+
AUTHELIA_CONFIGMAP_NAME:
568+
value: authelia-users
569+
AUTHELIA_CONFIGMAP_NAMESPACE:
570+
value: lfx
571+
AUTHELIA_DAEMONSET_NAME:
572+
value: lfx-platform-authelia
573+
AUTHELIA_SECRET_NAME:
574+
value: authelia-users

0 commit comments

Comments
 (0)