Commit fd36a022 authored by cserf's avatar cserf Committed by Radu Carpa
Browse files

Update version + remove suspicious_replica_recoverer.json

parent ab20f947

charts/rucio-daemons/templates/replica-recoverer.yaml

+20 −18
Original line number Diff line number Diff line 
{{- if gt .Values.replicaRecovererCount 0.0 -}}

{{- if gt .Values.transmogrifierCount 0.0 -}}

{{- $rucio_daemon := "replica-recoverer" }}

{{- $app_label := printf "%s-%s" (include "rucio.name" .) $rucio_daemon }}



apiVersion: v1

kind: Secret

metadata:

  name: {{ template "rucio.fullname" . }}.config.replica-recoverer

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

  labels:

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

    app: {{ $app_label }}

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

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

    heritage: "{{ .Release.Service }}"
@@ -18,9 +21,10 @@ data: 
apiVersion: apps/v1

kind: Deployment

metadata:

  name: {{ .Release.Name }}-replica-recoverer

  name: {{ .Release.Name }}-{{ $rucio_daemon }}

  labels:

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

    app: {{ $app_label }}

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

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

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}
@@ -28,7 +32,7 @@ spec: 
  replicas: {{ .Values.replicaRecovererCount }}

  selector:

    matchLabels:

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

      app: {{ $app_label }}

      release: {{ .Release.Name }}

  strategy:

    type: {{ .Values.strategy.type }}
@@ -42,9 +46,10 @@ spec: 
  template:

    metadata:

      labels:

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

        app: {{ $app_label }}

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

        release: {{ .Release.Name }}

        rucio-daemon: replica-recoverer

        rucio-daemon: {{ $rucio_daemon }}

    {{- with .Values.podLabels }}

        {{- toYaml . | nindent 8 }}

    {{- end }}
@@ -63,7 +68,7 @@ spec: 
      volumes:

      - name: config

        secret:

          secretName: {{ template "rucio.fullname" . }}.config.replica-recoverer

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

      - name: proxy-volume

        secret:

          secretName: {{ .Release.Name }}-rucio-x509up
@@ -95,9 +100,6 @@ spec: 
            - name: config

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

              subPath: rucio.config.component.json

            - name: config

              mountPath: /opt/rucio/etc/suspicious_replica_recoverer.json

              subPath: suspicious_replica_recoverer.json

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}
@@ -117,9 +119,9 @@ spec: 
              value: "{{ $val1  }}"

            {{- end}}

            - name: RUCIO_OVERRIDE_CONFIGS

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

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

            - name: RUCIO_DAEMON

              value: "replica-recoverer"

              value: "{{ $rucio_daemon }}"

            - name: RUCIO_DAEMON_ARGS

              value: "{{- if .Values.replicaRecoverer.sleepTime }} --sleep-time {{ .Values.replicaRecoverer.sleepTime }}{{ end }}"

{{- with .Values.replicaRecoverer.resources }}