Commit 4879bf3f authored by Radu Carpa's avatar Radu Carpa Committed by rcarpa
Browse files

All: mount configs under conf.d/ #75 

Use the new rucio's capability to merge all config files
from a directory.

This is a step towards having separate secrets and non-
secret configuration values.
parent ebdf2268

charts/rucio-daemons/Chart.yaml

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

version: 1.29.10

version: 1.30.0

apiVersion: v1

description: A Helm chart to deploy daemons for Rucio

keywords:

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

+7 −7
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ type: Opaque 
data:

  {{- $common_config := .Values.config | default dict | mustToPrettyJson | b64enc }}

  {{- $component_config := .Values.abacusAccount.config | default dict | mustToPrettyJson | b64enc }}

  rucio.config.common.json: {{ $common_config | quote }}

  rucio.config.component.json: {{ $component_config | quote }}

  common.json: {{ $common_config | quote }}

  component.json: {{ $component_config | quote }}

---

apiVersion: apps/v1

kind: Deployment
@@ -94,11 +94,11 @@ spec: 
            - name: ca-volume

              mountPath: /opt/certs

            - name: config

              mountPath: /opt/rucio/etc/rucio.config.common.json

              subPath: rucio.config.common.json

              mountPath: /opt/rucio/etc/conf.d/10_common.json

              subPath: common.json

            - name: config

              mountPath: /opt/rucio/etc/rucio.config.component.json

              subPath: rucio.config.component.json

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

              subPath: component.json

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

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

              mountPath: {{ $val.mountPath }}
@@ -114,7 +114,7 @@ spec: 
              value: "{{ $val1  }}"

            {{- end}}

            - name: RUCIO_OVERRIDE_CONFIGS

              value: "/opt/rucio/etc/rucio.config.common.json /opt/rucio/etc/rucio.config.component.json"

              value: "/opt/rucio/etc/conf.d/"

            - name: RUCIO_DAEMON

              value: "{{ $rucio_daemon }}"

            - name: RUCIO_DAEMON_ARGS

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

+7 −7
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ type: Opaque 
data:

  {{- $common_config := .Values.config | default dict | mustToPrettyJson | b64enc }}

  {{- $component_config := .Values.abacusCollectionReplica.config | default dict | mustToPrettyJson | b64enc }}

  rucio.config.common.json: {{ $common_config | quote }}

  rucio.config.component.json: {{ $component_config | quote }}

  common.json: {{ $common_config | quote }}

  component.json: {{ $component_config | quote }}

---

apiVersion: apps/v1

kind: Deployment
@@ -94,11 +94,11 @@ spec: 
            - name: ca-volume

              mountPath: /opt/certs

            - name: config

              mountPath: /opt/rucio/etc/rucio.config.common.json

              subPath: rucio.config.common.json

              mountPath: /opt/rucio/etc/conf.d/10_common.json

              subPath: common.json

            - name: config

              mountPath: /opt/rucio/etc/rucio.config.component.json

              subPath: rucio.config.component.json

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

              subPath: component.json

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

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

              mountPath: {{ $val.mountPath }}
@@ -114,7 +114,7 @@ spec: 
              value: "{{ $val1  }}"

            {{- end}}

            - name: RUCIO_OVERRIDE_CONFIGS

              value: "/opt/rucio/etc/rucio.config.common.json /opt/rucio/etc/rucio.config.component.json"

              value: "/opt/rucio/etc/conf.d/"

            - name: RUCIO_DAEMON

              value: "{{ $rucio_daemon }}"

            - name: RUCIO_DAEMON_ARGS

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

+7 −7
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ type: Opaque 
data:

  {{- $common_config := .Values.config | default dict | mustToPrettyJson | b64enc }}

  {{- $component_config := .Values.abacusRse.config | default dict | mustToPrettyJson | b64enc }}

  rucio.config.common.json: {{ $common_config | quote }}

  rucio.config.component.json: {{ $component_config | quote }}

  common.json: {{ $common_config | quote }}

  component.json: {{ $component_config | quote }}

---

apiVersion: apps/v1

kind: Deployment
@@ -94,11 +94,11 @@ spec: 
            - name: ca-volume

              mountPath: /opt/certs

            - name: config

              mountPath: /opt/rucio/etc/rucio.config.common.json

              subPath: rucio.config.common.json

              mountPath: /opt/rucio/etc/conf.d/10_common.json

              subPath: common.json

            - name: config

              mountPath: /opt/rucio/etc/rucio.config.component.json

              subPath: rucio.config.component.json

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

              subPath: component.json

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

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

              mountPath: {{ $val.mountPath }}
@@ -114,7 +114,7 @@ spec: 
              value: "{{ $val1  }}"

            {{- end}}

            - name: RUCIO_OVERRIDE_CONFIGS

              value: "/opt/rucio/etc/rucio.config.common.json /opt/rucio/etc/rucio.config.component.json"

              value: "/opt/rucio/etc/conf.d/"

            - name: RUCIO_DAEMON

              value: "{{ $rucio_daemon }}"

            - name: RUCIO_DAEMON_ARGS

charts/rucio-daemons/templates/automatix.yaml

+7 −7
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ type: Opaque 
data:

  {{- $common_config := .Values.config | default dict | mustToPrettyJson | b64enc }}

  {{- $component_config := .Values.automatix.config | default dict | mustToPrettyJson | b64enc }}

  rucio.config.common.json: {{ $common_config | quote }}

  rucio.config.component.json: {{ $component_config | quote }}

  common.json: {{ $common_config | quote }}

  component.json: {{ $component_config | quote }}

---

apiVersion: apps/v1

kind: Deployment
@@ -99,11 +99,11 @@ spec: 
            - name: ca-volume-reaper

              mountPath: /etc/grid-security/certificates

            - name: config

              mountPath: /opt/rucio/etc/rucio.config.common.json

              subPath: rucio.config.common.json

              mountPath: /opt/rucio/etc/conf.d/10_common.json

              subPath: common.json

            - name: config

              mountPath: /opt/rucio/etc/rucio.config.component.json

              subPath: rucio.config.component.json

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

              subPath: component.json

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

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

              mountPath: {{ $val.mountPath }}
@@ -123,7 +123,7 @@ spec: 
              value: "{{ $val1  }}"

            {{- end}}

            - name: RUCIO_OVERRIDE_CONFIGS

              value: "/opt/rucio/etc/rucio.config.common.json /opt/rucio/etc/rucio.config.component.json"

              value: "/opt/rucio/etc/conf.d/"

            - name: RUCIO_DAEMON

              value: "{{ $rucio_daemon }}"

            - name: RUCIO_DAEMON_ARGS