[Update] Nginx-Traefik compatibility

charts/tooljet/templates/_helpers.tpl

@@ -124,15 +124,19 @@ Return the PostgreSQL Secret Name
 {{- end }}
 
 {{/*
-Return the appropriate apiVersion for ingress.
+Returns the correct ingress class name based on selected controller.
 */}}
-{{- define "tooljet.ingress.apiVersion" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "extensions/v1beta1" -}}
-{{- else -}}
-{{- print "networking.k8s.io/v1" -}}
-{{- end -}}
-{{- end -}}
+{{- define "tooljet.ingressClassName" -}}
+{{- if .Values.ingress.ingressClassName }}
+{{ .Values.ingress.ingressClassName }}
+{{- else if eq .Values.ingress.type "nginx" }}
+nginx
+{{- else if eq .Values.ingress.type "traefik" }}
+traefik
+{{- else }}
+nginx
+{{- end }}
+{{- end }}
 
 {{/*
 Return the appropriate apiVersion for autoscaling.

charts/tooljet/templates/deployment-pgrst.yml

@@ -33,14 +33,12 @@ spec:
             {{- if .Values.tooljetdb_external_postgresql.enabled }}
             - name: PGRST_DB_URI
               value: {{ .Values.tooljetdb_external_postgresql.PGRST_DB_URI }}
-            - name: PGRST_DB_PRE_CONFIG
-              value: postgrest.pre_config
             {{- else }}
-            - name: PGRST_DB_PRE_CONFIG
-              value: postgrest.pre_config
             - name: PGRST_DB_URI
               value: {{ .Values.env.PGRST_DB_URI }}
             {{- end }}
+            - name: PGRST_DB_PRE_CONFIG
+              value: postgrest.pre_config
             - name: PGRST_DB_ANON_ROLE
               value: postgres
             - name: PGRST_JWT_SECRET

charts/tooljet/templates/ingress.yaml

@@ -0,0 +1,27 @@
+{{- if .Values.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "tooljet.fullname" . }}-{{ .Values.ingress.type }}
+  labels:
+    {{- include "tooljet.labels" . | nindent 4 }}
+  annotations:
+    {{- toYaml (index .Values.ingress .Values.ingress.type).annotations | nindent 4 }}
+spec:
+  ingressClassName: {{ (index .Values.ingress .Values.ingress.type).ingressClassName }}
+  rules:
+    - host: {{ (index .Values.ingress .Values.ingress.type).hostname }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ include "tooljet.fullname" . }}
+                port:
+                  number: {{ .Values.apps.tooljet.service.port }}
+  {{- with (index .Values.ingress .Values.ingress.type).tls }}
+  tls:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}

charts/tooljet/templates/secret.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.apps.tooljet.secret.name }}
+  name: {{ .Values.apps.tooljet.secret.name | default "tooljet-server" }}
   labels:
     {{- include "tooljet.labels" . | nindent 4 }}
     {{- include "tooljet.selectorLabels" . | nindent 4 }}

charts/tooljet/values.yaml

@@ -95,6 +95,7 @@ postgrest:
 
 redis:
   enabled: false
+  architecture: standalone # Use in case multiple tooljet pods running
   fullnameOverride: redis
   auth:
     enabled: true
@@ -116,6 +117,18 @@ autoscaling:
 
 ingress:
   enabled: false
-  hostname: tooljet.localhost
-  ingressClassName: 'nginx'
-  tls: []
+  type: nginx   # traefik
+
+  traefik:
+    hostname: tooljet.localhost
+    ingressClassName: traefik
+    tls: []
+    annotations:
+      traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
+
+  nginx:
+    hostname: tooljet.localhost
+    ingressClassName: nginx
+    tls: []
+    annotations:
+      nginx.ingress.kubernetes.io/rewrite-target: /