Commit 577c6f6b authored by Radu Carpa's avatar Radu Carpa
Browse files

rucio-ui: rework configuration passing

parent 3f610b41

charts/rucio-ui/Chart.yaml

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

version: 1.26.0

version: 1.27.0

apiVersion: v1

description: A Helm chart to deploy webui servers for Rucio

keywords:

charts/rucio-ui/templates/deployment.yaml

+26 −0
Original line number Diff line number Diff line 
apiVersion: v1

kind: Secret

metadata:

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

  labels:

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

    chart: {{ template "rucio.chart" . }}

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

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

type: Opaque

data:

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

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

---

apiVersion: apps/v1

kind: Deployment

metadata:
@@ -27,11 +41,16 @@ spec: 
      labels:

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

        release: {{ .Release.Name }}

      annotations:

        checksum/config: {{ $common_config | sha1sum }}

    spec:

    {{- if .Values.serviceAccountName }}

      serviceAccountName: {{ .Values.serviceAccountName }}

    {{- end }}

      volumes:

      - name: config

        secret:

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

      - name: aliases

        configMap:

          name: {{ template "rucio.fullname" . }}-aliases
@@ -76,6 +95,9 @@ spec: 
              containerPort: 443

              protocol: TCP

          volumeMounts:

            - name: config

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

              subPath: rucio.config.common.json

            - name: httpdlog

              mountPath: /var/log/httpd

            - name: aliases
@@ -100,6 +122,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 }}
@@ -109,6 +132,7 @@ spec: 
                  key: {{ $key1 }}_{{ $key2 }}

            {{- end}}

            {{- end}}

            {{- end}}



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

            - name: {{ $key1 | upper }}
@@ -129,6 +153,8 @@ spec: 
{{- end }}

            - name: RUCIO_DEFINE_ALIASES

              value: "True"

            - name: RUCIO_OVERRIDE_CONFIGS

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

            - name: RUCIO_LOG_FORMAT

              value: '[%{%Y-%m-%d %H:%M:%S}t]\t%v\t%h\t%{X-Forwarded-For}i\t%{X-Rucio-RequestId}i\t%>s\t%I\t%B\t%D\t\"%r\"\t\"%{X-Rucio-Auth-Token}i\"\t\"%{User-Agent}i\"\t%{X-Rucio-Script}i'

          resources:

charts/rucio-ui/values.yaml

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ strategy: 
    maxSurge: 1

    maxUnavailable: 1



exportConfigToEnv: false



minReadySeconds: 5



proxy: