Commit 668f9fa3 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in meep-dai charts

parent 28344bd9

charts/meep-dai/values-template.yaml

+34 −2
Original line number Diff line number Diff line
@@ -49,9 +49,31 @@ ingress: 
    - name: ''

      paths:

        {{- if .IsMepService }}

        - /{{.SandboxName}}/{{.MepName}}/dev_app

        - path: /{{.SandboxName}}/{{.MepName}}/dev_app

          port: 80

        - path: /{{.SandboxName}}/{{.MepName}}/onboarded-demo0

          port: 31120

        - path: /{{.SandboxName}}/{{.MepName}}/onboarded-demo1

          port: 31121

        - path: /{{.SandboxName}}/{{.MepName}}/onboarded-demo2

          port: 31122

        - path: /{{.SandboxName}}/{{.MepName}}/onboarded-demo3

          port: 31123

        - path: /{{.SandboxName}}/{{.MepName}}/onboarded-demo4

          port: 31124

        {{- else }}

        - /{{.SandboxName}}/dev_app

        - path: /{{.SandboxName}}/dev_app

          port: 80

        - path: /{{.SandboxName}}/onboarded-demo0

          port: 31120

        - path: /{{.SandboxName}}/onboarded-demo1

          port: 31121

        - path: /{{.SandboxName}}/onboarded-demo2

          port: 31122

        - path: /{{.SandboxName}}/onboarded-demo3

          port: 31123

        - path: /{{.SandboxName}}/onboarded-demo4

          port: 31124

        {{- end }}

  annotations:

    kubernetes.io/ingress.class: nginx
@@ -61,9 +83,19 @@ ingress: 
    {{- if .IsMepService }}

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{.SandboxName}}/{{.MepName}}/dev_app(/|$)(.*)$ /dev_app/$2 break;

      rewrite ^/{{.SandboxName}}/{{.MepName}}/onboarded-demo0(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/{{.MepName}}/onboarded-demo1(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/{{.MepName}}/onboarded-demo2(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/{{.MepName}}/onboarded-demo3(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/{{.MepName}}/onboarded-demo4(/|$)(.*)$ /$2 break;

    {{- else }}

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{.SandboxName}}/dev_app(/|$)(.*)$ /dev_app/$2 break;

      rewrite ^/{{.SandboxName}}/onboarded-demo0(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/onboarded-demo1(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/onboarded-demo2(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/onboarded-demo3(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/onboarded-demo4(/|$)(.*)$ /$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-dai&sbox={{.SandboxName}}&mep={{.MepName}}