Merge pull request #47 from boomerang-io/feat-276-app-root

Added enableAppRoot to values and appropriate implementation in the a…
boomerang-io · Oct 26, 2021 · 9175f87 · 9175f87
2 parents ed02c09 + 631005a
commit 9175f87
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/bmrg-flow/Chart.yaml b/bmrg-flow/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: bmrg-flow
 description: Boomerang Flow
 type: application
-version: 4.10.17
-appVersion: 3.4.0
+version: 4.10.18
+appVersion: 3.4.1
 home: https://useboomerang.io
 dependencies:
   - name: bmrg-common

diff --git a/bmrg-flow/README.md b/bmrg-flow/README.md
@@ -102,6 +102,7 @@ The following table lists the configurable parameters of the chart and their def
 | `ingress.tlsSecretName` | If there is an associated TLS secret | `bmrg-tls-cloud` |
 | `ingress.annotationsPrefix` | The prefix for the annotations inside the ingress definition. Typically for IKS Community Ingress you need to set it to `nginx.ingress.kubernetes.io` | `ingress.kubernetes.io` |
 | `ingress.class` | The class of the ingress, it is used to mark the ingress resources to be picked-up by a specific controller. For IKS Community Ingress set it to `public-iks-k8s-nginx` | `nginx` |
+| `ingress.enableAppRoot` | If enabled it sets the `app-root` ingress annotation to the ingress.root provided value, in order to redirect to the flow app | `false` |
 
 ### Auth Configuration
 

diff --git a/bmrg-flow/templates/ingress-app.yaml b/bmrg-flow/templates/ingress-app.yaml
@@ -29,6 +29,9 @@ metadata:
       {{- include "bmrg.ingress.config.auth_proxy_user_email" $ | nindent 6 }}
     {{- end }}
     {{ $.Values.global.ingress.annotationsPrefix}}/ssl-redirect: "true"
+    {{- if eq $.Values.global.ingress.enableAppRoot true }}
+    {{ $.Values.global.ingress.annotationsPrefix}}/app-root: "{{ default "" $.Values.global.ingress.root }}/{{ $tier }}/{{ $k }}"
+    {{- end }}
     {{ $.Values.global.ingress.annotationsPrefix}}/client-max-body-size: 1m
     kubernetes.io/ingress.class: {{ $.Values.global.ingress.class}}
 spec:

diff --git a/bmrg-flow/values.yaml b/bmrg-flow/values.yaml
@@ -120,6 +120,8 @@ global:
     # The class of the ingress, it is used to mark the ingress resources to be picked-up by a specific
     # controller. For IKS Community Ingress set it to "public-iks-k8s-nginx"
     class: "nginx"
+    # Enable appRoot if you wish the 'app-root' i.e. '/' ingress annotation to redirect to the flow app
+    enableAppRoot: false
   auth:
     enabled: false
     mode: basic