Skip to content

Commit 0a025c4

Browse files
committed
Merge branch 'main' into bramwelt/fix-https-redirects
2 parents dbd5057 + 14e861c commit 0a025c4

25 files changed

+811
-63
lines changed

.cspell.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"words": [
55
"aquasecurity",
66
"authelia",
7+
"clearbit",
78
"contextualizer",
89
"contextualizers",
910
"crds",
@@ -27,6 +28,7 @@
2728
"sslmode",
2829
"subchart",
2930
"subcharts",
31+
"swaggerapi",
3032
"tcsh",
3133
"totp",
3234
"traefik",

.github/workflows/mega-linter.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,20 @@ jobs:
2929
with:
3030
fetch-depth: 0
3131

32+
# Installs packaged subcharts under charts/*/charts/*.tgz. Also
33+
# fails if the Chart.lock digest is wrong.
34+
- name: Helm dependency fetch
35+
shell: bash
36+
run: |
37+
set -euo pipefail
38+
for chart in charts/*; do
39+
if [ -f "${chart}/Chart.lock" ]; then
40+
yq -r '.dependencies[] | select(.repository | contains("oci://") == false) | "\(.name) \(.repository)"' \
41+
"${chart}/Chart.yaml" | xargs -L1 helm repo add --force-update
42+
helm dependency build "${chart}"
43+
fi
44+
done
45+
3246
# MegaLinter
3347
- name: MegaLinter
3448
id: ml

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
4444
- name: Publish Chart to GHCR
4545
id: publish-ghcr
46-
uses: linuxfoundation/lfx-public-workflows/.github/actions/helm-chart-oci-publisher@a5d0271f539e3f69194cca94d9884914c3be088b
46+
uses: linuxfoundation/lfx-public-workflows/.github/actions/helm-chart-oci-publisher@e619121ece4ca4b1d6c89ade032f26105505756d
4747
with:
4848
name: ${{ steps.prepare.outputs.chart_name }}
4949
repository: ${{ github.repository }}/chart

.mega-linter.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,3 @@ SPELL_VALE_PRE_COMMANDS:
3737
FILTER_REGEX_EXCLUDE: '(templates/.*\.yml|templates/.*\.yaml)'
3838
KUBERNETES_DIRECTORY: charts/lfx-platform
3939
KUBERNETES_HELM_ARGUMENTS: charts/lfx-platform
40-
KUBERNETES_HELM_PRE_COMMANDS:
41-
- command: helm dependency update charts/lfx-platform

charts/lfx-platform/Chart.lock

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
dependencies:
22
- name: traefik
3-
repository: https://traefik.github.io/charts
3+
repository: oci://ghcr.io/traefik/helm
44
version: 36.2.0
55
- name: openfga
66
repository: https://openfga.github.io/helm-charts
7-
version: 0.2.39
7+
version: 0.2.43
88
- name: heimdall
9-
repository: https://dadrus.github.io/heimdall/charts
9+
repository: oci://ghcr.io/dadrus/heimdall/chart
1010
version: 0.15.8
1111
- name: nats
1212
repository: https://nats-io.github.io/k8s/helm/charts/
13-
version: 1.3.10
13+
version: 1.3.14
1414
- name: opensearch
1515
repository: https://opensearch-project.github.io/helm-charts/
1616
version: 2.34.0
@@ -19,10 +19,10 @@ dependencies:
1919
version: 0.25.2
2020
- name: authelia
2121
repository: https://charts.authelia.com
22-
version: 0.10.41
22+
version: 0.10.46
2323
- name: nack
2424
repository: https://nats-io.github.io/k8s/helm/charts/
25-
version: 0.29.1
25+
version: 0.29.2
2626
- name: fga-operator
2727
repository: https://3schwartz.github.io/fga-operator/
2828
version: 1.0.0
@@ -32,5 +32,23 @@ dependencies:
3232
- name: trust-manager
3333
repository: https://charts.jetstack.io
3434
version: v0.18.0
35-
digest: sha256:591a323ff20b90c4b50fd92c63788e91d7e08ff2606f155af26e38527680a84d
36-
generated: "2025-08-06T11:35:55.1914-07:00"
35+
- name: lfx-v2-query-service
36+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-query-service/chart
37+
version: 0.4.6
38+
- name: lfx-v2-project-service
39+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-project-service/chart
40+
version: 0.4.3
41+
- name: lfx-v2-fga-sync
42+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-fga-sync/chart
43+
version: 0.2.3
44+
- name: lfx-v2-access-check
45+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-access-check/chart
46+
version: 0.2.3
47+
- name: lfx-v2-indexer-service
48+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-indexer-service/chart
49+
version: 0.4.4
50+
- name: lfx-v2-auth-service
51+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-auth-service/chart
52+
version: 0.2.1
53+
digest: sha256:4910bb2ac9c059bb3e4beb5067ba6bcca6e7f9b2c76ce91897a7e68d85c680d6
54+
generated: "2025-09-29T12:29:27.911893-03:00"

charts/lfx-platform/Chart.yaml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ apiVersion: v2
55
name: lfx-platform
66
description: LFX Platform v2 Helm chart
77
type: application
8-
version: 0.1.10
8+
version: 0.2.18
99
icon: https://github.com/linuxfoundation/lfx-v2-helm/raw/main/img/lfx-logo-color.svg
1010
dependencies:
1111
- name: traefik
12-
repository: https://traefik.github.io/charts
12+
repository: oci://ghcr.io/traefik/helm
1313
version: ~36.2.0
1414
condition: traefik.enabled
1515
- name: openfga
1616
repository: https://openfga.github.io/helm-charts
1717
version: ~0.2.37
1818
condition: openfga.enabled
1919
- name: heimdall
20-
repository: https://dadrus.github.io/heimdall/charts
20+
repository: oci://ghcr.io/dadrus/heimdall/chart
2121
version: ~0.15.6
2222
condition: heimdall.enabled
2323
- name: nats
@@ -52,3 +52,27 @@ dependencies:
5252
repository: https://charts.jetstack.io
5353
version: ~0.18.0
5454
condition: trustManagerEnabled
55+
- name: lfx-v2-query-service
56+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-query-service/chart
57+
version: ~0.4.6
58+
condition: lfx-v2-query-service.enabled
59+
- name: lfx-v2-project-service
60+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-project-service/chart
61+
version: ~0.4.3
62+
condition: lfx-v2-project-service.enabled
63+
- name: lfx-v2-fga-sync
64+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-fga-sync/chart
65+
version: ~0.2.3
66+
condition: lfx-v2-fga-sync.enabled
67+
- name: lfx-v2-access-check
68+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-access-check/chart
69+
version: ~0.2.3
70+
condition: lfx-v2-access-check.enabled
71+
- name: lfx-v2-indexer-service
72+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-indexer-service/chart
73+
version: ~0.4.4
74+
condition: lfx-v2-indexer-service.enabled
75+
- name: lfx-v2-auth-service
76+
repository: oci://ghcr.io/linuxfoundation/lfx-v2-auth-service/chart
77+
version: ~0.2.1
78+
condition: lfx-v2-auth-service.enabled

charts/lfx-platform/templates/_traefik.tpl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Determine if HTTPS is enabled and get the HTTPS listener name in a single loop
88
*/}}
99
{{- define "lfx-platform.https-enabled" -}}
1010
{{- $httpsEnabled := false -}}
11-
{{- if .Values.traefik.gateway.listeners -}}
12-
{{- range $name, $listener := .Values.traefik.gateway.listeners -}}
11+
{{- if .Values.gateway.listeners -}}
12+
{{- range $name, $listener := .Values.gateway.listeners -}}
1313
{{- if eq $listener.protocol "HTTPS" -}}
1414
{{- $httpsEnabled = true -}}
1515
{{- break -}}
@@ -24,8 +24,8 @@ Get the HTTPS listener name (sectionName) from gateway listeners
2424
*/}}
2525
{{- define "lfx-platform.https-listener" -}}
2626
{{- $httpsListener := "websecure" -}}
27-
{{- if .Values.traefik.gateway.listeners -}}
28-
{{- range $name, $listener := .Values.traefik.gateway.listeners -}}
27+
{{- if .Values.gateway.listeners -}}
28+
{{- range $name, $listener := .Values.gateway.listeners -}}
2929
{{- if eq $listener.protocol "HTTPS" -}}
3030
{{- $httpsListener = $name -}}
3131
{{- break -}}
@@ -41,11 +41,11 @@ Prioritize "web" listener if it exists, otherwise use the first HTTP listener fo
4141
*/}}
4242
{{- define "lfx-platform.http-listener" -}}
4343
{{- $httpListener := "web" -}}
44-
{{- if .Values.traefik.gateway.listeners -}}
45-
{{- if index .Values.traefik.gateway.listeners "web" -}}
44+
{{- if .Values.gateway.listeners -}}
45+
{{- if index .Values.gateway.listeners "web" -}}
4646
{{- $httpListener = "web" -}}
4747
{{- else -}}
48-
{{- range $name, $listener := .Values.traefik.gateway.listeners -}}
48+
{{- range $name, $listener := .Values.gateway.listeners -}}
4949
{{- if eq $listener.protocol "HTTP" -}}
5050
{{- $httpListener = $name -}}
5151
{{- break -}}

charts/lfx-platform/templates/authelia-client-secrets.yaml renamed to charts/lfx-platform/templates/authelia/authelia-client-secrets.yaml

File renamed without changes.
File renamed without changes.

charts/lfx-platform/templates/authelia-users.yaml renamed to charts/lfx-platform/templates/authelia/authelia-users.yaml

File renamed without changes.

0 commit comments

Comments
 (0)