Unverified Commit cffda093 authored by watucker's avatar watucker Committed by GitHub
Browse files

Merge pull request #173 from ESGF/ingress-update 

Update ingress path definitions
parents ed3f0e72 21852cc7

deploy/kubernetes/chart/templates/ingress/ingress.yaml

+22 −8
Original line number Diff line number Diff line
@@ -22,15 +22,21 @@ spec: 
          {{- if .Values.data.enabled }}

          {{- if .Values.data.thredds.enabled }}

          - path: /thredds

            pathType: Prefix

            backend:

              serviceName: {{ include "esgf.component.fullname" (list . "thredds") }}

              servicePort: 8080

              service:

                name: {{ include "esgf.component.fullname" (list . "thredds") }}

                port:

                  number: 8080

          {{- end }}

          {{- if .Values.data.fileServer.enabled }}

          - path: /thredds/fileServer

            pathType: Prefix

            backend:

              serviceName: {{ include "esgf.component.fullname" (list . "fileServer") }}

              servicePort: 8080

              service:

                name: {{ include "esgf.component.fullname" (list . "fileServer") }}

                port:

                  number: 8080

          {{- end }}

          {{- end }}

          {{- if .Values.index.enabled }}
@@ -39,19 +45,27 @@ spec: 
          # However wildcard paths are not supported on all ingress controllers

          # So we make a path definition for each core

          - path: /solr/aggregations/replication

            pathType: Prefix

            backend: &solr

              # We point to the Solr slave

              serviceName: {{ include "esgf.component.fullname" (list . "solr" "slave") }}

              servicePort: 8983

              service:

                name: {{ include "esgf.component.fullname" (list . "solr" "slave") }}

                port:

                  number: 8983

          - path: /solr/datasets/replication

            pathType: Prefix

            backend: *solr

          - path: /solr/files/replication

            pathType: Prefix

            backend: *solr

          {{- end }}

          {{- if .Values.index.search.enabled }}

          - path: /esg-search

            pathType: Prefix

            backend:

              serviceName: {{ include "esgf.component.fullname" (list . "search") }}

              servicePort: 8080

              service:

                name: {{ include "esgf.component.fullname" (list . "search") }}

                port:

                  number: 8080

          {{- end }}

          {{- end }}