Unverified Commit d444a6e0 authored by rcarpa's avatar rcarpa Committed by GitHub
Browse files

Merge pull request #71 from rcarpa/subpaths_normalisation 

servers: support both subPath and subPaths in additionalSecrets. Closes #70
parents a5bf1d9e 0ac3e713

charts/rucio-server/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
name: rucio-server

version: 1.26.1

version: 1.26.2

apiVersion: v1

description: A Helm chart to deploy servers for Rucio

keywords:

charts/rucio-server/templates/auth_deployment.yaml

+9 −2
Original line number Diff line number Diff line
@@ -106,11 +106,18 @@ spec: 
            - name: httpdlog

              mountPath: /var/log/httpd

            {{- range $key, $val := .Values.additionalSecrets }}

            {{- /* TODO: depreacte and remove support for subPaths (at plural) case */}}

            {{-  if $val.subPaths }}

            {{-   range $val.subPaths }}

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}{{ . }}

              subPath: {{ . }}

            {{-   end}}

            {{-  else }}

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{-  end}}

            {{- end}}

            {{- range $key, $val := .Values.persistentVolumes }}

            - name: {{ $key }}

charts/rucio-server/templates/deployment.yaml

+9 −2
Original line number Diff line number Diff line
@@ -105,11 +105,18 @@ spec: 
          - name: httpdlog

            mountPath: /var/log/httpd

          {{- range $key, $val := .Values.additionalSecrets }}

          {{- /* TODO: depreacte and remove support for subPaths (at plural) case */}}

          {{-  if $val.subPaths }}

          {{-   range $val.subPaths }}

          - name: {{ $key }}

            mountPath: {{ $val.mountPath }}{{ . }}

            subPath: {{ . }}

          {{-   end}}

          {{-  else }}

          - name: {{ $key }}

            mountPath: {{ $val.mountPath }}

            subPath: {{ $val.subPath }}

          {{-  end}}

          {{- end}}

          {{- range $key, $val := .Values.persistentVolumes }}

          - name: {{ $key }}

charts/rucio-server/templates/trace_deployment.yaml

+9 −2
Original line number Diff line number Diff line
@@ -111,11 +111,18 @@ spec: 
              mountPath: /etc/grid-security/ca.pem

              subPath: ca.pem

            {{- range $key, $val := .Values.additionalSecrets }}

            {{- /* TODO: depreacte and remove support for subPaths (at plural) case */}}

            {{-  if $val.subPaths }}

            {{-   range $val.subPaths }}

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}{{ . }}

              subPath: {{ . }}

            {{-   end}}

            {{-  else }}

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{-  end}}

            {{- end}}

{{- end }}

          env: