diff --git a/charts/rucio-daemons/templates/renew-fts-cronjob.yaml b/charts/rucio-daemons/templates/renew-fts-cronjob.yaml index 5b8f3fd..ef8b826 100644 --- a/charts/rucio-daemons/templates/renew-fts-cronjob.yaml +++ b/charts/rucio-daemons/templates/renew-fts-cronjob.yaml @@ -7,10 +7,10 @@ secret: secretName: {{ .Release.Name }}-longproxy {{- else if (eq .Values.ftsRenewal.vo "multi_vo")}} - {{- range $array := split "," .Values.ftsRenewal.vomses }} - - name: longproxy-{{.}} + {{- range $val := .Values.ftsRenewal.vomses }} + - name: longproxy-{{$val.vo}} secret: - secretName: {{ $.Release.Name }}-longproxy-{{.}} + secretName: {{ $.Release.Name }}-longproxy-{{$val.vo}} {{- end }} {{- else }} - name: usercert @@ -24,12 +24,12 @@ - name: {{ $key }} secret: secretName: {{ $.Release.Name }}-{{ $val.secretName }} - {{- end}} + {{- end }} {{- range $key, $val := .Values.persistentVolumes }} - name: {{ $key }} persistentVolumeClaim: claimName: {{ $val.name }} - {{- end}} + {{- end }} containers: - name: renew-fts-cron image: "{{ .Values.ftsRenewal.image.repository }}:{{ .Values.ftsRenewal.image.tag }}" @@ -41,9 +41,9 @@ - name: longproxy mountPath: /opt/rucio/certs/ {{- else if (eq .Values.ftsRenewal.vo "multi_vo")}} - {{- range $array := split "," .Values.ftsRenewal.vomses }} - - name: longproxy-{{.}} - mountPath: /opt/rucio/certs/{{.}}/ + {{- range $val := .Values.ftsRenewal.vomses }} + - name: longproxy-{{$val.vo}} + mountPath: /opt/rucio/certs/{{$val.vo}}/ {{- end }} {{- else }} - name: usercert @@ -54,25 +54,29 @@ {{- range $key, $val := .Values.additionalSecrets }} - name: {{ $key }} mountPath: {{ $val.mountPath }} - {{- end}} + {{- end }} {{- range $key, $val := .Values.persistentVolumes }} - name: {{ $key }} mountPath: {{ $val.mountPath }} - {{- end}} + {{- end }} env: {{- range $key1, $val1 := .Values.optional_config }} - name: {{ $key1 | upper }} value: "{{ $val1 }}" - {{- end}} + {{- end }} - name: RUCIO_VO value: {{ .Values.ftsRenewal.vo | quote }} {{- if (eq .Values.ftsRenewal.vo "multi_vo")}} - - name: RUCIO_FTS_VOMSES - value: {{ .Values.ftsRenewal.vomses | quote }} + - name: RUCIO_FTS_VOS + value: {{ range $val := .Values.ftsRenewal.vomses }}{{$val.vo}} {{end}} + {{- range $val := .Values.ftsRenewal.vomses }} + - name: RUCIO_FTS_VOMS_{{ $val.vo | upper}} + value: {{ $val.voms }} + {{- end }} {{- else}} - name: RUCIO_FTS_VOMS value: {{ .Values.ftsRenewal.voms | quote }} - {{- end}} + {{- end }} - name: RUCIO_FTS_SERVERS value: {{ .Values.ftsRenewal.servers | quote }} - name: RUCIO_FTS_SECRETS