Version bump including zoofpm Argo Environmene varaiables

ZOO-Project · Nov 26, 2024 · 38451f1 · 38451f1
1 parent 749bcb2
commit 38451f1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/zoo-project-dru/Chart.yaml b/zoo-project-dru/Chart.yaml
@@ -16,7 +16,7 @@ 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: 0.3.12
+version: 0.3.13
 
 # 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

diff --git a/zoo-project-dru/templates/dp-zoofpm.yaml b/zoo-project-dru/templates/dp-zoofpm.yaml
@@ -81,6 +81,27 @@ spec:
               value: /var/etc/ades/kubeconfig
             {{- end }}
 
+            {{- if .Values.workflow.argo.enabled }}
+            - name: STORAGE_CLASS
+              value: {{ .Values.workflow.argo.storageClass  }}
+            - name: DEFAULT_VOLUME_SIZE
+              value: {{ .Values.workflow.argo.defaultVolumeSize }}
+            - name: DEFAULT_MAX_CORES
+              value: {{ .Values.workflow.argo.defaultMaxCores | toString }}
+            - name: DEFAULT_MAX_RAM
+              value: {{ .Values.workflow.argo.defaultMaxRam }}
+            - name: ARGO_WF_ENDPOINT
+              value: {{ .Values.workflow.argo.wfServer }}
+            - name: ARGO_WF_TOKEN
+              value: {{ .Values.workflow.argo.wfToken }}
+            - name: ARGO_WF_SYNCHRONIZATION_CM
+              value: {{ .Values.workflow.argo.wfSynchronizationCm }}
+            - name: ARGO_CWL_RUNNER_TEMPLATE
+              value: {{ .Values.workflow.argo.CwlRunnerTemplare }}
+            - name: ARGO_CWL_RUNNER_ENTRYPOINT
+              value: {{ .Values.workflow.argo.CwlRunnerEndpoint }}
+            {{- end}}
+
             {{- if .Values.postgresql.enabled }}
             - name: PGHOST
               value: "{{ .Release.Name}}-postgresql-hl"

diff --git a/zoo-project-dru/templates/dp-zookernel.yaml b/zoo-project-dru/templates/dp-zookernel.yaml
@@ -48,26 +48,6 @@ spec:
           env:
             - name: ZOO_REDIS_HOST
               value: {{ .Release.Name }}-redis-master
-            {{- if .Values.workflow.argo.enabled }}
-            - name: STORAGE_CLASS
-              value: {{ .Values.workflow.argo.storageClass  }}
-            - name: DEFAULT_VOLUME_SIZE
-              value: {{ .Values.workflow.argo.defaultVolumeSize }}
-            - name: DEFAULT_MAX_CORES
-              value: {{ .Values.workflow.argo.defaultMaxCores | toString }}
-            - name: DEFAULT_MAX_RAM
-              value: {{ .Values.workflow.argo.defaultMaxRam }}
-            - name: ARGO_WF_ENDPOINT
-              value: {{ .Values.workflow.argo.wfServer }}
-            - name: ARGO_WF_TOKEN
-              value: {{ .Values.workflow.argo.wfToken }}
-            - name: ARGO_WF_SYNCHRONIZATION_CM
-              value: {{ .Values.workflow.argo.wfSynchronizationCm }}
-            - name: ARGO_CWL_RUNNER_TEMPLATE
-              value: {{ .Values.workflow.argo.CwlRunnerTemplare }}
-            - name: ARGO_CWL_RUNNER_ENTRYPOINT
-              value: {{ .Values.workflow.argo.CwlRunnerEndpoint }}
-            {{- end}}
           image: "{{ .Values.zookernel.image.repository }}:{{ .Values.zookernel.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.zookernel.image.pullPolicy }}
           ports: