Merge pull request #55 from rcarpa/rename_reaper2_to_reaper (c4d03c20) · Commits · Rucio / helm-charts

rucio-daemons/Chart.yaml

+1 −1

Original line number	Diff line number	Diff line
		name: rucio-daemons
		version: 1.2.8
		version: 1.3.0
		apiVersion: v1
		description: A Helm chart to deploy daemons for Rucio
		keywords:

rucio-daemons/templates/reaper.yaml

+5 −1

Original line number	Diff line number	Diff line
		@@ -80,6 +80,10 @@ spec:
		- name: {{ $key }}
		mountPath: {{ $val.mountPath }}
		{{- end}}
		ports:
		- name: metrics
		containerPort: 8080
		protocol: TCP
		env:
		{{- range $key1, $val1 := .Values.config }}
		{{- range $key2, $val2 := $val1}}
		@@ -97,7 +101,7 @@ spec:
		- name: RUCIO_DAEMON
		value: "reaper"
		- name: RUCIO_DAEMON_ARGS
		value: '{{ if .Values.reaper.greedy }} --greedy {{ end }} --total-workers {{ .Values.reaper.workers }} --threads-per-worker {{ .Values.reaper.threadsPerWorker }} {{ if .Values.reaper.scheme }}--scheme {{ .Values.reaper.scheme }}{{ end }}{{ if .Values.reaper.includeRses }} --include-rses="{{ .Values.reaper.includeRses }}"{{ end }}{{ if .Values.reaper.rses }} --rses {{ .Values.reaper.rses }}{{ end }}'
		value: '{{- if .Values.reaper.greedy }}--greedy {{ end }}{{- if .Values.reaper.threads }} --threads {{ .Values.reaper.threads }}{{end}} {{- if .Values.reaper.scheme }} --scheme {{ .Values.reaper.scheme }}{{ end }}{{- if .Values.reaper.includeDids }} --include-dids="{{ .Values.reaper.includeDids }}"{{ end }}{{- if .Values.reaper.excludeDids }} --exclude-dids="{{ .Values.reaper.excludeDids }}"{{ end }} {{- if .Values.reaper.includeRses }} --include-rses="{{ .Values.reaper.includeRses }}"{{ end }} {{- if .Values.reaper.rses }} --rses {{ .Values.reaper.rses }}{{ end }} {{- if .Values.reaper.chunkSize }} --chunk-size {{ .Values.reaper.chunkSize }}{{ end }} {{- if .Values.reaper.excludeRses }} --exclude-rses="{{ .Values.reaper.excludeRses }}"{{ end }} {{- if .Values.reaper.delaySeconds }} --delay-seconds {{ .Values.reaper.delaySeconds }}{{end}} {{- if .Values.reaper.sleepTime }} --sleep-time {{ .Values.reaper.sleepTime }}{{end}}'
		- name: GLOBUS_THREAD_MODEL
		value: "pthread"
		- name: RUCIO_HOME

rucio-daemons/templates/reaper2.yaml

deleted100644 → 0

+0 −127

Original line number	Diff line number	Diff line
		{{- if gt .Values.reaper2Count 0.0 -}}
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		name: {{ .Release.Name }}-reaper2
		labels:
		app: {{ template "rucio.name" . }}
		chart: {{ template "rucio.chart" . }}
		release: {{ .Release.Name }}
		heritage: {{ .Release.Service }}
		spec:
		replicas: {{ .Values.reaper2Count }}
		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: reaper2
		{{- with .Values.podLabels }}
		{{- toYaml . \| nindent 8 }}
		{{- end }}
		{{- if or .Values.podAnnotations .Values.reaper2.podAnnotations}}
		annotations:
		{{- end }}
		{{- with .Values.podAnnotations }}
		{{- toYaml . \| nindent 8 }}
		{{- end }}
		{{- with .Values.reaper2.podAnnotations }}
		{{- toYaml . \| nindent 8 }}
		{{- end }}
		spec:
		{{- if .Values.serviceAccountName }}
		serviceAccountName: {{ .Values.serviceAccountName }}
		{{- end }}
		volumes:
		- name: proxy-volume
		secret:
		secretName: {{ .Release.Name }}-rucio-x509up
		- name: ca-volume
		secret:
		secretName: {{ .Release.Name }}-rucio-ca-bundle-reaper
		{{- 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:
		- name: proxy-volume
		mountPath: /opt/proxy
		- name: ca-volume
		mountPath: /etc/grid-security/certificates
		{{- 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: "reaper2"
		- name: RUCIO_DAEMON_ARGS
		value: '{{- if .Values.reaper2.greedy }}--greedy {{ end }}{{- if .Values.reaper2.threads }} --threads {{ .Values.reaper2.threads }}{{end}} {{- if .Values.reaper2.scheme }} --scheme {{ .Values.reaper2.scheme }}{{ end }}{{- if .Values.reaper2.includeDids }} --include-dids="{{ .Values.reaper2.includeDids }}"{{ end }}{{- if .Values.reaper2.excludeDids }} --exclude-dids="{{ .Values.reaper2.excludeDids }}"{{ end }} {{- if .Values.reaper2.includeRses }} --include-rses="{{ .Values.reaper2.includeRses }}"{{ end }} {{- if .Values.reaper2.rses }} --rses {{ .Values.reaper2.rses }}{{ end }} {{- if .Values.reaper2.chunkSize }} --chunk-size {{ .Values.reaper2.chunkSize }}{{ end }} {{- if .Values.reaper2.excludeRses }} --exclude-rses="{{ .Values.reaper2.excludeRses }}"{{ end }} {{- if .Values.reaper2.delaySeconds }} --delay-seconds {{ .Values.reaper2.delaySeconds }}{{end}} {{- if .Values.reaper2.sleepTime }} --sleep-time {{ .Values.reaper2.sleepTime }}{{end}}'
		- name: GLOBUS_THREAD_MODEL
		value: "pthread"
		- name: RUCIO_HOME
		value: "/opt/rucio/reaper"
		- name: X509_USER_PROXY
		value: "/opt/proxy/x509up"
		{{- with .Values.reaper2.resources }}
		resources:
		{{ toYaml . \| trim \| indent 12 }}
		{{ end }}
		{{- with .Values.reaper2.nodeSelector }}
		nodeSelector:
		{{ toYaml . \| indent 8 }}
		{{- end }}
		{{- with .Values.reaper2.affinity }}
		affinity:
		{{ toYaml . \| indent 8 }}
		{{- end }}
		{{- with .Values.reaper2.tolerations }}
		tolerations:
		{{ toYaml . \| indent 8 }}
		{{- end }}
		{{ end }}

rucio-daemons/values.yaml

+0 −16

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ judgeRepairerCount: 0
		oauthManagerCount: 0
		undertakerCount: 0
		reaperCount: 0
		reaper2Count: 0
		transmogrifierCount: 0
		tracerKronosCount: 0
		minosCount: 0
		@@ -279,21 +278,6 @@ undertaker:
		cpu: "700m"

		reaper:
		greedy: 0
		scheme: ""
		workers: 1
		threadsPerWorker: 4
		includeRses: ""
		podAnnotations: {}
		resources:
		limits:
		memory: "200Mi"
		cpu: "700m"
		requests:
		memory: "200Mi"
		cpu: "700m"

		reaper2:
		greedy: 0
		scheme: ""
		threads: 4