Commit 28344bd9 authored by Yann Garcia's avatar Yann Garcia
Browse files

Push code before to move to Lab ETSI

parent 16b77179

charts/meep-dai/templates/deployment.yaml

+0 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ spec: 
      containers:

        - name: {{ .Chart.Name }}

          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

          {{- if .Values.codecov.enabled}}

          command: [ "/meep-dai" ]

          args: [ "-test.coverprofile=/codecov/codecov-meep-dai.out", "__DEVEL--code-cov" ]

          {{- end}}

          imagePullPolicy: {{ .Values.image.pullPolicy }}

          ports:

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

charts/meep-dai/templates/ingress.yaml

+8 −4
Original line number Diff line number Diff line 
{{- if .Values.ingress.enabled -}}

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

apiVersion: extensions/v1beta1

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

apiVersion: networking.k8s.io/v1

kind: Ingress

metadata:

  name: {{ $serviceName }}
@@ -22,10 +23,13 @@ spec: 
    - http:

        paths:

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

          - path: {{ $path.path }}

          - path: {{ $path }}

            pathType: ImplementationSpecific

            backend:

              serviceName: {{ $serviceName }}

              servicePort: {{ $path.port }}

              service:

                name: {{ $serviceName }}

                port:

                  number: {{ $servicePort }}

          {{- end -}}

      {{- if .name }}

      host: {{ .name }}

charts/meep-dai/values-template.yaml

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

      paths:

        {{- if .IsMepService }}

        - 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

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

        {{- else }}

        - 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

        - /{{.SandboxName}}/dev_app

        {{- end }}

  annotations:

    kubernetes.io/ingress.class: nginx
@@ -83,19 +61,9 @@ 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}}

examples/demo4-ue/README.md

+7 −9
Original line number Diff line number Diff line
@@ -42,15 +42,13 @@ By default, there is one onboarded MEC application named onboarded-demo4, descri 
                                    }

                                ],

                            "appCharcs":

                                [

								{

									"memory": 1024,

									"storage": 1024,

									"latency": 1024,

									"bandwidth": 1024,

									"serviceCont": 0

                                    }

                                ],

								},

                            "cmd": "/onboardedapp/onboarded-demo/onboarded-demo4",

                            "args":null

                        }

examples/demo4-ue/src/onboarded-demo/onboarded-demo-test1.json

+7 −9
Original line number Diff line number Diff line
@@ -40,15 +40,13 @@ 
                                    }

                                ],

                            "appCharcs":

                                [

                                {

                                    "memory": 2048,

                                    "storage": 2048,

                                    "latency": 2048,

                                    "bandwidth": 2048,

                                    "serviceCont": 1

                                    }

                                ],

                                },

                            "cmd": "uptime",

                            "args":null

                        }