Skip to content
This repository has been archived by the owner on Jul 31, 2024. It is now read-only.

Commit

Permalink
Deploy dsba changes (#12)
Browse files Browse the repository at this point in the history
* Dev/provider (#5)

* Add keyrock

* Increase chart version

* Add PDP

* Add kong

* Adding AS

* Add AS to DSC values

* Add participant label

* Change issuer version and add data volume

* Fix data volume

* Test AS pre-release

* Change to latest AS release

* Switch to default PDC values

* Rename folder of PDP

* Make DID CM optional

* Renaming walt-id chart

* Renaimg default URLs and secret names for walt chart name change

* verifier using did registry (#6)

* Verifier using DID Registry (#8)

* Allow to disable certain apps when deploying with Helm and various fixes for plain Helm deployment with Ingress (#10)

* Allow to disable certain apps when deploying with Helm

* Adding example values file

* Add waltId ingress

* Updating walt-id config and adding keycloak

* Update doc

* Adding verifier

* Add TIL

* Remove doubled PDP app

* Adding Keyrock and dsba-pdp

* Adding kong

* Adding AS

* Extend doc

* Update examples/service-provider-ips/README.md

Fix typo

Co-authored-by: Tim Smyth <[email protected]>

---------

Co-authored-by: Tim Smyth <[email protected]>
Co-authored-by: Tim Smyth <[email protected]>

* Updated images of keycloak-vc-issuer and waltid (#11)

---------

Co-authored-by: Dennis Wendland <[email protected]>
Co-authored-by: Tim Smyth <[email protected]>
Co-authored-by: Tim Smyth <[email protected]>
  • Loading branch information
4 people authored Aug 29, 2023
1 parent 56e6854 commit bc44078
Show file tree
Hide file tree
Showing 22 changed files with 1,956 additions and 85 deletions.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,10 @@ The chart is [generated](generate.sh) on each merge to master from the current a
# set version you are interested in
version=0.0.1
wget https://github.com/FIWARE-Ops/data-space-connector/releases/download/data-space-connector-$version/data-space-connector-$version.tgz | && tar -xzvf data-space-connector-$version.tgz
```
```


### Examples

Different examples for the deployment of the FIWARE Data Space connector can be found
under [./examples](./examples).
2 changes: 1 addition & 1 deletion applications/activation-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ appVersion: "2.2.0"
dependencies:
- name: activation-service
version: 2.2.1
repository: https://i4Trust.github.io/helm-charts
repository: https://i4trust.github.io/helm-charts
4 changes: 2 additions & 2 deletions applications/credentials-config-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: credentials-config-service
description: Chart holder for argo-cd

type: application
version: 0.0.1
version: 0.0.4
appVersion: "0.0.1"

dependencies:
- name: credentials-config-service
version: 0.0.1
version: 0.0.4
repository: https://fiware.github.io/helm-charts
2 changes: 1 addition & 1 deletion applications/keycloak/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: keycloak
description: A Helm chart for Kubernetes to deploy Keycloak
type: application
version: 13.0.3
version: 13.0.4
appVersion: "17.0.1"
dependencies:
- name: keycloak
Expand Down
9 changes: 8 additions & 1 deletion applications/keycloak/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ keycloak:
# Init containers for VC issuer and loading of DID
initContainers:
- name: add-vc-issuer
image: quay.io/fiware/keycloak-vc-issuer:0.5.0
image: quay.io/fiware/keycloak-vc-issuer:1.0.1
imagePullPolicy: Always
volumeMounts:
- name: providers
Expand Down Expand Up @@ -119,3 +119,10 @@ didConfig:

# x5u for DID web
x5u: "https://provider.com/certs/tls.crt"

# OpenShift Route config
route:
enabled: false
host: my-host.org
tls: {}
certificate: {}
4 changes: 2 additions & 2 deletions applications/keyrock/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: keyrock
description: Chart holder for argo-cd

type: application
version: 0.7.2
version: 0.7.4
appVersion: "8.3.3"

dependencies:
- name: keyrock
version: 0.7.2
version: 0.7.5
repository: https://fiware.github.io/helm-charts
2 changes: 1 addition & 1 deletion applications/kong/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kong:
image:
repository: quay.io/fiware/kong
tag: "0.5.2"
tag: "0.5.6"
pullPolicy: IfNotPresent

replicaCount: 1
Expand Down
4 changes: 2 additions & 2 deletions applications/orion-ld/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: orion-ld
description: Chart holder for argo-cd

type: application
version: 1.2.3
version: 1.2.6
appVersion: "1.0.1"

dependencies:
- name: orion
version: 1.2.3
version: 1.2.6
repository: https://fiware.github.io/helm-charts
12 changes: 0 additions & 12 deletions applications/pdp/Chart.yaml

This file was deleted.

51 changes: 0 additions & 51 deletions applications/pdp/values.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions applications/trusted-issuers-list/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: trusted-issuers-list
description: Chart holder for argo-cd

type: application
version: 0.1.0
version: 0.3.2
appVersion: "0.0.3"

dependencies:
- name: trusted-issuers-list
version: 0.1.0
version: 0.3.2
repository: https://fiware.github.io/helm-charts
12 changes: 12 additions & 0 deletions applications/trusted-issuers-list/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ trusted-issuers-list:
image:
tag: 0.0.3

# Configure an Ingress or OpenShift Route
ingress:
til:
enabled: false
tir:
enabled: false
route:
til:
enabled: false
tir:
enabled: false

# Database config
database:
persistence: true
Expand Down
4 changes: 2 additions & 2 deletions applications/vcwaltid/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: vcwaltid
description: Chart holder for argo-cd

type: application
version: 0.0.16
version: 0.0.17
appVersion: "0.0.1"

dependencies:
- name: vcwaltid
version: 0.0.17
repository: https://i4Trust.github.io/helm-charts
repository: https://i4trust.github.io/helm-charts
32 changes: 32 additions & 0 deletions applications/vcwaltid/templates/ingress-certs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "waltid.fullname" . -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "waltid.fullname" . }}-certs
labels:
{{ include "waltid.labels" . | nindent 4 }}
annotations:
{{- with .Values.ingress.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingress.class}}
rules:
- host: {{ .Values.ingress.host}}
http:
paths:
- pathType: Prefix
path: "/certs"
backend:
service:
name: {{ include "waltid.fullname" . }}-certs
port:
number: 3000
{{- if .Values.ingress.tls.enabled }}
tls:
- hosts:
- {{ .Values.ingress.host}}
secretName: {{ include "waltid.fullname" . }}-tls-sec
{{- end }}
{{- end }}
33 changes: 33 additions & 0 deletions applications/vcwaltid/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "waltid.fullname" . -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "waltid.fullname" . }}
labels:
{{ include "waltid.labels" . | nindent 4 }}
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /v1/did/{{ .Values.did }}
{{- with .Values.ingress.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingress.class}}
rules:
- host: {{ .Values.ingress.host}}
http:
paths:
- pathType: Prefix
path: "/did/did.json"
backend:
service:
name: {{ $fullName }}
port:
number: 7000
{{- if .Values.ingress.tls.enabled }}
tls:
- hosts:
- {{ .Values.ingress.host}}
secretName: {{ include "waltid.fullname" . }}-tls-sec
{{- end }}
{{- end }}
13 changes: 10 additions & 3 deletions applications/vcwaltid/values.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
# Organisation DID
did: did:web:my-did:did

# Networking
route:
enabled: false
ingress:
enabled: false
class: nginx

# Walt-id config
vcwaltid:

# Image
deployment:
image:
repository: quay.io/fiware/waltid
tag: 1.14.1-SNAPSHOT
image:
repository: waltid/ssikit
tag: 1.2306281817.jwt-sign-rsa
pullPolicy: Always

# API config
Expand Down
2 changes: 1 addition & 1 deletion applications/verifier/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ appVersion: "2.0.3"
dependencies:
- name: vcverifier
version: 1.0.9
repository: https://i4Trust.github.io/helm-charts
repository: https://i4trust.github.io/helm-charts
4 changes: 2 additions & 2 deletions data-space-connector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ applications:
helm_values:
- values.yaml

- name: pdp
- name: dsba-pdp
enabled: true
source_path: applications/pdp
source_path: applications/dsba-pdp
source_ref: *branch
destination: *destination
helm_values:
Expand Down
28 changes: 28 additions & 0 deletions examples/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Examples

Different examples for the deployment of the FIWARE Data Space Connector


## IPS Service Provider (helm)

This is an example of a data service provider, providing a fictitious digital service
for packet delivery services as a company called `IPS`.

The service is provided by the orion-ld ontext Broker via the NGSI-LD API, offering
access to the entities of certain delivery orders.

The example uses plain helm for the deployment.

* [./service-provider-ips](./service-provider-ips)



## Packet Delivery Company (ArgoCD)

This is an example of a data service provider called Packet Delivery Company (PDC).

Basically, it's identical to IPS above, but deployment is performed via
[GitOps pattern](https://www.gitops.tech/) and [ArgoCD](https://argo-cd.readthedocs.io/en/stable/).

The configuration can be found at the
[fiware-gitops repository](https://github.com/FIWARE-Ops/fiware-gitops/tree/master/aws/dsba/packet-delivery/data-space-connector).
36 changes: 36 additions & 0 deletions examples/service-provider-ips/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Service Provider - IPS

Example deployment of a packet delivery service provider named IPS.


## Prerequisites

Assuming existing namespace `ips`, where the connector will be deployed.

Assuming [nginx-ingress](https://docs.nginx.com/nginx-ingress-controller/) as Ingress Controller
and [cert-manager](https://cert-manager.io/) being configured to issue certificates
for domain `*.aws.fiware.io` with ClusterIssuer `letsencrypt-fiware-eks`.
When using a different Ingress Controller or specific load balancer, make sure to add
the necessary annotations.
Also change the domains and hostnames according to your DNS config.

It is assumed, that the organisation IPS is part of a data space where the trusted participant list
can be found at [https://tir.dsba.fiware.dev](https://tir.dsba.fiware.dev).
When operating a different data space with different trusted participant list, change this
accordingly.


## Deployment with helm

After downloading the chart (see [../../README.md#deployment-with-helm](../../README.md#deployment-with-helm)),
use the following command:
```shell
helm install -n ips -f ./values-dsc.yaml ips-dsc <PATH-TO-DSC>/data-space-connector/charts/data-space-connector
```

Alternatively, install using the remote chart:
```shell
helm repo add dsc https://fiware-ops.github.io/data-space-connector/
helm install -n ips -f ./values-dsc.yaml ips-dsc dsc/data-space-connector
```

Loading

0 comments on commit bc44078

Please sign in to comment.