Merge branch 'develop' into trunk

manifest.yaml

@@ -196,6 +196,9 @@ spec:
             - "bash"
           args:
             - "k8s-queues.sh"
+          PreStop:
+            exec:
+              command: ["/bin/sh","-c","kill -s TERM 1; while test $(ps ax | grep -v grep | grep bash | wc -l) -gt 0; do sleep 2s; done"]
           envFrom:
             - configMapRef:
                 name: ${CI_PROJECT_PATH_SLUG}-config-map
@@ -212,4 +215,4 @@ spec:
       volumes:
         - name: storage
           persistentVolumeClaim:
-            claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
+            claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage