Commit f5137dca authored by Yann Garcia's avatar Yann Garcia
Browse files

Align MEC 016

parent f8495149

charts/meep-dai/templates/deployment.yaml

+5 −5
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
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/values-template.yaml

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ codecov: 
  location: "<WORKDIR>/codecov/meep-dai"



onboardedapp:

  enabled: true

  enabled: false

  location: "<WORKDIR>/onboardedapp"



meepOrigin: core

examples/demo4-ue/build-demo4-ue.sh

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ if [ -d $MEEPDAI_ONBOARDEDAPP_PATH ]; then 
fi

mkdir -p $MEEPDAI_ONBOARDEDAPP_PATH

cp -Rp $DEMOBIN $MEEPDAI_ONBOARDEDAPP_PATH

cp  $BASEDIR/src/onboarded-demo/onboarded-demo4.json $MEEPDAI_ONBOARDEDAPP_PATH



if [ "$REBUILD_DAI" != "" ]; then

    echo ">>> Building DAI micro-service"

examples/demo4-ue/src/onboarded-demo/go.sum

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= 
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=

github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=

github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE=

github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=

github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c=

github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg=

github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=

github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=

github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=

github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=

github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=

github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=