Commit 7c092b27 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF678_Task_5_TTF_T043' of... 

Merge branch 'STF678_Task_5_TTF_T043' of https://labs.etsi.org/rep/mec/etsi-mec-sandbox into STF678_Task_5_TTF_T043
parents 4f885ffe 43648ecc

charts/meep-acme-in-cse/values-template.yaml

+5 −2
Original line number Diff line number Diff line
@@ -49,10 +49,13 @@ image: 
    {{- end}}



service:

  {{- if .IsMepService }}

  name: {{.MepName}}-meep-acme-in-cse

  {{- else }}

  name: meep-acme-in-cse

  type: NodePort

  {{- end }}

  type: ClusterIP

  port: 80

  NodePort: ""



ingress:

  enabled: true

charts/meep-acme-mn-cse/values-template.yaml

+5 −2
Original line number Diff line number Diff line
@@ -53,10 +53,13 @@ image: 
    {{- end}}



service:

  {{- if .IsMepService }}

  name: {{.MepName}}-meep-acme-mn-cse

  {{- else }}

  name: meep-acme-mn-cse

  type: NodePort

  {{- end }}

  type: ClusterIP

  port: 80

  NodePort: ""



ingress:

  enabled: true

charts/meep-mosquitto/values-template.yaml

+5 −4
Original line number Diff line number Diff line
@@ -37,12 +37,13 @@ image: 
    {{- end}}



service:

  {{- if .IsMepService }}

  name: {{.MepName}}-meep-mosquitto

  {{- else }}

  name: meep-mosquitto

  # type: ClusterIP

  # port: 80

  type: NodePort

  {{- end }}

  type: ClusterIP

  port: 1883

  NodePort: ""



ingress:

  enabled: true

charts/meep-tinyiot-in-cse/values-template.yaml

+7 −5
Original line number Diff line number Diff line
@@ -50,11 +50,13 @@ image: 
    {{- end}}



service:

  {{- if .IsMepService }}

  name: {{.MepName}}-meep-tinyiot-in-cse

  {{- else }}

  name: meep-tinyiot-in-cse

  type: NodePort

  {{- end }}

  type: ClusterIP

  port: 3002

  NodePort: ""



ingress:

  enabled: true

  hosts:
@@ -70,10 +72,10 @@ ingress: 
    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    {{- if .IsMepService }}

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

      rewrite ^/{{.SandboxName}}/{{.MepName}}/tinyiot-in-cse(/|$)(.*)$ /tinyiot-in-cse/$2 break;

      rewrite ^/{{.SandboxName}}/{{.MepName}}/tinyiot-in-cse(/|$)(.*)$ /$2 break;

    {{- else }}

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

      rewrite ^/{{.SandboxName}}/tinyiot-in-cse(/|$)(.*)$ /tinyiot-in-cse/$2 break;

      rewrite ^/{{.SandboxName}}/tinyiot-in-cse(/|$)(.*)$ /$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

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

charts/meep-tinyiot-mn-cse/values-template.yaml

+7 −5
Original line number Diff line number Diff line
@@ -38,11 +38,13 @@ image: 
    {{- end}}



service:

  {{- if .IsMepService }}

  name: {{.MepName}}-meep-tinyiot-mn-cse

  {{- else }}

  name: meep-tinyiot-mn-cse

  type: NodePort

  {{- end }}

  type: ClusterIP

  port: 3005

  NodePort: ""



ingress:

  enabled: true

  hosts:
@@ -58,10 +60,10 @@ ingress: 
    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    {{- if .IsMepService }}

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

      rewrite ^/{{.SandboxName}}/{{.MepName}}/tinyiot-mn-cse(/|$)(.*)$ /tinyiot-mn-cse/$2 break;

      rewrite ^/{{.SandboxName}}/{{.MepName}}/tinyiot-mn-cse(/|$)(.*)$ /$2 break;

    {{- else }}

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

      rewrite ^/{{.SandboxName}}/tinyiot-mn-cse(/|$)(.*)$ /tinyiot-mn-cse/$2 break;

      rewrite ^/{{.SandboxName}}/tinyiot-mn-cse(/|$)(.*)$ /$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

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