Commit 80aa6268 authored by Yann Garcia's avatar Yann Garcia
Browse files

Enahnce meep-dai HELM template for onboarded-demo port mapping on range 31120 to 31224

parent c84568b2

charts/meep-dai/templates/deployment.yaml

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,16 @@ spec: 
          ports:

            - containerPort: {{ .Values.deployment.port }}

              protocol: {{ .Values.deployment.protocol }}

            - containerPort: 31120

              protocol: TCP

            - containerPort: 31121

              protocol: TCP

            - containerPort: 31122

              protocol: TCP

            - containerPort: 31123

              protocol: TCP

            - containerPort: 31124

              protocol: TCP

          env:

            {{- range $key, $value := .Values.image.env }}

            - name: {{ $key }}

charts/meep-dai/templates/ingress.yaml

+2 −3
Original line number Diff line number Diff line 
{{- if .Values.ingress.enabled -}}

{{- $serviceName := .Values.service.name -}}

{{- $servicePort := .Values.service.port -}}

apiVersion: extensions/v1beta1

kind: Ingress

metadata:
@@ -23,10 +22,10 @@ spec: 
    - http:

        paths:

          {{- range $path := .paths }}

          - path: {{ $path }}

          - path: {{ $path.path }}

            backend:

              serviceName: {{ $serviceName }}

              servicePort: {{ $servicePort }}

              servicePort: {{ $path.port }}

          {{- end -}}

      {{- if .name }}

      host: {{ .name }}

charts/meep-dai/templates/service.yaml

+12 −0
Original line number Diff line number Diff line
@@ -20,6 +20,18 @@ spec: 
      {{- if .Values.service.nodePort }}

      nodePort: {{ .Values.service.nodePort }}

      {{- end }}

    - name: onboarded-demo0

      port: 31120

      targetPort: 31120

    - name: onboarded-demo1

      port: 31121

      targetPort: 31122

    - name: onboarded-demo2

      port: 31123

      targetPort: 31123

    - name: onboarded-demo4

      port: 31124

      targetPort: 31124

    {{- if .Values.prometheus.monitor.enabled}}

    - name: metrics

      port: {{ .Values.prometheus.monitor.port }}

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}}