Merge pull request #935 from emcgrady/master

helm conditional added

Author: ericvaandering

helm/rucio-cron-jobs/Chart.yaml

@@ -15,9 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.0
+version: 3.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 appVersion: latest
+

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

@@ -123,41 +123,3 @@ spec:
 {{- end }}
               command: ['/root/CMSRucio/docker/rucio_client/scripts/k8s_sync_users_links.sh']
           restartPolicy: Never
----
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: {{ .Release.Name }}-wf-dashboard
-spec:
-  schedule: "20 4 * * *"
-  jobTemplate:
-    spec:
-      activeDeadlineSeconds: 7200
-      backoffLimit: 0
-      template:
-        spec:
-          volumes:
-          - name: proxy-volume
-            secret:
-              defaultMode: 420
-              secretName: server-rucio-x509up
-          {{- range $key, $val := .Values.persistentVolumes }}
-          - name: {{ $key }}
-            persistentVolumeClaim:
-              claimName: {{ $val.name }}
-          {{- end}}
-          containers:
-            - name: {{ .Release.Name }}-wf-dashboard
-              image: registry.cern.ch/cmsrucio/wf-dashboard:release-0.9
-              imagePullPolicy: {{ .Values.image.pullPolicy }}
-              volumeMounts:
-                - mountPath: /opt/proxy
-                  name: proxy-volume
-              env: 
-                - name: X509_USER_PROXY
-                  value: "/opt/proxy"
-{{- with .Values.cronjobSettings.additionalEnvs }}
-{{ toYaml . | indent 16 }}
-{{- end }}
-              command: ['python3', 'monit_pull.py']
-          restartPolicy: Never

helm/rucio-cron-jobs/templates/wf-dashboard.yaml

@@ -0,0 +1,44 @@
+{{- if .Values.wf-dashboard.enabled -}}
+{{- $fullName := include "rucio-cron-jobs.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+apiVersion: batch/v1
+kind: cron-job
+metadata:
+  name: {{ .Release.Name }}-wf-dashboard
+  labels:
+    {{- include "rucio-cron-jobs.labels" . | nindent 4 }}
+  {{- end }}
+spec:
+  schedule: "20 4 * * *"
+  jobTemplate:
+    spec:
+      activeDeadlineSeconds: 14400
+      backoffLimit: 0
+      template:
+        spec:
+          volumes:
+          - name: proxy-volume
+            secret:
+              defaultMode: 420
+              secretName: server-rucio-x509up
+          {{- range $key, $val := .Values.persistentVolumes }}
+          - name: {{ $key }}
+            persistentVolumeClaim:
+              claimName: {{ $val.name }}
+          {{- end}}
+          containers:
+            - name: {{ .Release.Name }}-wf-dashboard
+              image: registry.cern.ch/cmsrucio/wf-dashboard:release-0.9
+              imagePullPolicy: {{ .Values.image.pullPolicy }}
+              volumeMounts:
+                - mountPath: /opt/proxy
+                  name: proxy-volume
+              env: 
+                - name: X509_USER_PROXY
+                  value: "/opt/proxy"
+{{- with .Values.cronjobSettings.additionalEnvs }}
+{{ toYaml . | indent 16 }}
+{{- end }}
+              command: ['python3', 'monit_pull.py']
+          restartPolicy: Never
+{{- end }}

helm/rucio-cron-jobs/values.yaml

@@ -91,6 +91,5 @@ tolerations: []
 
 affinity: {}
 
-wfDashboard: false
-  # when true, the workflow dashboard will be run in integration and production
-  # when false, the workflow dashboard will only run in production
+wf-dashboard: 
+  enabled: false