Commit 27634d8b authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

Merge branch 'STF_685' into 'STF_685_MEC_IPE' 

Merge request From STF_685 into STF_685_MEC_IPE

See merge request !20
parents a8895d98 a79cc4fb

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -16,3 +16,5 @@ config/secrets.yaml 
.meepctl-repocfg.yaml

config/api/

charts/grafana/dashboards/mec-sandbox.json

deploy/pyinfra/.env

deploy/pyinfra/pyinfra-venv/
 
 No newline at end of file

.gitmodules

+1 −1
Original line number Diff line number Diff line 
[submodule "etsi-mec-sandbox-frontend"]

	path = etsi-mec-sandbox-frontend

	url = https://labs.etsi.org/rep/mec/etsi-mec-sandbox-frontend.git

	branch = STF678_Task4
 
	branch = STF_685

charts/mec-services/meep-ams/values-template.yaml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ ingress: 
      rewrite ^/{{.SandboxName}}/amsi(/|$)(.*)$ /amsi/$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

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

    nginx.ingress.kubernetes.io/auth-url: {{ if .HttpsOnly }}https{{ else }}http{{ end }}://$http_host/auth/v1/authenticate?svc=meep-ams&sbox={{.SandboxName}}&mep={{.LocationName}}

    {{- end }}

  labels: {}

  tls:

charts/mec-services/meep-app-enablement/values-template.yaml

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ ingress: 
      rewrite ^/{{ .SandboxName }}/eees-easdiscovery(/|$)(.*)$ /eees-easdiscovery/$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

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

    nginx.ingress.kubernetes.io/auth-url: {{ if .HttpsOnly }}https{{ else }}http{{ end }}://$http_host/auth/v1/authenticate?svc=meep-app-enablement&sbox={{.SandboxName}}&mep={{.LocationName}}

    {{- end }}

  labels: {}

  tls:

charts/mec-services/meep-dai/values-template.yaml

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ ingress: 
      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={{.LocationName}}

    nginx.ingress.kubernetes.io/auth-url: {{ if .HttpsOnly }}https{{ else }}http{{ end }}://$http_host/auth/v1/authenticate?svc=meep-dai&sbox={{.SandboxName}}&mep={{.LocationName}}

    {{- end }}

  labels: {}

  tls: