Skip to content

Commit c0544b3

Browse files
wistefanwistefan
authored
Merge pull request #68 from FIWARE/fix-local-deploy
Fix local deploy
2 parents ab9a92c + 240ceac commit c0544b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+3107
-515
lines changed

‎.github/workflows/test.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
sudo modprobe br_netfilter
2020
2121
- name: Execute tests
22-
id: test
22+
id: test
23+
continue-on-error: true
2324
run: |
24-
mvn clean integration-test -Ptest
25+
mvn clean integration-test -Ptest

‎README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ recipes.
3535
- [Deployment with Helm](#deployment-with-helm)
3636
- [Testing](#testing)
3737
- [Additional documentation and resources](#additional-documentation-and-resources)
38+
- [Marketplace Integration](#marketplace-integration)
3839
- [Ongoing Work](#ongoing-work)
3940
- [Additional documentation](#additional-documentation)
4041
- [Additional Resources](#additional-resources)
@@ -368,6 +369,12 @@ the [test-scenarios](./it/src/test/resources/it/mvds_basic.feature) against it.
368369

369370
## Additional documentation and resources
370371

372+
### Marketplace Integration
373+
374+
In order to share data and data-services, a marketplace to connect Consumer and Provider is required. The FIWARE Data Space Connector integrates with the [FIWARE BAE Marketplace](https://github.com/FIWARE-TMForum) to not only provide a Catalog-API, but also a human-friendly UI and automatic integration with the authentication/authorization system.
375+
376+
Find more information in the dedicated [Marketplace Integration Section](./doc/MARKETPLACE_INTEGRATION.md)
377+
371378
### Ongoing Work
372379
The FIWARE Data Space Connector is constantly beeing developed and extended with new features. Their status and some previews will be listed [here](./doc/ONGOING_WORK.md).
373380
A presentation about the ongoing work and future developments for the FIWARE Data Space Connector can be found on [Youtube](https://www.youtube.com/watch?v=bZAzOHIdSr8).

‎charts/data-space-connector/Chart.yaml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: data-space-connector
33
description: Umbrella Chart for the FIWARE Data Space Connector, combining all essential parts to be used by a participant.
44
type: application
5-
version: 7.37.4
5+
version: 24.0.0
66
dependencies:
77
- name: postgresql
88
condition: postgresql.enabled
@@ -11,11 +11,11 @@ dependencies:
1111
# authentication
1212
- name: vcverifier
1313
condition: vcverifier.enabled
14-
version: 2.13.0
14+
version: 4.0.0
1515
repository: https://fiware.github.io/helm-charts
1616
- name: credentials-config-service
1717
condition: credentials-config-service.enabled
18-
version: 1.0.0
18+
version: 2.1.12
1919
repository: https://fiware.github.io/helm-charts
2020
- name: trusted-issuers-list
2121
condition: trusted-issuers-list.enabled
@@ -53,14 +53,24 @@ dependencies:
5353
# issuance
5454
- name: keycloak
5555
condition: keycloak.enabled
56-
version: 24.0.1
56+
version: 24.6.1
5757
repository: https://charts.bitnami.com/bitnami
5858
# contract management
5959
- name: tm-forum-api
6060
condition: tm-forum-api.enabled
61-
version: 0.13.5
61+
version: 0.14.1
6262
repository: https://fiware.github.io/helm-charts
6363
- name: contract-management
6464
condition: contract-management.enabled
65-
version: 1.0.4
65+
version: 1.0.8
6666
repository: https://fiware.github.io/helm-charts
67+
# marketplace
68+
- name: business-api-ecosystem
69+
alias: marketplace
70+
condition: marketplace.enabled
71+
version: 0.11.19
72+
repository: https://fiware.github.io/helm-charts
73+
- name: mongodb
74+
condition: mongodb.enabled
75+
version: 16.5.21
76+
repository: oci://registry-1.docker.io/bitnamicharts

‎charts/data-space-connector/templates/bae-did.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: v1
2+
kind: Secret
3+
type: Opaque
4+
metadata:
5+
name: bae-did-secret
6+
namespace: {{ $.Release.Namespace | quote }}
7+
labels:
8+
{{ include "dsc.labels" . | nindent 4 }}
9+
data:
10+
privateKey: YjI0YzkwNmM5Y2Q2YTczOTE5MWQ3ZTQxN2U1MTk0YzRlNDM3OGEyYjFjOWY0Y2Y0ZDkzZTA0YzAyMGY2Mzc2OQ==

‎charts/data-space-connector/templates/bae-prep-cm.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{- if and (eq .Values.marketplace.enabled true) (.Values.marketplace.prep) }}
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: {{ .Values.marketplace.prep.name }}
6+
namespace: {{ $.Release.Namespace | quote }}
7+
labels:
8+
{{ include "dsc.labels" . | nindent 4 }}
9+
data:
10+
{{- toYaml .Values.marketplace.prep.script | nindent 2 }}
11+
{{- end }}

‎charts/data-space-connector/templates/dataplane-registration.yaml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (eq .Values.scorpio.enabled true) (.Values.scorpio.ccs) }}
1+
{{- if and (eq .Values.scorpio.enabled true) (.Values.scorpio.ccs) (eq .Values.scorpio.ccs.enabled true) }}
22
apiVersion: v1
33
kind: ConfigMap
44
metadata:
@@ -18,17 +18,19 @@ data:
1818
"defaultOidcScope": {{ .Values.scorpio.ccs.defaultOidcScope.name | quote }},
1919
{{- if and (.Values.scorpio.ccs.defaultOidcScope.credentialType) (.Values.scorpio.ccs.defaultOidcScope.trustedParticipantsLists) (.Values.scorpio.ccs.defaultOidcScope.trustedIssuersLists) -}}
2020
"oidcScopes": {
21-
{{ .Values.scorpio.ccs.defaultOidcScope.name | quote }}: [
22-
{
23-
"type": {{ .Values.scorpio.ccs.defaultOidcScope.credentialType | quote }},
24-
"trustedParticipantsLists": [
25-
{{ .Values.scorpio.ccs.defaultOidcScope.trustedParticipantsLists | quote }}
26-
],
27-
"trustedIssuersLists": [
28-
{{ .Values.scorpio.ccs.defaultOidcScope.trustedIssuersLists | quote }}
29-
]
30-
}
31-
]
21+
{{ .Values.scorpio.ccs.defaultOidcScope.name | quote }}: {
22+
"credentials": [
23+
{
24+
"type": {{ .Values.scorpio.ccs.defaultOidcScope.credentialType | quote }},
25+
"trustedParticipantsLists": [
26+
{{ .Values.scorpio.ccs.defaultOidcScope.trustedParticipantsLists | quote }}
27+
],
28+
"trustedIssuersLists": [
29+
{{ .Values.scorpio.ccs.defaultOidcScope.trustedIssuersLists | quote }}
30+
]
31+
}
32+
]
33+
}
3234
}
3335
{{- end }}
3436
{{- if .Values.scorpio.ccs.oidcScopes -}}

‎charts/data-space-connector/templates/marketplace-env-var-secret.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{- if .Values.marketplace.generatePasswords.enabled }}
2+
apiVersion: v1
3+
kind: Secret
4+
type: Opaque
5+
metadata:
6+
name: {{ .Values.marketplace.generatePasswords.secretName }}-env
7+
namespace: {{ $.Release.Namespace | quote }}
8+
labels:
9+
{{ include "dsc.labels" . | nindent 4 }}
10+
data:
11+
MONGO_BAE_BELP_PW: {{ randAlphaNum 30 | b64enc | quote }}
12+
MONGO_BAE_CHARGING_PW: {{ randAlphaNum 30 | b64enc | quote }}
13+
{{- end }}

‎charts/data-space-connector/templates/marketplace-secrets.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{- if .Values.marketplace.generatePasswords.enabled }}
2+
apiVersion: v1
3+
kind: Secret
4+
type: Opaque
5+
metadata:
6+
name: {{ .Values.marketplace.generatePasswords.secretName }}
7+
namespace: {{ $.Release.Namespace | quote }}
8+
labels:
9+
{{ include "dsc.labels" . | nindent 4 }}
10+
data:
11+
mongodb-root-password: {{ randAlphaNum 30 | b64enc | quote }}
12+
mongodb-password: {{ randAlphaNum 30 | b64enc | quote }}
13+
{{- end }}

‎charts/data-space-connector/templates/mongodb-init.yaml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{{- if .Values.mongodb.enabled }}
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: mongodb-bae-configmap
6+
namespace: {{ $.Release.Namespace | quote }}
7+
data:
8+
init-db.sh: |
9+
mongosh <<EOF
10+
11+
var rootUser = '$MONGODB_ROOT_USER';
12+
var rootPassword = '$MONGODB_ROOT_PASSWORD';
13+
var admin = db.getSiblingDB('admin');
14+
admin.auth(rootUser, rootPassword);
15+
16+
use charging_db;
17+
var passwd = '$MONGO_BAE_CHARGING_PW';
18+
db.createUser(
19+
{
20+
user: 'charging',
21+
pwd: passwd,
22+
roles: [
23+
{
24+
role: 'readWrite',
25+
db: 'charging_db'
26+
}
27+
]
28+
});
29+
30+
use belp_db;
31+
var passwd = '$MONGO_BAE_BELP_PW';
32+
db.createUser(
33+
{
34+
user: 'belp',
35+
pwd: passwd,
36+
roles: [
37+
{
38+
role: 'readWrite',
39+
db: 'belp_db'
40+
}
41+
]
42+
});
43+
{{- end }}

‎charts/data-space-connector/templates/participant-registration-job.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{{- if .Values.registration.enabled }}
2+
apiVersion: batch/v1
3+
kind: Job
4+
metadata:
5+
name: {{ .Values.registration.configMap }}
6+
namespace: {{ $.Release.Namespace | quote }}
7+
labels:
8+
{{- include "dsc.labels" . | nindent 4 }}
9+
spec:
10+
template:
11+
spec:
12+
containers:
13+
- name: register-credential-config
14+
image: quay.io/curl/curl:8.1.2
15+
command: [ "/bin/sh", "-c", "/bin/init.sh" ]
16+
volumeMounts:
17+
- name: participant-registration
18+
mountPath: /bin/init.sh
19+
subPath: init.sh
20+
volumes:
21+
- name: participant-registration
22+
configMap:
23+
name: {{ .Values.registration.configMap }}
24+
defaultMode: 0755
25+
26+
restartPolicy: Never
27+
backoffLimit: 10
28+
{{- end }}

0 commit comments

Comments
 (0)