Skip to content

Commit 2dde97d

Browse files
committed
Helm chart and Application version bump
Fix issue #24 Add ingress for websocket and webui for full featured nuxt-client Update the Helm chart documentation
1 parent 2f7b878 commit 2dde97d

19 files changed

Lines changed: 2537 additions & 48 deletions

zoo-project-dru/Chart.yaml

Lines changed: 19 additions & 7 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.2
26+
version: 0.8.3
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.34"
32+
appVersion: "0.2.35"
3333

3434
keywords:
3535
- workflows
@@ -73,15 +73,27 @@ dependencies:
7373
annotations:
7474
artifacthub.io/changes: |
7575
- kind: changed
76-
description: "Update to the latest ZOO-Project-DRU version, including the latest zoo-calrissian-runner"
76+
description: "Update to the latest ZOO-Project-DRU version"
7777
links:
7878
- name: GitHub Commit
79-
url: https://github.com/ZOO-Project/ZOO-Project/commit/16dbe5b1b5c68900db69b1dd0ec3ed669dd82875
79+
url: https://github.com/ZOO-Project/ZOO-Project/commit/0b815fb32ee04eb6bd98164a040cc2733a2b5230
8080
- kind: fixed
81-
description: "Load definition on startup without requiring extra rabbitmq autoSetup"
82-
- kind: fixed
83-
description: "Add options for RabbitMQ probes configuration"
81+
description: "Fix issue #24: service selector mismatch in webui service causes 503 errors"
82+
links:
83+
- name: GitHub Issue
84+
url: https://github.com/ZOO-Project/charts/issues/24
85+
- kind: added
86+
description: "Add eoapi proxy when the eoapi.enabled is set to true"
87+
- kind: added
88+
description: "Add the values.schema.json file to validate user values"
89+
- kind: added
90+
description: "Add options onlyImplicitFlow to the IAM configuration to restrict OpenAPI authentication method"
91+
- kind: added
92+
description: "Add globalNamespace option in oas.cfg configuration file"
93+
- kind: changed
94+
description: "Update DRU Helm chart documentation"
8495
96+
artifacthub.io/license: Apache-2.0
8597

8698
artifacthub.io/links: |
8799
- name: source

zoo-project-dru/README.md

Lines changed: 66 additions & 25 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cp /var/www/html/data/* /usr/com/zoo-project
88
chown www-data:www-data -R /tmp/zTmp /usr/com/zoo-project
99
chmod 777 -R /tmp/zTmp
1010

11-
CMD="curl -o toto.out {{ .Release.Name }}-rabbitmq:15672"
11+
CMD="curl -o toto.out {{ include "zoo-project-dru.rabbitmq.serviceName" . }}:15672"
1212
$CMD
1313
cat toto.out
1414
if [ -e toto.out ]; then echo "Should start" ; else echo wait; sleep 1; $CMD ; fi
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[eoapiRoute]
2+
Title = Basic in filtering
3+
Abstract = This service can be executed as a filter for OGC API - Processes requests before handling them
4+
processVersion = 1
5+
storeSupported = true
6+
statusSupported = true
7+
serviceType = Python
8+
serviceProvider = eoapi_service
9+
<MetaData>
10+
title = My Demo
11+
</MetaData>
12+
<DataInputs>
13+
</DataInputs>
14+
<DataOutputs>
15+
[Result]
16+
Title = The resulting string
17+
Abstract = Unused string
18+
<LiteralData>
19+
DataType = string
20+
<Default>
21+
</Default>
22+
</LiteralData>
23+
</DataOutputs>

zoo-project-dru/files/zoo-project/eoapi_service.py

Lines changed: 287 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Access-Control-Allow-Headers=Content-Type, Accept, Authorization, Origin, Prefer
133133
Access-Control-Allow-Credentials=true
134134

135135
[rabbitmq]
136-
host={{ .Release.Name }}-rabbitmq
136+
host={{ include "zoo-project-dru.rabbitmq.serviceName" . }}
137137
port=5672
138138
user={{ .Values.rabbitmq.auth.username }}
139139
passwd={{ .Values.rabbitmq.auth.password }}

zoo-project-dru/files/zoo-project/oapi-index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,8 @@
2424
<script src="./swagger-ui-bundle.js" charset="UTF-8"> </script>
2525
<script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
2626
<script src="./swagger-initializer.js" charset="UTF-8"> </script>
27+
{{- if .Values.iam.onlyImplicitFlow }}
28+
<script src="./swagger-filter.js"></script>
29+
{{- end }}
2730
</body>
2831
</html>

0 commit comments

Comments
 (0)