Skip to content

Commit 86e9016

Browse files
committed
Helm chart and Application versions bump
Update nuxt-client to the upcoming 0.0.9 release Remove the clientSecret from the default values.yaml to avoid security issue (the previous one is now revoked) Fix issue with cwl-loader for loading some CWL files Update to the latest ZOO-Project-DRU version (including fix for GHSA-58pv-8j8x-9vj2) Update the Postgresql docker image to version 16-trixie (16-alpine before), the image is a bit bigger in size but also safer Add support for OGC API - Processes - Part 1: Core 2.0 conformance classes (optional, disabled by default) Add option to skip cwl2ogc schema generation in processDescription responses (disabled by default)
1 parent 7de5369 commit 86e9016

5 files changed

Lines changed: 75 additions & 14 deletions

File tree

zoo-project-dru/Chart.yaml

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ type: application
2323
# This is the chart version. This version number should be incremented each time you make changes
2424
# to the chart and its templates, including the app version.
2525
# Versions are expected to follow Semantic Versioning (https://semver.org/)
26-
version: 0.8.4
26+
version: 0.8.5
2727

2828
# This is the version number of the application being deployed. This version number should be
2929
# incremented each time you make changes to the application. Versions are not expected to
3030
# follow Semantic Versioning. They should reflect the version the application is using.
3131
# It is recommended to use it with quotes.
32-
appVersion: "0.2.36"
32+
appVersion: "0.2.37"
3333

3434
keywords:
3535
- workflows
@@ -73,16 +73,34 @@ dependencies:
7373
annotations:
7474
artifacthub.io/changes: |
7575
- kind: changed
76-
description: "Update to the latest ZOO-Project-DRU version"
76+
description: "Update to the latest ZOO-Project-DRU version (including fix for GHSA-58pv-8j8x-9vj2)"
7777
links:
7878
- name: GitHub Commit
79-
url: https://github.com/ZOO-Project/ZOO-Project/commit/e1a799659515b81812c676f3b245532cdfa7bf24
79+
url: https://github.com/ZOO-Project/ZOO-Project/commit/f4c7c44dbcc9b3333c8b6248e09f2a176c911057
80+
- kind: changed
81+
description: "Update Nuxt client to version 0.0.9"
82+
links:
83+
- name: Nuxt-Client release
84+
url: https://github.com/ZOO-Project/nuxt-client/releases/tag/0.0.9
8085
- kind: fixed
81-
description: "Add parameter to pass the ZOO_REDIS_HOST value to the websocketd deployment"
82-
- kind: added
83-
description: "Add /jobs/{jobId}/results/{outputId} endpoint to retrieve a unique job output"
86+
description: "Fix issue with cwl-loader for loading some CWL files"
87+
links:
88+
- name: GitHub Issue
89+
url: https://github.com/ZOO-Project/charts/issues/25
90+
- kind: fixed
91+
description: "Remove the clientSecret from the default values.yaml to avoid security issue (the previous one is now revoked)"
8492
- kind: changed
85-
description: "Also update the tmpUrl configuration parameter in security_service.py"
93+
description: "Update the Postgresql docker image to version 16-trixie (16-alpine before), the image is a bit bigger in size but also safer"
94+
- kind: added
95+
description: "Add support for OGC API - Processes - Part 1: Core 2.0 conformance classes (optional, disabled by default)"
96+
links:
97+
- name: OGC API - Processes - Part 1: Core 2.0
98+
url: https://ogcapi.github.io/processes/2.0/core/
99+
- kind: added
100+
description: "Add option to skip cwl2ogc schema generation in processDescription responses (disabled by default)"
101+
links:
102+
- name: cwl2ogc GitHub repository
103+
url: https://github.com/eoap/cwl2ogc
86104
87105
artifacthub.io/license: Apache-2.0
88106

zoo-project-dru/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To install the chart with the release name `my-zoo-project-dru`:
2424

2525
````bash
2626
helm repo add zoo-project https://zoo-project.github.io/charts/
27-
helm install my-zoo-project-dru zoo-project/zoo-project-dru --version 0.8.4
27+
helm install my-zoo-project-dru zoo-project/zoo-project-dru --version 0.8.5
2828
````
2929

3030
## Parameters
@@ -202,6 +202,8 @@ For high-availability requirements, consider external Redis cluster solutions
202202
|:---------------------------------|:-------------------------------------------------------------------|:-----------------------------------------------------|
203203
| zoo.promoteHead | Expose endpoints using the HEAD HTTP method in the OpenAPI | true |
204204
| zoo.detectEntrypoint | Dynamically deploy a pod and its associated service to detect docker `ENTRYPOINT` to prepend to existing baseCommand | false |
205+
| zoo.processesv2 | Add OGC API - Processes - Part 1: Core 2.0 conformance classes | false |
206+
| zoo.skipCwl2ogcSchema | When enabled, processDescription responses omit schemas generated by cwl2ogc | false |
205207
| zoo.rabbitmq.definitions | The `definition.json` file containing initial RabbitMQ settings | "files/rabbitmq/definitions.json" |
206208

207209
#### ZOO-Kernel Configuration

zoo-project-dru/files/zoo-project/oas.cfg

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ exceptionsUrl_1=http://www.opengis.net/def/exceptions/ogcapi-processes-2/1.0
5050
use_problem_json_content_type_for_exception=true
5151
include_links_header=true
5252
globalNamespace=anonymous
53+
{{- if .Values.zoo.skipCwl2ogcSchema }}
54+
cwl2ogc_schema=false
55+
{{- end }}
5356

5457
[schemas]
5558
{{- if .Values.iam.openeoAuth.enabled }}
@@ -833,6 +836,7 @@ rootUrl=http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/
833836
extentionsLength=
834837
extentionUrl=http://www.opengis.net/spec/ogcapi-processes-2/1.0/conf/
835838
extentionUrl_1=http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/
839+
extentionUrl_2=http://www.opengis.net/spec/ogcapi-processes-1/2.0/conf/
836840
link=core
837841
link_1=oas30
838842
link_2=json
@@ -861,7 +865,35 @@ extid_12=1
861865
link_13=json
862866
extention_13=true
863867
extid_13=1
868+
{{- if .Values.zoo.processesv2 }}
869+
link_14=core
870+
extention_14=true
871+
extid_14=2
872+
link_15=oas30
873+
extention_15=true
874+
extid_15=2
875+
link_16=json
876+
extention_16=true
877+
extid_16=2
878+
link_17=job-list
879+
extention_17=true
880+
extid_17=2
881+
link_18=dismiss
882+
extention_18=true
883+
extid_18=2
884+
link_19=callback
885+
extention_19=true
886+
extid_19=2
887+
link_20=ogc-process-description
888+
extention_20=true
889+
extid_20=2
890+
link_21=oas
891+
extention_21=true
892+
extid_21=2
893+
length=22
894+
{{- else }}
864895
length=14
896+
{{- end }}
865897

866898
[exception]
867899
abstract=Exception

zoo-project-dru/values.schema.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,14 @@
406406
"type": "boolean",
407407
"description": "Dynamically deploy a pod and its associated service to detect docker ENTRYPOINT to prepend to existing baseCommand"
408408
},
409+
"processesv2": {
410+
"type": "boolean",
411+
"description": "Add OGC API - Processes - Part 1: Core 2.0 conformance classes."
412+
},
413+
"skipCwl2ogcSchema": {
414+
"type": "boolean",
415+
"description": "When enabled, processDescription responses omit schemas generated by cwl2ogc."
416+
},
409417
"rabbitmq": {
410418
"type": "object",
411419
"properties": {

zoo-project-dru/values.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,16 @@ affinity: {}
163163
zoo:
164164
promoteHead: true
165165
detectEntrypoint: false
166+
processesv2: false
167+
skipCwl2ogcSchema: false
166168
rabbitmq:
167169
definitions: "files/rabbitmq/definitions.json.tpl"
168170

169171
zoofpm:
170172
image:
171173
repository: zooproject/zoo-project
172174
pullPolicy: IfNotPresent
173-
tag: dru-e1a799659515b81812c676f3b245532cdfa7bf24
175+
tag: dru-10445f76d7c78b35330af508d82f6ea76bc59d52
174176
autoscaling:
175177
enabled: false
176178
replicaCount: 1
@@ -182,7 +184,7 @@ zookernel:
182184
image:
183185
repository: zooproject/zoo-project
184186
pullPolicy: IfNotPresent
185-
tag: dru-e1a799659515b81812c676f3b245532cdfa7bf24
187+
tag: dru-10445f76d7c78b35330af508d82f6ea76bc59d52
186188
extraMountPoints: []
187189

188190
notifications:
@@ -237,7 +239,7 @@ postgresql:
237239

238240
image:
239241
repository: postgres
240-
tag: "16-alpine"
242+
tag: "16-trixie"
241243
pullPolicy: IfNotPresent
242244

243245
# Resources configuration
@@ -486,7 +488,7 @@ webui:
486488
image:
487489
repository: zooproject/nuxt-client
488490
pullPolicy: IfNotPresent
489-
tag: 0.0.6
491+
tag: 0.0.9
490492
enforce: false
491493
oidc:
492494
issuer: https://auth.geolabs.fr/realms/zooproject
@@ -495,7 +497,6 @@ webui:
495497
authVerifyJwksUri: https://auth.geolabs.fr/realms/zooproject/protocol/openid-connect/certs
496498
scope: "openid email"
497499
clientId: webapp
498-
clientSecret: pyCIFp3rxeCUB6n76XcxzT3kVdGzsv7g
499500

500501
eoapi:
501502
enabled: false

0 commit comments

Comments
 (0)