Unverified Commit 210b2afb authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #123 from InterDigitalInc/stf-beta 

Merge 'stf-beta' feature branch to 'develop'
parents 7373e6d9 dd6f6007

.meepctl-repocfg.yaml

+9 −20
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.5.0

version: 1.5.2

repo:

  name: AdvantEDGE
@@ -20,11 +20,6 @@ repo: 
  #  Deployment

  #------------------------------

  deployment:

    # enable the alternate HTTP server

    #   - serves AdvantEDGE FE on alternate port 8080 instead of default 80/443

    #   - useful in conjunction with user.frontend=true &&

    #     when limiting endpoints exposed on public network

    alt-server: false

    # user supplied resources

    user:

      # user supplied frontend UI located @ .meep/user/frontend
@@ -75,7 +70,7 @@ repo: 
          - meep-open-map-tiles

          - meep-postgis

          - meep-redis

        # list of paltform pods to monitor

        # list of platform pods to monitor

        core-pods:

          - meep-mon-engine

          - meep-platform-ctrl
@@ -117,6 +112,8 @@ repo: 
          swagger: bin/meep-platform-swagger-ui

          # location of AdvantEDGE frontend

          frontend: bin/meep-frontend

          # location of REST API permissions file

          'permissions.yaml': config/permissions.yaml

      meep-virt-engine:

        # location of source code

        src: go-apps/meep-virt-engine
@@ -497,19 +494,6 @@ repo: 
      chart: charts/nginx-ingress

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-ingress.yaml

    meep-alt-ingress:

      # enable meepctl build -> deps are never built

      build: false

      # enable meepctl dockerize -> deps are never dockerized

      dockerize: false

      # enable meepctl deploy/delete

      deploy: true

      # location of deployment chart

      chart: charts/nginx-ingress

      # uses different default values

      values: charts/nginx-ingress/alt-values.yaml

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-alt-ingress.yaml

    meep-redis:

      # enable meepctl build -> deps are never built

      build: false
@@ -669,6 +653,11 @@ repo: 
        src: go-packages/meep-sandbox-store

        # supports linting

        lint: true

      meep-sessions:

        # location of source code

        src: go-packages/meep-sessions

        # supports linting

        lint: true

      meep-watchdog:

        # location of source code

        src: go-packages/meep-watchdog

charts/grafana/templates/alt-ingress.yaml

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
{{- if .Values.altIngress.enabled -}}

{{- $fullName := include "grafana.fullname" . -}}

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

{{- $ingressPath := .Values.altIngress.path -}}

{{- $extraPaths := .Values.altIngress.extraPaths -}}

apiVersion: extensions/v1beta1

kind: Ingress

metadata:

  name: {{ $fullName }}-alt

  namespace: {{ template "grafana.namespace" . }}

  labels:

    app: {{ template "grafana.name" . }}

    chart: {{ template "grafana.chart" . }}

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

{{- if .Values.altIngress.labels }}

{{ toYaml .Values.altIngress.labels | indent 4 }}

{{- end }}

{{- with .Values.altIngress.annotations }}

  annotations:

{{ toYaml . | indent 4 }}

{{- end }}

spec:

{{- if .Values.altIngress.tls }}

  tls:

{{ toYaml .Values.altIngress.tls | indent 4 }}

{{- end }}

  rules:

  {{- range $host := .Values.altIngress.hosts }}

    - http:

        paths:

{{ if $extraPaths }}

{{ toYaml $extraPaths | indent 10 }}

{{- end }}

          - path: {{ $ingressPath }}

            backend:

              serviceName: {{ $fullName }}

              servicePort: {{ $servicePort }}

      {{- if $host }}

      host: {{ $host }}

      {{- end }}

  {{- end }}

{{- end }}

charts/grafana/values.yaml

+0 −21
Original line number Diff line number Diff line
@@ -140,27 +140,6 @@ ingress: 
  #    hosts:

  #      - chart-example.local



altIngress:

  enabled: false

  annotations:

    nginx.ingress.kubernetes.io/rewrite-target: /$2

    kubernetes.io/ingress.class: alt-nginx

    # kubernetes.io/tls-acme: "true"

  labels: {}

  path: /grafana(/|$)(.*)

  hosts:

    - ''

  ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services.

  extraPaths: []

  # - path: /*

  #   backend:

  #     serviceName: ssl-redirect

  #     servicePort: use-annotation

  tls: []

  #  - secretName: chart-example-tls

  #    hosts:

  #      - chart-example.local



resources: {}

#  limits:

#    cpu: 100m

charts/meep-gis-engine/templates/alt-ingress.yaml

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
{{- if .Values.altIngress.enabled -}}

{{- $serviceName := include "meep-gis-engine.fullname" . -}}

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

{{- $path := .Values.altIngress.path -}}

apiVersion: extensions/v1beta1

kind: Ingress

metadata:

  name: {{ template "meep-gis-engine.fullname" . }}-alt

  labels:

    app: {{ template "meep-gis-engine.name" . }}

    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

{{- if .Values.altIngress.labels }}

{{ toYaml .Values.altIngress.labels | indent 4 }}

{{- end }}

  annotations:

    {{- range $key, $value := .Values.altIngress.annotations }}

      {{ $key }}: {{ $value | quote }}

    {{- end }}

spec:

  rules:

    {{- range .Values.altIngress.hosts }}

    - http:

        paths:

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

          - path: {{ $path }}

            backend:

              serviceName: {{ $serviceName }}

              servicePort: {{ $servicePort }}

          {{- end -}}

      {{- if .name }}

      host: {{ .name }}

      {{- end }}

    {{- end -}}

  {{- if .Values.altIngress.tls }}

  tls:

{{ toYaml .Values.altIngress.tls | indent 4 }}

  {{- end -}}

{{- end -}}

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

+1 −20
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ image: 
  pullPolicy: Always

  env:

    MEEP_SANDBOX_NAME: {{ .SandboxName }}

    MEEP_SESSION_KEY: "my-secret-key"



service:

  name: meep-gis-engine
@@ -42,26 +43,6 @@ ingress: 
    #   hosts:

    #     - chart-example.local



altIngress:

  enabled: {{ .AltServer }}

  # Used to create an Ingress record.

  hosts:

    - name: ''

      paths:

        - /{{ .SandboxName }}/gis

  annotations:

    kubernetes.io/ingress.class: alt-nginx

    # kubernetes.io/tls-acme: "true"

    # nginx.ingress.kubernetes.io/rewrite-target: /$2

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

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

  labels: {}

  tls:

    # Secrets must be manually created in the namespace.

    # - secretName: chart-example-tls

    #   hosts:

    #     - chart-example.local



codecov:

  enabled: false