Commit 8ce4fbd7 authored by Matt Pryor's avatar Matt Pryor
Browse files

Add options for extra init containers, volumes and mounts

parent bbb20129

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

+9 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ spec: 
          volumeMounts:

            - name: nginx-logs

              mountPath: /var/log/nginx

        {{- with $fileServer.extraInitContainers }}

        {{- toYaml . | nindent 8 }}

        {{- end }}

      containers:

        - name: file-server

          {{ include "esgf.deployment.image" (list . $fileServer.image) }}
@@ -75,6 +78,9 @@ spec: 
            - name: nginx-logs

              mountPath: /var/log/nginx

            {{- include "esgf.data.volumeMounts" . | nindent 12 }}

            {{- with $fileServer.extraVolumeMounts }}

            {{- toYaml . | nindent 12 }}

            {{- end }}

        # Tail the access log separately

        - name: file-server-access-log

          {{ include "esgf.deployment.image" (list . $fileServer.image) }}
@@ -106,4 +112,7 @@ spec: 
        - name: nginx-logs

          emptyDir: {}

        {{- include "esgf.data.volumes" . | nindent 8 }}

        {{- with $fileServer.extraVolumes }}

        {{- toYaml . | nindent 8 }}

        {{- end }}

{{- end -}}

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

+9 −0
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ spec: 
          volumeMounts:

            - name: thredds-logs

              mountPath: /thredds/logs

        {{- with $thredds.extraInitContainers }}

        {{- toYaml . | nindent 8 }}

        {{- end }}

      containers:

        - name: thredds

          {{ include "esgf.deployment.image" (list . $thredds.image) }}
@@ -132,6 +135,9 @@ spec: 
            - name: thredds-logs

              mountPath: /opt/tomcat/content/thredds/logs

            {{- include "esgf.data.volumeMounts" . | nindent 12 }}

            {{- with $thredds.extraVolumeMounts }}

            {{- toYaml . | nindent 12 }}

            {{- end }}

        # Tail the log pipes

        {{- $topContext := . }}

        {{- range (list "serverStartup.log" "catalogInit.log" "httpout.log" "featureCollectionScan.log" "fmrc.log" "threddsServlet.log" "cache.log") }}
@@ -181,4 +187,7 @@ spec: 
        - name: thredds-logs

          emptyDir: {}

        {{- include "esgf.data.volumes" . | nindent 8 }}

        {{- with $thredds.extraVolumes }}

        {{- toYaml . | nindent 8 }}

        {{- end }}

{{- end -}}