Closing of STF 678

Yann Garciarequested to merge
STF678_Task_5_TTF_T043 into master

Closing STF 678, move work to master branch

Merge request reports

.vscode/settings.json

deleted100644 → 0
+0 −23
Changes for .vscode/settings.json: 0 added lines, 23 removed lines.
Original line number Diff line number Diff line 
{

    "files.eol": "\n",

    "go.formatTool": "goimports",

    "go.lintTool": "golangci-lint",

    "go.lintFlags": [

        "--fast"

    ],

    // "go.useLanguageServer": false,

    "go.testOnSave": true,

    "[go]": {

        "editor.snippetSuggestions": "none",

        "editor.formatOnSave": true,

        "editor.codeActionsOnSave": {

            "source.organizeImports": true

        },

    },

    "[javascript]": {

        "editor.codeActionsOnSave": {

            "source.fixAll.eslint": true,

        },

    },

    "eslint.format.enable": true

}

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

+26 −1
Changes for charts/meep-app-enablement/values-template.yaml: 26 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ image: 
  env:

    MEEP_INSTANCE_ID: {{.InstanceId}}

    MEEP_SANDBOX_NAME: {{.SandboxName}}

    MEEP_SVC_PATH: /mec_app_support/v1

    MEEP_SVC_PATH: /mec_app_support/v2

    MEEP_HOST_URL: {{.HostUrl}}

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}
@@ -46,9 +46,22 @@ ingress: 
        {{- if .IsMepService }}

        - /{{.SandboxName}}/{{.MepName}}/mec_app_support

        - /{{.SandboxName}}/{{.MepName}}/mec_service_mgmt

        - /{{.SandboxName}}/{{.MepName}}/service-apis

        - /{{.SandboxName}}/{{.MepName}}/published-apis

        - /{{.SandboxName}}/{{.MepName}}/capif-events

        - /{{.SandboxName}}/{{.MepName}}/eecs-serviceprovisioning

        - /{{.SandboxName}}/{{.MepName}}/eees-eecregistration

        - /{{.SandboxName}}/{{.MepName}}/eees-easdiscovery

        

        {{- else }}

        - /{{.SandboxName}}/mec_app_support

        - /{{.SandboxName}}/mec_service_mgmt

        - /{{.SandboxName}}/service-apis

        - /{{.SandboxName}}/published-apis

        - /{{.SandboxName}}/capif-events

        - /{{.SandboxName}}/eecs-serviceprovisioning

        - /{{.SandboxName}}/eees-eecregistration

        - /{{.SandboxName}}/eees-easdiscovery

        {{- end }}

  annotations:

    kubernetes.io/ingress.class: nginx
@@ -57,10 +70,22 @@ ingress: 
    nginx.ingress.kubernetes.io/configuration-snippet: |

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

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

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

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

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

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

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

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

    {{- else }}

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

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

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

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

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

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

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

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

      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={{.MepName}}

charts/meep-dai/templates/deployment.yaml

+4 −4
Changes for charts/meep-dai/templates/deployment.yaml: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ spec: 
    spec:

      serviceAccountName: {{ .Values.serviceAccount }}

      volumes:

      {{- if .Values.onboardedapp.enabled}}

        - name: onboardedapp-storage

          persistentVolumeClaim:

            claimName: meep-dai-onboardedapp-pvc

      {{- end}}

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

        - name: codecov-storage

          persistentVolumeClaim:
@@ -34,10 +36,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 }}
@@ -58,8 +56,10 @@ spec: 
              value: {{ $value | quote }}

            {{- end }}

          volumeMounts:

          {{- if .Values.onboardedapp.enabled}}

          - name: onboardedapp-storage

            mountPath: /onboardedapp-vol

          {{- end}}

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

          - name: codecov-storage

            mountPath: /codecov

charts/meep-dai/templates/ingress.yaml

+7 −3
Changes for charts/meep-dai/templates/ingress.yaml: 7 added lines, 3 removed lines.
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 }}
@@ -23,9 +24,12 @@ spec: 
        paths:

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

          - 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/templates/onboardedapp-pv.yaml

+14 −15
Changes for charts/meep-dai/templates/onboardedapp-pv.yaml: 14 added lines, 15 removed lines.
Original line number Diff line number Diff line 
{{- if .Values.onboardedapp.enabled}}

kind: PersistentVolume

apiVersion: v1

metadata:

  name: meep-dai-onboardedapp-pv

spec:

  storageClassName: meep-dai-onboardedapp-sc

  storageClassName: nfs

  volumeMode: Filesystem

  capacity:

    storage: 100Mi

  accessModes:

    - ReadWriteOnce

  persistentVolumeReclaimPolicy: Retain

  hostPath:

    path: {{ .Values.onboardedapp.location }}



---

kind: StorageClass

apiVersion: storage.k8s.io/v1

metadata:

  name: meep-dai-onboardedapp-sc

provisioner: kubernetes.io/no-provisioner

volumeBindingMode: WaitForFirstConsumer

    - ReadWriteMany

  persistentVolumeReclaimPolicy: Recycle

  mopuntOptions:

    - hard

    - nfsvers=4.1

  nfs:

    server: 172.29.10.52

    path: /mnt/nfs/mec_sandbox

---

kind: PersistentVolumeClaim

apiVersion: v1

metadata:

  name: meep-dai-onboardedapp-pvc

spec:

  storageClassName: meep-dai-onboardedapp-sc

  storageClassName: nfs

  accessModes:

    - ReadWriteOnce

    - ReadWriteMany

  resources:

    requests:

      storage: 100Mi

{{- end}}