Commit 73fa18c6 authored by William Tucker's avatar William Tucker
Browse files

Merge branch 'master' of github.com:ESGF/esgf-docker into openshift

parents 99ded65c f286d6fb

deploy/kubernetes/chart/files/search/esgf.properties

+3 −0
Original line number Diff line number Diff line
@@ -7,3 +7,6 @@ esg.search.solr.publish.url=http://{{ include "esgf.component.fullname" (list . 
esg.search.solr.query.url={{ $solr.slaveExternalUrl }}

esg.search.solr.publish.url={{ $solr.masterExternalUrl }}

{{- end }}

index.timeout.connection={{ .Values.index.search.connectionTimeout }}

index.timeout.read.datasets={{ .Values.index.search.datasetsTimeout }}

index.timeout.read.files={{ .Values.index.search.filesTimeout }}

deploy/kubernetes/chart/values.yaml

+5 −2
Original line number Diff line number Diff line
@@ -507,8 +507,11 @@ index: 
    # The tolerations for the search pods

    # See https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/

    tolerations:

    # Timeout settings

    connectionTimeout: "1000"

    datasetsTimeout: "20000"

    filesTimeout: "3600000"

    # Security context for search container.



    securityContext:

      # Run with a read-only root filesystem by default

      readOnlyRootFilesystem: true