Helm chart and application version bump

Update nuxt-client to 0.1.0

Update the start-up.sh script to enable starting ZOO-Kernel-FPM as unprivileged user (for better security)

Use the ZOO-Project-DRU image tagged dru-93e1a1d16150d88eb7c9b83d0a3ad076b3e6c9dd (using custom versions of Python modules)

Update rabbitmq to 4.2.5-alpine Docker image

Author: gfenoy

zoo-project-dru/Chart.yaml

@@ -23,13 +23,13 @@ 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.9.3
+version: 0.9.4
 
 # 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.
 # It is recommended to use it with quotes.
-appVersion: "0.2.41"
+appVersion: "0.2.42"
 
 keywords:
   - workflows
@@ -77,16 +77,14 @@ dependencies:
 
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: "Add dask-gateway as optional subchart dependency (dask.enabled)"
-    - kind: added
-      description: "Handle CloudEvents following current pubsub spec relying on the configured sink (k_sink) if set"
-    - kind: added
-      description: "Add stageout-file.yaml CWL wrapper to stage files"
     - kind: changed
-      description: "Use the ZOO-Project-DRU image tagged dru-b567b1dff96b9f720215aaa4da69dbd3a7ffe031 (using custom versions of Python modules)"
-    - kind: added
-      description: "Upgrade calrissian Docker image from terradue/calrissian:0.12.0 to upstream calrissian/calrissian:latest"
+      description: "Use the ZOO-Project-DRU image tagged dru-93e1a1d16150d88eb7c9b83d0a3ad076b3e6c9dd (using custom versions of Python modules)"
+    - kind: changed
+      description: "Update rabbitmq to 4.2.5-alpine Docker image"
+    - kind: changed
+      description: "Update the start-up.sh script to enable starting ZOO-Kernel-FPM as unprivileged user (for better security)"
+    - kind: changed
+      description: "Update nuxt-client to 0.1.0"
 
   artifacthub.io/license: Apache-2.0
 

zoo-project-dru/files/bin/start-up.sh

@@ -1,29 +1,47 @@
 #!/bin/bash
-# Author: Gérald Fenoy
-# Copyright GeoLabs 2021
-set -x
-echo "hello"
+#
+# Author : Gérald FENOY
+#
+# Copyright 2021 GeoLabs SARL. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 mkdir -p /tmp/zTmp/statusInfos
-cp /var/www/html/data/* /usr/com/zoo-project
-chown www-data:www-data -R /tmp/zTmp /usr/com/zoo-project
-chmod 777 -R /tmp/zTmp
 
-CMD="curl -o toto.out {{ include "zoo-project-dru.rabbitmq.serviceName" . }}:15672"
+CMD="curl -o /tmp/toto.out {{ include "zoo-project-dru.rabbitmq.serviceName" . }}:15672"
 $CMD
-cat toto.out
-if [ -e toto.out ]; then echo "Should start" ; else echo wait; sleep 1; $CMD ; fi
 
-while [ ! -e toto.out ]; do echo wait; sleep 1; $CMD ;  done
+if [ -e /tmp/toto.out ]; then echo "Should start" ; else echo wait; sleep 1; $CMD ; fi 
+
+while [ ! -e /tmp/toto.out ]; do echo wait; sleep 1; $CMD ;  done
 
 {{- if not .Values.keda.enabled }}
 echo "START FPM in 5 seconds"
 sleep 5
 {{- end }}
 rm toto.out
 
-cd /usr/lib/cgi-bin
 touch /var/log/zoofpm.log
-chown www-data:www-data /var/log/zoofpm.log
-su www-data -s /bin/bash -c "./zoo_loader_fpm ./main.cfg 2> /var/log/zoofpm.log >> /var/log/zoofpm.log"
 
-echo "STARTING FPM DONE"
+if [ "$(id -u)" = "0" ]; then
+	su www-data -s /bin/bash -c "cd /usr/lib/cgi-bin; ./zoo_loader_fpm ./main.cfg 2> /var/log/zoofpm.log >> /var/log/zoofpm.log"
+else
+	cd /usr/lib/cgi-bin
+	./zoo_loader_fpm ./main.cfg 2> /var/log/zoofpm.log >> /var/log/zoofpm.log
+fi

zoo-project-dru/templates/cm-bin.yaml

@@ -3,4 +3,7 @@ kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-bin-config
 data:
-{{ (tpl (.Files.Glob "files/bin/*").AsConfig . ) | indent 4 }}
+{{- range $path, $_ := .Files.Glob "files/bin/*" }}
+  {{ base $path }}: |
+{{ tpl ($.Files.Get $path) $ | indent 4 }}
+{{- end }}

zoo-project-dru/values.yaml

@@ -172,7 +172,7 @@ zoofpm:
   image:
     repository: zooproject/zoo-project
     pullPolicy: IfNotPresent
-    tag: dru-b567b1dff96b9f720215aaa4da69dbd3a7ffe031
+    tag: dru-93e1a1d16150d88eb7c9b83d0a3ad076b3e6c9dd
   autoscaling:
     enabled: false
   replicaCount: 1
@@ -184,7 +184,7 @@ zookernel:
   image:
     repository: zooproject/zoo-project
     pullPolicy: IfNotPresent
-    tag: dru-b567b1dff96b9f720215aaa4da69dbd3a7ffe031
+    tag: dru-93e1a1d16150d88eb7c9b83d0a3ad076b3e6c9dd
   extraMountPoints: []
 
 notifications:
@@ -281,7 +281,7 @@ rabbitmq:
   enabled: true
   image:
     repository: rabbitmq
-    tag: "4.2.2-alpine"
+    tag: "4.2.5-alpine"
     pullPolicy: IfNotPresent
 
   replicas: 1
@@ -488,7 +488,7 @@ webui:
   image:
     repository: zooproject/nuxt-client
     pullPolicy: IfNotPresent
-    tag: 0.0.9
+    tag: 0.1.0
   enforce: false
   oidc:
     issuer: https://auth.geolabs.fr/realms/zooproject

zoo-project-dru/values_minikube.yaml

@@ -49,10 +49,10 @@ rabbitmq:
   resources:
     limits:
       cpu: 200m
-      memory: 256Mi
+      memory: 512Mi
     requests:
       cpu: 100m
-      memory: 128Mi
+      memory: 256Mi
 
 # KEDA Configuration for Minikube
 # Note: KEDA is installed by Skaffold profile, not by this chart