Commit 43be6868 authored by William Tucker's avatar William Tucker
Browse files

Updated health check endpoints and added a second at /health

parent 846f98cc

deploy/ansible/roles/data/templates/fileserver.conf.j2

+4 −1
Original line number Diff line number Diff line
@@ -15,7 +15,10 @@ server { 
    }



    # Health check

    location /thredds/fileServer/healthcheck {

    location /health {

        return 200;

    }

    location /thredds/fileServer/health {

        return 200;

    }

deploy/ansible/roles/proxy/templates/proxy.conf.j2

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ server { 
        return 404;

    }



    # Health check

    location /health {

        return 200;

    }



    {% if auth_enabled %}

    location /verify {

        set $query '';

deploy/kubernetes/chart/files/fileServer/datasets.conf

+5 −2
Original line number Diff line number Diff line
@@ -14,8 +14,11 @@ server { 
        return 404;

    }



    # Health check

    location /thredds/fileServer/healthcheck {

    # Health checks

    location /health {

        return 200;

    }

    location /thredds/fileServer/health {

        return 200;

    }

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

+12 −5
Original line number Diff line number Diff line
@@ -15,16 +15,14 @@ spec: 
      http:

        paths:

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

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

          - path: /thredds

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

          - path: /

            pathType: Prefix

            backend:

              service:

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

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

                port:

                  number: 8080

          {{- end }}

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

          - path: /thredds/fileServer

            pathType: Prefix

            backend:
@@ -33,6 +31,15 @@ spec: 
                port:

                  number: 8080

          {{- end }}

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

          - path: /thredds

            pathType: Prefix

            backend:

              service:

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

                port:

                  number: 8080

          {{- end }}

          {{- end }}

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

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