Commit ade518fc authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

split meep-swagger-ui into platform & sandbox swagger-ui + fixed helm chart env vars

parent eb497029

.meepctl-repocfg.yaml

+15 −5
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



version: 1.4.2

version: 1.4.3

repo:

  name: AdvantEDGE
@@ -31,6 +31,7 @@ repo: 
          - -mod=vendor

        codecov: true

        lint: true

        api: go-apps/meep-mon-engine/api/swagger.yaml

      meep-platform-ctrl:

        src: go-apps/meep-platform-ctrl

        bin: bin/meep-platform-ctrl
@@ -39,8 +40,8 @@ repo: 
        lint: true

        api: go-apps/meep-platform-ctrl/api/swagger.yaml

        docker-data:

          api: bin/meep-swagger-ui

          static: bin/meep-frontend

          swagger: bin/meep-platform-swagger-ui

          frontend: bin/meep-frontend

      meep-virt-engine:

        src: go-apps/meep-virt-engine

        bin: bin/meep-virt-engine
@@ -75,12 +76,18 @@ repo: 
          meep-platform-ctrl-api: js-packages/meep-platform-ctrl-client

          meep-sandbox-ctrl-api: js-packages/meep-sandbox-ctrl-client

          meep-mon-engine-api: js-packages/meep-mon-engine-client

      meep-swagger-ui:

      meep-platform-swagger-ui:

        src: js-apps/meep-swagger-ui

        bin: bin/meep-swagger-ui

        bin: bin/meep-platform-swagger-ui

        lint: false

        api-bundle:

          - core.go-apps.meep-platform-ctrl

          - core.go-apps.meep-mon-engine

      meep-sandbox-swagger-ui:

        src: js-apps/meep-swagger-ui

        bin: bin/meep-sandbox-swagger-ui

        lint: false

        api-bundle:

          - sandbox.go-apps.meep-sandbox-ctrl

          - sandbox.go-apps.meep-loc-serv

          - packages.go-packages.meep-loc-serv-notification-client
@@ -139,6 +146,9 @@ repo: 
        codecov: false

        lint: true

        api: go-apps/meep-sandbox-ctrl/api/swagger.yaml

        docker-data:

          'entrypoint.sh': go-apps/meep-sandbox-ctrl/entrypoint.sh

          swagger: bin/meep-sandbox-swagger-ui

      meep-tc-engine:

        src: go-apps/meep-tc-engine

        bin: bin/meep-tc-engine

charts/meep-loc-serv/templates/deployment.yaml

+4 −4
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ spec: 
            - containerPort: {{ .Values.deployment.port }}

              protocol: {{ .Values.deployment.protocol }}

          env:

            - name: MEEP_SANDBOX_NAME

              value: {{ .Values.image.env.sandboxName }}

            - name: MEEP_LOC_SERV_ROOT_URL

              value: {{ .Values.image.env.rooturl }}

            {{- range $key, $value := .Values.image.env }}

            - name: {{ $key }}

              value: {{ $value }}

            {{- end }}

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

          volumeMounts:

          - name: codecov-storage

charts/meep-loc-serv/values-template.yaml

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ image: 
  tag: latest

  pullPolicy: Always

  env:

    sandboxName: {{ .SandboxName }}

    rooturl: {{ .RootUrl }}

    MEEP_SANDBOX_NAME: {{ .SandboxName }}

    MEEP_HOST_URL: {{ .HostUrl }}



service:

  name: meep-loc-serv
@@ -29,7 +29,7 @@ ingress: 
  hosts:

    - name: ''

      paths:

        - /({{ .SandboxName }}/|)location

        - /{{ .SandboxName }}/location



  annotations:

    # kubernetes.io/ingress.class: nginx

charts/meep-metrics-engine/templates/deployment.yaml

+4 −4
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ spec: 
            - containerPort: {{ .Values.deployment.port }}

              protocol: {{ .Values.deployment.protocol }}

          env:

            - name: MEEP_SANDBOX_NAME

              value: {{ .Values.image.env.sandboxName }}

            - name: MEEP_METRICS_ROOT_URL

              value: {{ .Values.image.env.rooturl }}

            {{- range $key, $value := .Values.image.env }}

            - name: {{ $key }}

              value: {{ $value }}

            {{- end }}

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

          volumeMounts:

          - name: codecov-storage

charts/meep-metrics-engine/values-template.yaml

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ image: 
  tag: latest

  pullPolicy: Always

  env:

    sandboxName: {{ .SandboxName }}

    rooturl: "http://www.example.com"

    MEEP_SANDBOX_NAME: {{ .SandboxName }}

    MEEP_HOST_URL: {{ .HostUrl }}



service:

  name: meep-metrics-engine
@@ -29,7 +29,7 @@ ingress: 
  hosts:

    - name: ''

      paths:

        - /({{ .SandboxName }}/|)metrics

        - /{{ .SandboxName }}/metrics



  annotations:

    # kubernetes.io/ingress.class: nginx