Commit 686c8e56 authored by Radu Carpa's avatar Radu Carpa Committed by rcarpa
Browse files

servers and daemons: rework sub-component extra secretMounts 

In a very recent change, which shouldn't yet be used by anybody
except us, we introduced sub-component secretMounts. Those
were appended to whatever secretMounts where in the global config.
Unfortunately, this introduced a deadlock when the x509 proxy
was configured in the global config as a secret mount: the fts
cron job was trying to mount the x509 proxy before starting the
pod. And this is the job which actually generates the x509 proxy.

I decided to change the behavior of sub-component secretMounts.
Now they override the global secretMounts instead of extending it.
To add additional secretMounts to the global list, use
"extraSecretMounts".
parent 60ea8459

charts/rucio-daemons/Chart.yaml

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

version: 1.30.7

version: 1.30.8

apiVersion: v1

description: A Helm chart to deploy daemons for Rucio

keywords:

charts/rucio-daemons/ci/testing-values.yaml

+6 −1
Original line number Diff line number Diff line
@@ -94,7 +94,9 @@ conveyorTransferSubmitter: 
      cpu: "100m"

  config:

    a: b



  extraSecretMounts:

    - secretName: component-additional-secret

      mountPath: /some/path.json



conveyorPoller:

  activities: "'Activity 1'"
@@ -133,6 +135,9 @@ conveyorReceiver: 
    requests:

      memory: "100Mi"

      cpu: "100m"

  secretMounts:

    - secretName: component-overriding-secret

      mountPath: /some/path.json



conveyorThrottler:

  threads: 1

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

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ spec: 
        secret:

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

    {{- end }}

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

      {{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts .Values.additionalSecrets) $component_values.extraSecretMounts }}

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

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

        secret:
@@ -109,7 +109,7 @@ spec: 
            - name: config-component

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

              subPath: component.json

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

            {{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts .Values.additionalSecrets) $component_values.extraSecretMounts }}

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

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

              mountPath: {{ $val.mountPath }}

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

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ spec: 
        secret:

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

    {{- end }}

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

      {{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts .Values.additionalSecrets) $component_values.extraSecretMounts }}

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

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

        secret:
@@ -109,7 +109,7 @@ spec: 
            - name: config-component

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

              subPath: component.json

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

            {{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts .Values.additionalSecrets) $component_values.extraSecretMounts }}

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

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

              mountPath: {{ $val.mountPath }}

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

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ spec: 
        secret:

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

    {{- end }}

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

      {{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts .Values.additionalSecrets) $component_values.extraSecretMounts }}

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

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

        secret:
@@ -109,7 +109,7 @@ spec: 
            - name: config-component

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

              subPath: component.json

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

            {{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts .Values.additionalSecrets) $component_values.extraSecretMounts }}

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

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

              mountPath: {{ $val.mountPath }}