Commit 7519a414 authored by Yann Garcia's avatar Yann Garcia
Browse files

Minor bugs fixed. Remove some FIXME

parent 1610498f

charts/meep-dai/templates/deployment.yaml

+6 −14
Original line number Diff line number Diff line
@@ -22,19 +22,15 @@ spec: 
        meepOrigin: {{ .Values.meepOrigin }}

    spec:

      serviceAccountName: {{ .Values.serviceAccount }}

      {{- if or (eq .Values.codecov.enabled true) (eq .Values.onboardedapp true) }}

      volumes:

      {{- end}}

        - name: onboardedapp-storage

          persistentVolumeClaim:

            claimName: meep-dai-onboardedapp-pvc

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

        - name: codecov-storage

          persistentVolumeClaim:

            claimName: meep-dai-codecov-pvc

      {{- end}}

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

        - name: onboardedapp-storage

          persistentVolumeClaim:

            claimName: meep-dai-onboardedapp-pvc

      {{- end}}

      containers:

        - name: {{ .Chart.Name }}

          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -51,17 +47,13 @@ spec: 
            - name: {{ $key }}

              value: {{ $value | quote }}

            {{- end }}

          {{- if or (eq .Values.codecov.enabled true) (eq .Values.onboardedapp true) }}

          volumeMounts:

          {{- end}}

          - name: onboardedapp-storage

            mountPath: /onboardedapp-vol

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

          - name: codecov-storage

            mountPath: /codecov

          {{- end}}

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

          - name: onboardedapp-storage

            mountPath: /onboardedapp

          {{- end}}

      terminationGracePeriodSeconds: 5

      initContainers:

        {{- range $value := .Values.deployment.dependencies.system }}

charts/meep-dai/templates/onboardedapp-pv.yaml

+0 −2
Original line number Diff line number Diff line 
{{- if .Values.onboardedapp.enabled}}

kind: PersistentVolume

apiVersion: v1

metadata:
@@ -32,4 +31,3 @@ spec: 
  resources:

    requests:

      storage: 100Mi
 
{{- end}}

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

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash



set -vx

#set -vx



function usage() {

    echo "Usage: $0 {--rebuild_dai}" >&2

go-apps/meep-dai/Dockerfile

+6 −1
Original line number Diff line number Diff line
@@ -14,14 +14,19 @@ 




FROM debian:9.6-slim



COPY ./meep-dai /meep-dai

COPY ./api /api

COPY ./user-api /user-api

COPY ./data /

COPY ./onboardedapp/ /onboardedapp



VOLUME /tmp/ /onboardedapp-vol



RUN chmod +x /entrypoint.sh



EXPOSE 31123/tcp

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends procps



EXPOSE 31120-31129/tcp



ENTRYPOINT ["/entrypoint.sh"]

go-apps/meepctl/cmd/deploy.go

+5 −5
Original line number Diff line number Diff line
@@ -206,9 +206,9 @@ func deployCore(cobraCmd *cobra.Command) { 
		}

		if deployData.onboardedapp && onboardedapp {

			coreFlags = utils.HelmFlags(coreFlags, "--set", "image.env.MEEP_ONBOARDEDAPP='true'")

			coreFlags = utils.HelmFlags(coreFlags, "--set", "image.env.MEEP_ONBOARDEDAPP_LOCATION="+deployData.workdir+"/onboardedapp/")

			coreFlags = utils.HelmFlags(coreFlags, "--set", "image.env.MEEP_ONBOARDEDAPP_LOCATION="+deployData.workdir+"/onboardedapp-vol/")

			coreFlags = utils.HelmFlags(coreFlags, "--set", "onboardedapp.enabled=true")

			coreFlags = utils.HelmFlags(coreFlags, "--set", "onboardedapp.location="+deployData.workdir+"/onboardedapp/"+app)

			coreFlags = utils.HelmFlags(coreFlags, "--set", "onboardedapp.location="+deployData.workdir+"/onboardedapp-vol/"+app)

		}

		if userFe {

			coreFlags = utils.HelmFlags(coreFlags, "--set", "user.frontend.enabled=true")
@@ -570,14 +570,14 @@ func deployCodeCovStorage(cobraCmd *cobra.Command) { 
func deployOnboardedAppStorage(cobraCmd *cobra.Command) {

	cmd := exec.Command("rm", "-rf", deployData.workdir+"/onboardedapp-bak")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

	cmd = exec.Command("mv", deployData.workdir+"/onboardedapp", deployData.workdir+"/onboardedapp-bak")

	cmd = exec.Command("mv", deployData.workdir+"/onboardedapp-vol", deployData.workdir+"/onboardedapp-bak")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

	cmd = exec.Command("mkdir", "-p", deployData.workdir+"/onboardedapp")

	cmd = exec.Command("mkdir", "-p", deployData.workdir+"/onboardedapp-vol")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)



	for _, app := range deployData.coreApps {

		if utils.RepoCfg.GetBool("repo.core.go-apps." + app + ".onboardedapp") {

			cmd = exec.Command("mkdir", "-p", deployData.workdir+"/onboardedapp/"+app)

			cmd = exec.Command("mkdir", "-p", deployData.workdir+"/onboardedapp-vol/"+app)

			_, _ = utils.ExecuteCmd(cmd, cobraCmd)

		}

	}