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

Merge pull request #68 from rcarpa/remove_config_passing_via_env 

 remove configuration passing via ENV variables. Closes #65
parents 6acd939c c9f4f9fc

charts/rucio-daemons/Chart.yaml

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

version: 1.27.7

version: 1.28.0

apiVersion: v1

description: A Helm chart to deploy daemons for Rucio

keywords:

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

+0 −11
Original line number Diff line number Diff line
@@ -105,17 +105,6 @@ 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 }}

              valueFrom:

                secretKeyRef:

                  name: {{ template "rucio.fullname" $ }}.cfg

                  key: {{ $key1 }}_{{ $key2 }}

            {{- end}}

            {{- end}}

            {{- end}}

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

            - name: {{ $key1 | upper }}

              value: "{{ $val1  }}"

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

+0 −11
Original line number Diff line number Diff line
@@ -105,17 +105,6 @@ 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 }}

              valueFrom:

                secretKeyRef:

                  name: {{ template "rucio.fullname" $ }}.cfg

                  key: {{ $key1 }}_{{ $key2 }}

            {{- end}}

            {{- end}}

            {{- end}}

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

            - name: {{ $key1 | upper }}

              value: "{{ $val1  }}"

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

+0 −11
Original line number Diff line number Diff line
@@ -105,17 +105,6 @@ 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 }}

              valueFrom:

                secretKeyRef:

                  name: {{ template "rucio.fullname" $ }}.cfg

                  key: {{ $key1 }}_{{ $key2 }}

            {{- end}}

            {{- end}}

            {{- end}}

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

            - name: {{ $key1 | upper }}

              value: "{{ $val1  }}"

charts/rucio-daemons/templates/automatix.yaml

+0 −11
Original line number Diff line number Diff line
@@ -114,17 +114,6 @@ 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 }}

              valueFrom:

                secretKeyRef:

                  name: {{ template "rucio.fullname" $ }}.cfg

                  key: {{ $key1 }}_{{ $key2 }}

            {{- end}}

            {{- end}}

            {{- end}}

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

            - name: {{ $key1 | upper }}

              value: "{{ $val1  }}"