Skip to content

Commit aaf5e2a

Browse files
Merge pull request #930 from emcgrady/master
Merging. We can work to turn it on.
2 parents 240d614 + 46e7288 commit aaf5e2a

File tree

6 files changed

+81
-1
lines changed

6 files changed

+81
-1
lines changed

docker/wf-dashboard/Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# syntax=docker/dockerfile:1
2+
FROM almalinux:9
3+
ENV WDIR=/data
4+
RUN dnf -y install python3 python3-pip
5+
RUN pip install opensearch-py pandas pycurl rucio-clients tqdm
6+
RUN mkdir $WDIR
7+
WORKDIR $WDIR
8+
ENV X509_USER_PROXY=/opt/proxy
9+
RUN dnf -y install git
10+
RUN git clone https://github.com/emcgrady/WFDashboard.git
11+
RUN git clone https://github.com/dmwm/CMSSpark.git
12+
RUN pip install -r CMSSpark/requirements.txt
13+
ENV PYTHONPATH="${PYTHONPATH}:CMSSpark/src/python/CMSSpark"
14+
RUN cp WFDashboard/monit_pull.py $WDIR
15+
ADD rucio.cfg /opt/rucio/etc/
16+
RUN chmod +x monit_pull.py
17+
ENTRYPOINT ["python3", "monit_pull.py"]

docker/wf-dashboard/build_image.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#! /bin/sh
2+
3+
podman build . -t registry.cern.ch/cmsrucio/wf-dashboard:release-0.9
4+
podman push registry.cern.ch/cmsrucio/wf-dashboard:release-0.9

docker/wf-dashboard/rucio.cfg

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Copyright European Organization for Nuclear Research (CERN)
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# You may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6+
#
7+
# Authors:
8+
# - Vincent Garonne, <vgaronne@gmail.com>, 2017
9+
# - Eric Vaandering, <ewv@fnal.gov>, 2018
10+
11+
[common]
12+
[client]
13+
rucio_host = http://cms-rucio.cern.ch
14+
auth_host = https://cms-rucio-auth.cern.ch
15+
auth_type = x509_proxy
16+
ca_cert = /cvmfs/cms.cern.ch/grid/etc/grid-security/certificates/
17+
request_retries = 3

helm/rucio-cron-jobs/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 2.2.1
18+
version: 3.0.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

helm/rucio-cron-jobs/templates/cronjobs.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,3 +123,41 @@ spec:
123123
{{- end }}
124124
command: ['/root/CMSRucio/docker/rucio_client/scripts/k8s_sync_users_links.sh']
125125
restartPolicy: Never
126+
---
127+
apiVersion: batch/v1
128+
kind: CronJob
129+
metadata:
130+
name: {{ .Release.Name }}-wf-dashboard
131+
spec:
132+
schedule: "20 4 * * *"
133+
jobTemplate:
134+
spec:
135+
activeDeadlineSeconds: 7200
136+
backoffLimit: 0
137+
template:
138+
spec:
139+
volumes:
140+
- name: proxy-volume
141+
secret:
142+
defaultMode: 420
143+
secretName: server-rucio-x509up
144+
{{- range $key, $val := .Values.persistentVolumes }}
145+
- name: {{ $key }}
146+
persistentVolumeClaim:
147+
claimName: {{ $val.name }}
148+
{{- end}}
149+
containers:
150+
- name: {{ .Release.Name }}-wf-dashboard
151+
image: registry.cern.ch/cmsrucio/wf-dashboard:release-0.9
152+
imagePullPolicy: {{ .Values.image.pullPolicy }}
153+
volumeMounts:
154+
- mountPath: /opt/proxy
155+
name: proxy-volume
156+
env:
157+
- name: X509_USER_PROXY
158+
value: "/opt/proxy"
159+
{{- with .Values.cronjobSettings.additionalEnvs }}
160+
{{ toYaml . | indent 16 }}
161+
{{- end }}
162+
command: ['python3', 'monit_pull.py']
163+
restartPolicy: Never

helm/rucio-cron-jobs/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,7 @@ nodeSelector: {}
9090
tolerations: []
9191

9292
affinity: {}
93+
94+
wfDashboard: false
95+
# when true, the workflow dashboard will be run in integration and production
96+
# when false, the workflow dashboard will only run in production

0 commit comments

Comments
 (0)