Commit 5ea1218a authored by Radu Carpa's avatar Radu Carpa
Browse files

daemons: support per-component additionalSecrets 

The commit allows to mount a secret only inside a specific
daemon. Until now, all secrets had to be mounted to all daemons.

This will allow, for example, to only hotfix patch a single
daemon. Another use case is to mount a specific secret,
proxy for example, only inside the daemons which need it.

Also rename additionalSecrets to secretMounts, but continue to
support the old naming too for the time being.
parent 8ab83a60

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

+6 −2
Original line number Diff line number Diff line
@@ -78,11 +78,13 @@ spec: 
        secret:

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

    {{- end }}

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

      {{- range $collection := tuple .Values.secretMounts .Values.abacusAccount.secretMounts .Values.additionalSecrets .Values.abacusAccount.additionalSecrets }}

      {{- range $key, $val := $collection }}

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

        secret:

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

      {{- end}}

      {{- end}}

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

      - name: {{ $key }}

        persistentVolumeClaim:
@@ -105,11 +107,13 @@ spec: 
            - name: config-component

              mountPath: /opt/rucio/etc/conf.d/20_component.json

              subPath: component.json

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

            {{- range $collection := tuple .Values.secretMounts .Values.abacusAccount.secretMounts .Values.additionalSecrets .Values.abacusAccount.additionalSecrets }}

            {{- range $key, $val := $collection }}

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

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{- end}}

            {{- end}}

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}

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

+6 −2
Original line number Diff line number Diff line
@@ -78,11 +78,13 @@ spec: 
        secret:

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

    {{- end }}

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

      {{- range $collection := tuple .Values.secretMounts .Values.abacusCollectionReplica.secretMounts .Values.additionalSecrets .Values.abacusCollectionReplica.additionalSecrets }}

      {{- range $key, $val := $collection }}

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

        secret:

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

      {{- end}}

      {{- end}}

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

      - name: {{ $key }}

        persistentVolumeClaim:
@@ -105,11 +107,13 @@ spec: 
            - name: config-component

              mountPath: /opt/rucio/etc/conf.d/20_component.json

              subPath: component.json

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

            {{- range $collection := tuple .Values.secretMounts .Values.abacusCollectionReplica.secretMounts .Values.additionalSecrets .Values.abacusCollectionReplica.additionalSecrets }}

            {{- range $key, $val := $collection }}

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

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{- end}}

            {{- end}}

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}

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

+6 −2
Original line number Diff line number Diff line
@@ -78,11 +78,13 @@ spec: 
        secret:

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

    {{- end }}

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

      {{- range $collection := tuple .Values.secretMounts .Values.abacusRse.secretMounts .Values.additionalSecrets .Values.abacusRse.additionalSecrets }}

      {{- range $key, $val := $collection }}

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

        secret:

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

      {{- end}}

      {{- end}}

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

      - name: {{ $key }}

        persistentVolumeClaim:
@@ -105,11 +107,13 @@ spec: 
            - name: config-component

              mountPath: /opt/rucio/etc/conf.d/20_component.json

              subPath: component.json

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

            {{- range $collection := tuple .Values.secretMounts .Values.abacusRse.secretMounts .Values.additionalSecrets .Values.abacusRse.additionalSecrets }}

            {{- range $key, $val := $collection }}

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

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{- end}}

            {{- end}}

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}

charts/rucio-daemons/templates/automatix.yaml

+6 −2
Original line number Diff line number Diff line
@@ -81,11 +81,13 @@ spec: 
        secret:

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

    {{- end }}

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

      {{- range $collection := tuple .Values.secretMounts .Values.automatix.secretMounts .Values.additionalSecrets .Values.automatix.additionalSecrets }}

      {{- range $key, $val := $collection }}

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

        secret:

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

      {{- end}}

      {{- end}}

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

      - name: {{ $key }}

        persistentVolumeClaim:
@@ -110,11 +112,13 @@ spec: 
            - name: config-component

              mountPath: /opt/rucio/etc/conf.d/20_component.json

              subPath: component.json

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

            {{- range $collection := tuple .Values.secretMounts .Values.automatix.secretMounts .Values.additionalSecrets .Values.automatix.additionalSecrets }}

            {{- range $key, $val := $collection }}

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

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{- end}}

            {{- end}}

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}

charts/rucio-daemons/templates/cache-consumer.yaml

+6 −2
Original line number Diff line number Diff line
@@ -70,11 +70,13 @@ spec: 
      - name: config-component

        secret:

          secretName: {{ template "rucio.fullname" . }}.config.{{ $rucio_daemon }}

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

      {{- range $collection := tuple .Values.secretMounts .Values.cacheConsumer.secretMounts .Values.additionalSecrets .Values.cacheConsumer.additionalSecrets }}

      {{- range $key, $val := $collection }}

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

        secret:

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

      {{- end}}

      {{- end}}

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

      - name: {{ $key }}

        persistentVolumeClaim:
@@ -91,11 +93,13 @@ spec: 
            - name: config-component

              mountPath: /opt/rucio/etc/conf.d/20_component.json

              subPath: component.json

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

          {{- range $collection := tuple .Values.secretMounts .Values.cacheConsumer.secretMounts .Values.additionalSecrets .Values.cacheConsumer.additionalSecrets }}

          {{- range $key, $val := $collection }}

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

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

          {{- end}}

          {{- end}}

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}