Merge pull request #31 from emsearcy/support-existing-traefik

Allow external traefik

Author: emsearcy

charts/lfx-platform/Chart.yaml

@@ -5,7 +5,7 @@ apiVersion: v2
 name: lfx-platform
 description: LFX Platform v2 Helm chart
 type: application
-version: 0.1.11
+version: 0.1.12
 icon: https://github.com/linuxfoundation/lfx-v2-helm/raw/main/img/lfx-logo-color.svg
 dependencies:
   - name: traefik

charts/lfx-platform/templates/heimdall/middleware.yaml

@@ -1,7 +1,8 @@
 # Copyright The Linux Foundation and each contributor to LFX.
 # SPDX-License-Identifier: MIT
 ---
-{{ if and .Values.heimdall.enabled .Values.traefik.enabled -}}
+{{ if and .Values.heimdall.enabled (or
+  .Values.traefik.enabled .Values.lfx.parentGateway.enabled) -}}
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:

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

@@ -1,17 +1,24 @@
 # Copyright The Linux Foundation and each contributor to LFX.
 # SPDX-License-Identifier: MIT
 ---
-{{ if and .Values.mailpit.enabled .Values.traefik.enabled -}}
+{{ if and .Values.mailpit.enabled (or
+  .Values.traefik.enabled .Values.lfx.parentGateway.enabled) -}}
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: {{ include "common.names.fullname" .Subcharts.mailpit }}
   namespace: {{ .Release.Namespace }}
 spec:
   parentRefs:
+{{- if .Values.traefik.enabled }}
     - name: {{ .Values.traefik.gateway.name }}
       sectionName: {{ include "lfx-platform.default-listener" . }}
       namespace: {{ .Release.Namespace }}
+{{- else }}
+    - name: {{ .Values.lfx.parentGateway.name }}
+      sectionName: {{ .Values.lfx.parentGateway.sectionName }}
+      namespace: {{ .Values.lfx.parentGateway.namespace }}
+{{- end }}
   hostnames:
     - 'mailpit.{{ .Values.lfx.domain }}'
   rules:

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

@@ -1,17 +1,24 @@
 # Copyright The Linux Foundation and each contributor to LFX.
 # SPDX-License-Identifier: MIT
 ---
-{{ if and .Values.mailpit.enabled .Values.traefik.enabled (include "lfx-platform.https-enabled" .) -}}
+{{ if and .Values.mailpit.enabled (include "lfx-platform.https-enabled" .) (or
+  .Values.traefik.enabled .Values.lfx.parentGateway.enabled) -}}
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: mailpit-https-redirect
   namespace: {{ .Release.Namespace }}
 spec:
   parentRefs:
+{{- if .Values.traefik.enabled }}
     - name: {{ .Values.traefik.gateway.name }}
       sectionName: {{ include "lfx-platform.http-listener" . }}
       namespace: {{ .Release.Namespace }}
+{{- else }}
+    - name: {{ .Values.lfx.parentGateway.name }}
+      sectionName: {{ .Values.lfx.parentGateway.sectionName }}
+      namespace: {{ .Values.lfx.parentGateway.namespace }}
+{{- end }}
   hostnames:
     - 'mailpit.{{ .Values.lfx.domain }}'
   rules:

charts/lfx-platform/templates/whoami/httproute.yaml

@@ -1,33 +1,41 @@
 # Copyright The Linux Foundation and each contributor to LFX.
 # SPDX-License-Identifier: MIT
 ---
-{{- if and .Values.lfx.whoami.enabled .Values.traefik.enabled }}
+{{- if and .Values.lfx.whoami.enabled (or
+  .Values.traefik.enabled .Values.lfx.parentGateway.enabled) }}
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: whoami
   namespace: {{ .Release.Namespace }}
 spec:
   parentRefs:
-  - name: {{ .Values.traefik.gateway.name }}
-    namespace: {{ .Release.Namespace }}
+{{- if .Values.traefik.enabled }}
+    - name: {{ .Values.traefik.gateway.name }}
+      sectionName: {{ include "lfx-platform.default-listener" . }}
+      namespace: {{ .Release.Namespace }}
+{{- else }}
+    - name: {{ .Values.lfx.parentGateway.name }}
+      sectionName: {{ .Values.lfx.parentGateway.sectionName }}
+      namespace: {{ .Values.lfx.parentGateway.namespace }}
+{{- end }}
   hostnames:
-  - "lfx-api.{{ .Values.lfx.domain }}"
+    - "lfx-api.{{ .Values.lfx.domain }}"
   rules:
-  # Main application endpoints (with authentication)
-  - matches:
-    - path:
-        type: Exact
-        value: /whoami
-    {{- if .Values.heimdall.enabled }}
-    filters:
-    - type: ExtensionRef
-      extensionRef:
-        group: traefik.io
-        kind: Middleware
-        name: heimdall
-    {{- end }}
-    backendRefs:
-    - name: whoami
-      port: 80
+    # Main application endpoints (with authentication)
+    - matches:
+      - path:
+          type: Exact
+          value: /whoami
+      {{- if .Values.heimdall.enabled }}
+      filters:
+        - type: ExtensionRef
+          extensionRef:
+            group: traefik.io
+            kind: Middleware
+            name: heimdall
+      {{- end }}
+      backendRefs:
+        - name: whoami
+          port: 80
 {{- end }}

charts/lfx-platform/values.yaml

@@ -23,6 +23,12 @@ lfx:
   # local dev with authelia
   use_oidc_contextualizer: true
 
+  # Fallback gateway can be enabled if traefik.enabled is false.
+  parentGateway:
+    enabled: false
+    name: traefik
+    sectionName: websecure
+    namespace: default
 
 fga-operator:
   enabled: true