Commit aea34a5d authored by Rob Barnsley's avatar Rob Barnsley
Browse files

added hermes2 template 

added defaults to values.yaml
parent eb8b0bc6

rucio-daemons/templates/hermes2.yaml

0 → 100644
+125 −0
Original line number Diff line number Diff line 
{{- if gt .Values.hermes2Count 0.0 -}}

apiVersion: apps/v1

kind: Deployment

metadata:

  name: {{ .Release.Name }}-hermes2

  labels:

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

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

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

spec:

  replicas: {{ .Values.hermes2Count }}

  selector:

    matchLabels:

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

      release: {{ .Release.Name }}

  strategy:

    type: {{ .Values.strategy.type }}

{{- if eq .Values.strategy.type "RollingUpdate" }}

    {{- with .Values.strategy.rollingUpdate }}

    rollingUpdate:

{{ toYaml . | trim | indent 6 }}

    {{- end }}

{{- end }}

  minReadySeconds: {{ .Values.minReadySeconds }}

  template:

    metadata:

      labels:

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

        release: {{ .Release.Name }}

        rucio-daemon: hermes2

    {{- with .Values.podLabels }}

        {{- toYaml . | nindent 8 }}

    {{- end }}

    {{- if or .Values.podAnnotations .Values.hermes2.podAnnotations}}

      annotations:

    {{- end }}

    {{- with .Values.podAnnotations }}

        {{- toYaml . | nindent 8 }}

    {{- end }}

    {{- with .Values.hermes2.podAnnotations }}

        {{- toYaml . | nindent 8 }}

    {{- end }}

    spec:

    {{- if .Values.serviceAccountName }}

      serviceAccountName: {{ .Values.serviceAccountName }}

    {{- end }}

      volumes:

{{ if .Values.hermes2.useSSL }}

        - name: usercert

          secret:

            secretName: {{ .Release.Name }}-hermes2-cert

        - name: userkey

          secret:

            secretName: {{ .Release.Name }}-hermes2-key

{{ end }}

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

        - name: {{ $key }}

          secret:

            secretName: {{ $.Release.Name }}-{{ $val.secretName }}

        {{- end}}

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

        - name: {{ $key }}

          persistentVolumeClaim:

            claimName: {{ $val.name }}

        {{- end}}

      containers:

        - name: {{ .Chart.Name }}

          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

          imagePullPolicy: {{ .Values.image.pullPolicy }}

          volumeMounts:

{{ if .Values.hermes2.useSSL }}

            - name: usercert

              mountPath: /opt/rucio/certs/

            - name: userkey

              mountPath: /opt/rucio/keys/

{{ end }}

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}

              subPath: {{ $val.subPath }}

            {{- end}}

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

            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}

            {{- end}}

          ports:

            - name: metrics

              containerPort: 8080

              protocol: TCP

          env:

            {{- 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}}

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

            - name: {{ $key1 | upper }}

              value: "{{ $val1  }}"

            {{- end}}

            - name: RUCIO_DAEMON

              value: "hermes2"

            - name: RUCIO_DAEMON_ARGS

              value: "{{- if .Values.hermes2.threads }} -threads {{ .Values.hermes2.threads }}{{ end }} {{ if .Values.hermes2.bulk }} --bulk {{ .Values.hermes2.bulk }}{{ end }}"

{{- with .Values.hermes2.resources }}

          resources:

{{ toYaml . | trim | indent 12 }}

{{ end }}

{{- with .Values.hermes2.nodeSelector }}

      nodeSelector:

{{ toYaml . | indent 8 }}

{{- end }}

{{- with .Values.hermes2.affinity }}

      affinity:

{{ toYaml . | indent 8 }}

{{- end }}

{{- with .Values.hermes2.tolerations }}

      tolerations:

{{ toYaml . | indent 8 }}

{{- end }}

{{ end }}

rucio-daemons/values.yaml

+17 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ conveyorReceiverCount: 0 
conveyorThrottlerCount: 0

darkReaperCount: 0

hermesCount: 0

hermes2Count: 0

judgeCleanerCount: 0

judgeEvaluatorCount: 0

judgeInjectorCount: 0
@@ -186,6 +187,18 @@ hermes: 
      memory: "200Mi"

      cpu: "700m"



hermes2:

  threads: 1

  podAnnotations: {}

  bulk: 1000

  resources:

    limits:

      memory: "200Mi"

      cpu: "700m"

    requests:

      memory: "200Mi"

      cpu: "700m"



judgeCleaner:

  threads: 1

  podAnnotations: {}
@@ -457,6 +470,10 @@ config: 
    # email_from: "Rucio <atlas-adc-ddm-support@cern.ch"

    # email_test: ""



  # messaging-hermes2:

    # elastic_endpoint:  # _bulk endpoint

    # influxdb_endpoint: # write endpoint



  # tracer-kronos:

    # brokers: "atlas-test-mb.cern.ch"

    # port: "61013"