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

Merge pull request #67 from rcarpa/rework_daemon_config_passing 

daemons: rework configuration passing in remaining daemons. #65
parents 27ddfec3 e0127bea

charts/rucio-daemons/Chart.yaml

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

version: 1.26.5

version: 1.26.6

apiVersion: v1

description: A Helm chart to deploy daemons for Rucio

keywords:

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

+27 −0
Original line number Diff line number Diff line 
{{- if gt .Values.abacusAccountCount 0.0 -}}

apiVersion: v1

kind: Secret

metadata:

  name: {{ template "rucio.fullname" . }}.config.abacus-account.yaml

  labels:

    app: {{ template "rucio.name" . }}

    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

    release: "{{ .Release.Name }}"

    heritage: "{{ .Release.Service }}"

type: Opaque

data:

  rucio.config.common.json: {{ .Values.config | default dict | mustToPrettyJson | b64enc | quote }}

  rucio.config.component.json: {{ .Values.abacusAccount.config | default dict | mustToPrettyJson | b64enc | quote }}

---

apiVersion: apps/v1

kind: Deployment

metadata:
@@ -46,6 +60,9 @@ spec: 
      serviceAccountName: {{ .Values.serviceAccountName }}

    {{- end }}

      volumes:

      - name: config

        secret:

          secretName: {{ template "rucio.fullname" . }}.config.abacus-account.yaml

      - name: proxy-volume

        secret:

          secretName: {{ .Release.Name }}-rucio-x509up
@@ -71,6 +88,12 @@ spec: 
              mountPath: /opt/proxy

            - name: ca-volume

              mountPath: /opt/certs

            - name: config

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

              subPath: rucio.config.common.json

            - name: config

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

              subPath: rucio.config.component.json

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}
@@ -81,6 +104,7 @@ spec: 
              mountPath: {{ $val.mountPath }}

            {{- end}}

          env:

            {{- if .Values.exportConfigToEnv }}

            {{- range $key1, $val1 := .Values.config }}

            {{- range $key2, $val2 := $val1}}

            - name: RUCIO_CFG_{{ $key1 | upper }}_{{ $key2 | upper }}
@@ -90,10 +114,13 @@ spec: 
                  key: {{ $key1 }}_{{ $key2 }}

            {{- end}}

            {{- end}}

            {{- end}}

            {{- range $key1, $val1 := .Values.optional_config }}

            - name: {{ $key1 | upper }}

              value: "{{ $val1  }}"

            {{- end}}

            - name: RUCIO_OVERRIDE_CONFIGS

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

            - name: RUCIO_DAEMON

              value: "abacus-account"

            - name: RUCIO_DAEMON_ARGS

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

+27 −0
Original line number Diff line number Diff line 
{{- if gt .Values.abacusCollectionReplicaCount 0.0 -}}

apiVersion: v1

kind: Secret

metadata:

  name: {{ template "rucio.fullname" . }}.config.abacus-collection-replica.yaml

  labels:

    app: {{ template "rucio.name" . }}

    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

    release: "{{ .Release.Name }}"

    heritage: "{{ .Release.Service }}"

type: Opaque

data:

  rucio.config.common.json: {{ .Values.config | default dict | mustToPrettyJson | b64enc | quote }}

  rucio.config.component.json: {{ .Values.abacusCollectionReplica.config | default dict | mustToPrettyJson | b64enc | quote }}

---

apiVersion: apps/v1

kind: Deployment

metadata:
@@ -46,6 +60,9 @@ spec: 
      serviceAccountName: {{ .Values.serviceAccountName }}

    {{- end }}

      volumes:

      - name: config

        secret:

          secretName: {{ template "rucio.fullname" . }}.config.abacus-collection-replica.yaml

      - name: proxy-volume

        secret:

          secretName: {{ .Release.Name }}-rucio-x509up
@@ -71,6 +88,12 @@ spec: 
              mountPath: /opt/proxy

            - name: ca-volume

              mountPath: /opt/certs

            - name: config

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

              subPath: rucio.config.common.json

            - name: config

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

              subPath: rucio.config.component.json

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}
@@ -81,6 +104,7 @@ spec: 
              mountPath: {{ $val.mountPath }}

            {{- end}}

          env:

            {{- if .Values.exportConfigToEnv }}

            {{- range $key1, $val1 := .Values.config }}

            {{- range $key2, $val2 := $val1}}

            - name: RUCIO_CFG_{{ $key1 | upper }}_{{ $key2 | upper }}
@@ -90,10 +114,13 @@ spec: 
                  key: {{ $key1 }}_{{ $key2 }}

            {{- end}}

            {{- end}}

            {{- end}}

            {{- range $key1, $val1 := .Values.optional_config }}

            - name: {{ $key1 | upper }}

              value: "{{ $val1  }}"

            {{- end}}

            - name: RUCIO_OVERRIDE_CONFIGS

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

            - name: RUCIO_DAEMON

              value: "abacus-collection-replica"

            - name: RUCIO_DAEMON_ARGS

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

+27 −0
Original line number Diff line number Diff line 
{{- if gt .Values.abacusRseCount 0.0 -}}

apiVersion: v1

kind: Secret

metadata:

  name: {{ template "rucio.fullname" . }}.config.abacus-rse.yaml

  labels:

    app: {{ template "rucio.name" . }}

    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

    release: "{{ .Release.Name }}"

    heritage: "{{ .Release.Service }}"

type: Opaque

data:

  rucio.config.common.json: {{ .Values.config | default dict | mustToPrettyJson | b64enc | quote }}

  rucio.config.component.json: {{ .Values.abacusRse.config | default dict | mustToPrettyJson | b64enc | quote }}

---

apiVersion: apps/v1

kind: Deployment

metadata:
@@ -46,6 +60,9 @@ spec: 
      serviceAccountName: {{ .Values.serviceAccountName }}

    {{- end }}

      volumes:

      - name: config

        secret:

          secretName: {{ template "rucio.fullname" . }}.config.abacus-rse.yaml

      - name: proxy-volume

        secret:

          secretName: {{ .Release.Name }}-rucio-x509up
@@ -71,6 +88,12 @@ spec: 
              mountPath: /opt/proxy

            - name: ca-volume

              mountPath: /opt/certs

            - name: config

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

              subPath: rucio.config.common.json

            - name: config

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

              subPath: rucio.config.component.json

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}
@@ -81,6 +104,7 @@ spec: 
              mountPath: {{ $val.mountPath }}

            {{- end}}

          env:

            {{- if .Values.exportConfigToEnv }}

            {{- range $key1, $val1 := .Values.config }}

            {{- range $key2, $val2 := $val1}}

            - name: RUCIO_CFG_{{ $key1 | upper }}_{{ $key2 | upper }}
@@ -90,10 +114,13 @@ spec: 
                  key: {{ $key1 }}_{{ $key2 }}

            {{- end}}

            {{- end}}

            {{- end}}

            {{- range $key1, $val1 := .Values.optional_config }}

            - name: {{ $key1 | upper }}

              value: "{{ $val1  }}"

            {{- end}}

            - name: RUCIO_OVERRIDE_CONFIGS

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

            - name: RUCIO_DAEMON

              value: "abacus-rse"

            - name: RUCIO_DAEMON_ARGS

charts/rucio-daemons/templates/automatix.yaml

+27 −0
Original line number Diff line number Diff line 
{{- if gt .Values.automatixCount 0.0 -}}

apiVersion: v1

kind: Secret

metadata:

  name: {{ template "rucio.fullname" . }}.config.automatix.yaml

  labels:

    app: {{ template "rucio.name" . }}

    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

    release: "{{ .Release.Name }}"

    heritage: "{{ .Release.Service }}"

type: Opaque

data:

  rucio.config.common.json: {{ .Values.config | default dict | mustToPrettyJson | b64enc | quote }}

  rucio.config.component.json: {{ .Values.automatix.config | default dict | mustToPrettyJson | b64enc | quote }}

---

apiVersion: apps/v1

kind: Deployment

metadata:
@@ -46,6 +60,9 @@ spec: 
      serviceAccountName: {{ .Values.serviceAccountName }}

    {{- end }}

      volumes:

      - name: config

        secret:

          secretName: {{ template "rucio.fullname" . }}.config.automatix.yaml

      - name: proxy-volume

        secret:

          secretName: {{ .Release.Name }}-rucio-x509up
@@ -76,6 +93,12 @@ spec: 
              mountPath: /opt/certs

            - name: ca-volume-reaper

              mountPath: /etc/grid-security/certificates

            - name: config

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

              subPath: rucio.config.common.json

            - name: config

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

              subPath: rucio.config.component.json

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}
@@ -90,6 +113,7 @@ spec: 
              containerPort: 8080

              protocol: TCP

          env:

            {{- if .Values.exportConfigToEnv }}

            {{- range $key1, $val1 := .Values.config }}

            {{- range $key2, $val2 := $val1}}

            - name: RUCIO_CFG_{{ $key1 | upper }}_{{ $key2 | upper }}
@@ -99,10 +123,13 @@ spec: 
                  key: {{ $key1 }}_{{ $key2 }}

            {{- end}}

            {{- end}}

            {{- end}}

            {{- range $key1, $val1 := .Values.optional_config }}

            - name: {{ $key1 | upper }}

              value: "{{ $val1  }}"

            {{- end}}

            - name: RUCIO_OVERRIDE_CONFIGS

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

            - name: RUCIO_DAEMON

              value: "automatix"

            - name: RUCIO_DAEMON_ARGS