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

Merge pull request #103 from astroclark/add-resource-requests 

Add resource requests for CronJobs
parents 7a4aea00 db586c1c

charts/rucio-server/Chart.yaml

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

version: 1.29.2

version: 1.29.3

apiVersion: v1

description: A Helm chart to deploy servers for Rucio

keywords:

charts/rucio-server/templates/auth_deployment.yaml

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ spec: 
          volumeMounts:

          - name: httpdlog

            mountPath: /var/log/httpd

          resources:

{{ toYaml .Values.errorLogsExporterResources | indent 12 }}            

{{- end }}

{{- if .Values.monitoring.enabled }}

        - name: apache-exporter

charts/rucio-server/templates/automatic-restart-cronjob.yaml

+2 −0
Original line number Diff line number Diff line
@@ -15,5 +15,7 @@ spec: 
              image: "{{ .Values.automaticRestart.image.repository }}:{{ .Values.automaticRestart.image.tag }}"

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

              command: ["/bin/sh", "-c", "kubectl get deployment -l {{ .Values.automaticRestart.selectorLabel }} -o jsonpath='{.items[*].metadata.name}' | tr ' ' '\n' | xargs -n 1 kubectl rollout restart deployment"]

              resources:

{{ toYaml .Values.automaticRestart.resources | indent 15 }}

          restartPolicy: OnFailure

{{ end }}

charts/rucio-server/templates/renew-fts-cronjob.yaml

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
    - name: renew-fts-cron

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

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

      resources:

{{ toYaml .Values.ftsRenewal.resources | indent 15 }}

      volumeMounts:

  {{- if or (eq .Values.ftsRenewal.vo "atlas") (eq .Values.ftsRenewal.vo "dteam") }}

        - name: longproxy

charts/rucio-server/values.yaml

+14 −0
Original line number Diff line number Diff line
@@ -124,6 +124,13 @@ ftsRenewal: 
  vo: "cms"

  voms: "cms:/cms/Role=production"

  servers: "https://fts3-devel.cern.ch:8446,https://cmsfts3.fnal.gov:8446,https://fts3.cern.ch:8446,https://lcgfts3.gridpp.rl.ac.uk:8446,https://fts3-pilot.cern.ch:8446"

  resources:

    limits:

      cpu: 500m

      memory: 256Mi

    requests:

      cpu: 100m

      memory: 128Mi



automaticRestart:

  enabled: 0
@@ -133,6 +140,13 @@ automaticRestart: 
    pullPolicy: IfNotPresent

  schedule: "0 0 * * *"

  selectorLabel: "'app in (rucio-server,rucio-server-trace,rucio-server-auth)'"

  resources:

    limits:

     cpu: 500m

     memory: 256Mi

    requests:

     cpu: 100m

     memory: 128Mi



additionalSecrets: {}

  # gcssecret: