Unverified Commit 754eb377 authored by William Tucker's avatar William Tucker Committed by GitHub
Browse files

Merge pull request #236 from bstrdsmkr/openshift 

Add helm chart options to ease deployment to OpenShift
parents 3655b842 788166cb

deploy/kubernetes/chart/templates/_helpers.tpl

+2 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ The produced mounts will always be read-only. 
Generate TLS config for ingress.

*/}}

{{- define "esgf.ingress.tls" }}

{{- if .Capabilities.APIVersions.Has "security.openshift.io/v1" }}

tls:

  - hosts:

      - {{ .Values.hostname | quote }}
@@ -126,6 +127,7 @@ tls: 
    secretName: {{ include "esgf.component.fullname" (list . "hostcert") }}

    {{- end }}

{{- end }}

{{- end }}



{{/*

Generate auth config for ingress.

deploy/kubernetes/chart/templates/fileServer/configmap.yaml

+3 −0
Original line number Diff line number Diff line
@@ -7,4 +7,7 @@ metadata: 
  labels: {{ include "esgf.component.labels" (list . "fileServer" $fileServer.labels) | nindent 4 }}

data:

  datasets.conf: {{ tpl (.Files.Get "files/fileServer/datasets.conf") . | quote }}

{{ range $file, $content := $fileServer.extraNginxConf }}

  {{ $file }}: {{ tpl $content . | quote }}

{{- end }}

{{- end -}}

deploy/kubernetes/chart/templates/fileServer/deployment.yaml

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ spec: 
        checksum/logstash-pipelines: {{ include (print $.Template.BasePath "/logstash/pipelines.yaml") . | sha256sum }}

        checksum/logstash-certs: {{ include (print $.Template.BasePath "/logstash/certs.yaml") . | sha256sum }}

        {{- end }}

        {{- with $fileServer.annotations }}

        {{- toYaml . | nindent 8 }}

        {{- end }}

    spec:

      {{- with (default .Values.image.pullSecrets $fileServer.image.pullSecrets) }}

      imagePullSecrets: {{ toYaml . | nindent 8 }}

deploy/kubernetes/chart/templates/thredds/deployment.yaml

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ spec: 
        checksum/logstash-pipelines: {{ include (print $.Template.BasePath "/logstash/pipelines.yaml") . | sha256sum }}

        checksum/logstash-certs: {{ include (print $.Template.BasePath "/logstash/certs.yaml") . | sha256sum }}

        {{- end }}

        {{- with $thredds.annotations }}

        {{- toYaml . | nindent 8 }}

        {{- end }}

    spec:

      {{- with (default .Values.image.pullSecrets $thredds.image.pullSecrets) }}

      imagePullSecrets: {{ toYaml . | nindent 8 }}

deploy/kubernetes/chart/values.yaml

+1 −0
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ data: 
    # Image overrides for the file server image

    image:

      repository: nginx

    extraNginxConf:

    # The number of replicas for the file server pod

    # If an hpa is configured, this is ignored - the hpa has full control over the number of replicas

    replicaCount: 1