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

Merge pull request #112 from rcarpa/additional_secrets_rework 

All: rework additionalSecrets usage. #110
parents 0af32f74 006d2bca

charts/rucio-daemons/Chart.yaml

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

version: 1.29.5

version: 1.29.6

apiVersion: v1

description: A Helm chart to deploy daemons for Rucio

keywords:

charts/rucio-daemons/templates/abacus-account.yaml

+3 −3
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ spec: 
        secret:

          secretName: {{ .Release.Name }}-rucio-ca-bundle

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

      - name: {{ $key }}

      - name: {{ kindIs "int" $key | ternary (coalesce $val.volumeName $val.secretName $val.secretFullName) $key }} 

        secret:

          secretName: {{ $.Release.Name }}-{{ $val.secretName }}

          secretName: {{ coalesce $val.secretFullName (printf "%s-%s" $.Release.Name $val.secretName) }}

      {{- end}}

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

      - name: {{ $key }}
@@ -100,7 +100,7 @@ spec: 
              mountPath: /opt/rucio/etc/rucio.config.component.json

              subPath: rucio.config.component.json

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

            - name: {{ $key }}

            - name: {{ kindIs "int" $key | ternary (coalesce $val.volumeName $val.secretName $val.secretFullName) $key }} 

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{- end}}

charts/rucio-daemons/templates/abacus-collection-replica.yaml

+3 −3
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ spec: 
        secret:

          secretName: {{ .Release.Name }}-rucio-ca-bundle

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

      - name: {{ $key }}

      - name: {{ kindIs "int" $key | ternary (coalesce $val.volumeName $val.secretName $val.secretFullName) $key }} 

        secret:

          secretName: {{ $.Release.Name }}-{{ $val.secretName }}

          secretName: {{ coalesce $val.secretFullName (printf "%s-%s" $.Release.Name $val.secretName) }}

      {{- end}}

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

      - name: {{ $key }}
@@ -100,7 +100,7 @@ spec: 
              mountPath: /opt/rucio/etc/rucio.config.component.json

              subPath: rucio.config.component.json

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

            - name: {{ $key }}

            - name: {{ kindIs "int" $key | ternary (coalesce $val.volumeName $val.secretName $val.secretFullName) $key }} 

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{- end}}

charts/rucio-daemons/templates/abacus-rse.yaml

+3 −3
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ spec: 
        secret:

          secretName: {{ .Release.Name }}-rucio-ca-bundle

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

      - name: {{ $key }}

      - name: {{ kindIs "int" $key | ternary (coalesce $val.volumeName $val.secretName $val.secretFullName) $key }} 

        secret:

          secretName: {{ $.Release.Name }}-{{ $val.secretName }}

          secretName: {{ coalesce $val.secretFullName (printf "%s-%s" $.Release.Name $val.secretName) }}

      {{- end}}

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

      - name: {{ $key }}
@@ -100,7 +100,7 @@ spec: 
              mountPath: /opt/rucio/etc/rucio.config.component.json

              subPath: rucio.config.component.json

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

            - name: {{ $key }}

            - name: {{ kindIs "int" $key | ternary (coalesce $val.volumeName $val.secretName $val.secretFullName) $key }} 

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{- end}}

charts/rucio-daemons/templates/automatix.yaml

+3 −3
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ spec: 
        secret:

          secretName: {{ .Release.Name }}-rucio-ca-bundle-reaper

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

      - name: {{ $key }}

      - name: {{ kindIs "int" $key | ternary (coalesce $val.volumeName $val.secretName $val.secretFullName) $key }} 

        secret:

          secretName: {{ $.Release.Name }}-{{ $val.secretName }}

          secretName: {{ coalesce $val.secretFullName (printf "%s-%s" $.Release.Name $val.secretName) }}

      {{- end}}

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

      - name: {{ $key }}
@@ -105,7 +105,7 @@ spec: 
              mountPath: /opt/rucio/etc/rucio.config.component.json

              subPath: rucio.config.component.json

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

            - name: {{ $key }}

            - name: {{ kindIs "int" $key | ternary (coalesce $val.volumeName $val.secretName $val.secretFullName) $key }} 

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{- end}}