Updated Flow to support custom ingress annotations

boomerang-io · Feb 18, 2024 · 1590b77 · 1590b77
1 parent 5e7e588
commit 1590b77
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/bmrg-flow/Chart.yaml b/bmrg-flow/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bmrg-flow
 description: Boomerang Flow
 type: application
-version: 5.2.0
+version: 5.2.1
 appVersion: 4.0.0
 home: https://useboomerang.io
 dependencies:

diff --git a/bmrg-flow/templates/ingress-api.yaml b/bmrg-flow/templates/ingress-api.yaml
@@ -30,6 +30,9 @@ metadata:
     {{ $.Values.global.ingress.annotationsPrefix}}/limit-rpm: "300"
     {{ $.Values.global.ingress.annotationsPrefix}}/limit-connections: "10"
     {{ $.Values.global.ingress.annotationsPrefix}}/use-regex: "true"
+    {{- with .Values.global.ingress.annotations }}
+    {{ toYaml . | indent 4 }}
+    {{- end }}
 spec:
   ingressClassName: {{ $.Values.global.ingress.class}}
   rules:

diff --git a/bmrg-flow/templates/ingress-app-api.yaml b/bmrg-flow/templates/ingress-app-api.yaml
@@ -38,6 +38,9 @@ metadata:
     {{ $.Values.global.ingress.annotationsPrefix}}/limit-rpm: "300"
     {{ $.Values.global.ingress.annotationsPrefix}}/limit-connections: "10"
     {{ $.Values.global.ingress.annotationsPrefix}}/use-regex: "true"
+    {{- with .Values.global.ingress.annotations }}
+    {{ toYaml . | indent 4 }}
+    {{- end }}
 spec:
   ingressClassName: {{ $.Values.global.ingress.class}}
   rules:

diff --git a/bmrg-flow/templates/ingress-app.yaml b/bmrg-flow/templates/ingress-app.yaml
@@ -32,6 +32,9 @@ metadata:
     {{ $.Values.global.ingress.annotationsPrefix}}/app-root: "{{ default "" $.Values.global.ingress.root }}/{{ $tier }}/{{ $k }}"
     {{- end }}
     {{ $.Values.global.ingress.annotationsPrefix}}/client-max-body-size: 1m
+    {{- with .Values.global.ingress.annotations }}
+    {{ toYaml . | indent 4 }}
+    {{- end }}
 spec:
   ingressClassName: {{ $.Values.global.ingress.class}}
   rules:

diff --git a/bmrg-flow/values.yaml b/bmrg-flow/values.yaml
@@ -127,6 +127,8 @@ global:
     class: "nginx"
     # Enable appRoot if you wish the 'app-root' i.e. '/' ingress annotation to redirect to the flow app
     enableAppRoot: false
+    # Allowance for extra custom ingress annotations
+    annotations: {}
   auth:
     enabled: false
     mode: basic
@@ -172,19 +174,21 @@ oauth2proxy:
   fullnameOverride: flow-auth-proxy
   extraArgs:
     custom-templates-dir: /custom/templates
-    basic-auth-password: $(UPSTREAM_AUTH_PASSWORD)
     cookie-path: /dev
     cookie-secure: "true"
-    http-address: 0.0.0.0:4180
-    pass-basic-auth: "true"
     proxy-prefix: /dev/oauth
     redirect-url: /dev/oauth/callback
-    set-basic-auth: "true"
     skip-provider-button: "false"
     upstream: file:///dev/null
-  extraEnv:
-  - name: UPSTREAM_AUTH_PASSWORD
-    value: coronet-cottage-nave-idiom-resume
+    http-address: 0.0.0.0:4180
+    # Uncomment if basic auth is enabled
+    # basic-auth-password: $(UPSTREAM_AUTH_PASSWORD)
+    # pass-basic-auth: "true"
+    # set-basic-auth: "true"
+  # Uncomment if basic auth is enabled and remove empty array
+  extraEnv: []
+  #- name: UPSTREAM_AUTH_PASSWORD
+  #  value: coronet-cottage-nave-idiom-resume
   ingress:
     annotations:
       kubernetes.io/ingress.class: nginx