Commit 47dbd47e authored by William Tucker's avatar William Tucker
Browse files

Added optional S3 storage location for Kubernetes deployments

parent e90a4a1f

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

+5 −0
Original line number Diff line number Diff line
@@ -17,8 +17,13 @@ server { 
    # Create a location block for each dataset

    {{- range .Values.data.datasets }}

    location /thredds/fileServer/{{ .path }}/ {

        {{- if $solr.s3Location }}

        {{- $s3 := $solr.s3Location -}}

        proxy_pass https://{{ $s3.host }}:{{ $s3.port }}/{{ $s3.bucket }}/{{ $s3.dataPath }}/;

        {{- else }}

        alias {{ trimSuffix "/" .location }}/;

        try_files $uri =404;

        {{- end }}

    }

    {{- end }}

}

deploy/kubernetes/chart/files/thredds/catalog.xml

+5 −0
Original line number Diff line number Diff line
@@ -13,7 +13,12 @@ 


    <!-- Produce a scan element for each of the given datasets -->

    {{- range .Values.data.datasets }}

    {{- if $solr.s3Location }}

    {{- $s3 := $solr.s3Location -}}

    <datasetScan name="{{ .name }}" ID="{{ .path }}" path="{{ .path }}" location="cdms3://{{ $s3.host }}:{{ $s3.port }}/{{ $s3.bucket }}?{{ $s3.dataPath }}/#delimiter=/">

    {{- else }}

    <datasetScan name="{{ .name }}" ID="{{ .path }}" path="{{ .path }}" location="{{ .location }}">

    {{- end }}

        <metadata inherited="true">

            <serviceName>all</serviceName>

        </metadata>