Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 0 additions & 70 deletions .github/workflows/discord-webhook.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/run-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ jobs:
- name: "Load runtime images into KinD"
run: |
kind load docker-image -n dcp-demo \
ghcr.io/eclipse-edc/minimumviabledataspace/controlplane:latest \
ghcr.io/eclipse-edc/minimumviabledataspace/dataplane:latest \
ghcr.io/eclipse-edc/minimumviabledataspace/identity-hub:latest \
ghcr.io/eclipse-edc/minimumviabledataspace/issuerservice:latest
ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/controlplane:latest \
ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/dataplane:latest \
ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/identity-hub:latest \
ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/issuerservice:latest

- name: "Update image pull policy"
run: |-
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ fixes of all upstream components.
> We have monitoring systems in place that inform us about broken builds. No need to raise issues about this.

More conservative developers may fall back
to [releases of MVD](https://github.com/eclipse-edc/MinimumViableDataspace/releases) that use release versions of all
to [releases of MVD](https://github.com/eclipse-dataspace-hub/minimumviabledataspace/releases) that use release versions of all
upstream components. If this is you, then remember to check out the appropriate tag after cloning the repo.

Either download the ZIP file and use sources therein, or check out the corresponding tag.
Expand Down Expand Up @@ -221,10 +221,10 @@ All commands are executed from the **repository's root folder** unless stated ot
> namespace, plainly for the sake of simplicity.

This builds the runtime images and creates the following docker images:
`ghcr.io/eclipse-edc/minimumviabledataspace/controlplane:latest`,
`ghcr.io/eclipse-edc/minimumviabledataspace/dataplane:latest`,
`ghcr.io/eclipse-edc/minimumviabledataspace/issuerservice:latest` and
`ghcr.io/eclipse-edc/minimumviabledataspace/identity-hub:latest` in the local docker image cache.
`ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/controlplane:latest`,
`ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/dataplane:latest`,
`ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/issuerservice:latest` and
`ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/identity-hub:latest` in the local docker image cache.

PostgreSQL and Hashicorp Vault obviously require additional configuration, which is handled by the Kubernetes manifests
via batch jobs.
Expand Down Expand Up @@ -262,10 +262,10 @@ grep -rlZ "imagePullPolicy: Always" k8s | xargs sed -i "s/imagePullPolicy: Alway

# Load docker images into KinD
kind load docker-image \
ghcr.io/eclipse-edc/minimumviabledataspace/controlplane:latest \
ghcr.io/eclipse-edc/minimumviabledataspace/dataplane:latest \
ghcr.io/eclipse-edc/minimumviabledataspace/identity-hub:latest \
ghcr.io/eclipse-edc/minimumviabledataspace/issuerservice:latest -n mvd
ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/controlplane:latest \
ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/dataplane:latest \
ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/identity-hub:latest \
ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/issuerservice:latest -n mvd
```

#### 4.2.3 Deploy MVD components
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body:json {
"issuancePolicy": null,
"reissuancePolicy": null,
"verifiableCredentialContainer": {
"format": "VC1_0_JWT",
"format": "vc11-sl2021/jwt",
"rawVc": "eyJraWQiOiJkaWQ6d2ViOmRhdGFzcGFjZS1pc3N1ZXIubXZkLWlzc3Vlci5zdmMuY2x1c3Rlci5sb2NhbCNrZXktMSIsInR5cCI6IkpXVCIsImFsZyI6IkVkRFNBIn0.eyJpc3MiOiJkaWQ6d2ViOmRhdGFzcGFjZS1pc3N1ZXIubXZkLWlzc3Vlci5zdmMuY2x1c3Rlci5sb2NhbCIsImF1ZCI6ImRpZDp3ZWI6Y29uc3VtZXItaWRlbnRpdHlodWIubXZkLWNvbnN1bWVyLXNlY3VyaXR5LnN2Yy5jbHVzdGVyLmxvY2FsJTNBNzA4Mzpjb25zdW1lciIsInN1YiI6ImRpZDp3ZWI6Y29uc3VtZXItaWRlbnRpdHlodWIubXZkLWNvbnN1bWVyLXNlY3VyaXR5LnN2Yy5jbHVzdGVyLmxvY2FsJTNBNzA4Mzpjb25zdW1lciIsInZjIjp7IkBjb250ZXh0IjpbImh0dHBzOi8vd3d3LnczLm9yZy8yMDE4L2NyZWRlbnRpYWxzL3YxIiwiaHR0cHM6Ly93M2lkLm9yZy9zZWN1cml0eS9zdWl0ZXMvandzLTIwMjAvdjEiLCJodHRwczovL3d3dy53My5vcmcvbnMvZGlkL3YxIix7Im12ZC1jcmVkZW50aWFscyI6Imh0dHBzOi8vdzNpZC5vcmcvbXZkL2NyZWRlbnRpYWxzLyIsImNvbnRyYWN0VmVyc2lvbiI6Im12ZC1jcmVkZW50aWFsczpjb250cmFjdFZlcnNpb24iLCJsZXZlbCI6Im12ZC1jcmVkZW50aWFsczpsZXZlbCJ9XSwiaWQiOiJodHRwOi8vb3JnLnlvdXJkYXRhc3BhY2UuY29tL2NyZWRlbnRpYWxzLzIzNDciLCJ0eXBlIjpbIlZlcmlmaWFibGVDcmVkZW50aWFsIiwiRGF0YVByb2Nlc3NvckNyZWRlbnRpYWwiXSwiaXNzdWVyIjoiZGlkOndlYjpkYXRhc3BhY2UtaXNzdWVyLm12ZC1pc3N1ZXIuc3ZjLmNsdXN0ZXIubG9jYWwiLCJpc3N1YW5jZURhdGUiOiIyMDIzLTA4LTE4VDAwOjAwOjAwWiIsImNyZWRlbnRpYWxTdWJqZWN0Ijp7ImlkIjoiZGlkOndlYjpjb25zdW1lci1pZGVudGl0eWh1Yi5tdmQtY29uc3VtZXItc2VjdXJpdHkuc3ZjLmNsdXN0ZXIubG9jYWwlM0E3MDgzOmNvbnN1bWVyIiwiY29udHJhY3RWZXJzaW9uIjoiMS4wLjAiLCJsZXZlbCI6InByb2Nlc3NpbmcifX0sImlhdCI6MTc1Mjc1MzA2NX0.aBs8_vc-LPIkmci1-fWU_TEAm-Nze8SQEiho_sSIdzS220RooPaMzJadiPetKBMopua_qddxYjefWRmUtGEvAw",
"credential": {
"credentialSubject": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ body:json {
"issuerDid": "{{ISSUER_DID}}",
"holderPid": "{{$guid}}",
"credentials": [{
"format": "VC2_0_JOSE",
"format": "vc20-bssl/jwt",
"type": "MembershipCredential",
"id": "membership-credential-def"
},
{
"format": "VC2_0_JOSE",
"format": "vc20-bssl/jwt",
"type": "ManufacturerCredential",
"id": "manufacturer-credential-def"
}]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ body:json {
}
],
"validity": "<long>",
"formats": ["VC2_0_JOSE"]
"formats": ["vc20-bssl/jwt"]
}
}

Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ subprojects {
tasks.register("dockerize", DockerBuildImage::class) {
val dockerContextDir = project.projectDir
dockerFile.set(file("$dockerContextDir/src/main/docker/Dockerfile"))
images.add("ghcr.io/eclipse-edc/minimumviabledataspace/${project.name}:${project.version}")
images.add("ghcr.io/eclipse-edc/minimumviabledataspace/${project.name}:latest")
images.add("ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/${project.name}:${project.version}")
images.add("ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/${project.name}:latest")
// specify platform with the -Dplatform flag:
if (System.getProperty("platform") != null)
platform.set(System.getProperty("platform"))
Expand Down
2 changes: 1 addition & 1 deletion k8s/consumer/application/controlplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: controlplane
image: ghcr.io/eclipse-edc/minimumviabledataspace/controlplane:latest
image: ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/controlplane:latest
imagePullPolicy: Always
envFrom:
- configMapRef: { name: controlplane-config }
Expand Down
2 changes: 1 addition & 1 deletion k8s/consumer/application/dataplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: dataplane
image: ghcr.io/eclipse-edc/minimumviabledataspace/dataplane:latest
image: ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/dataplane:latest
imagePullPolicy: Always
envFrom:
- configMapRef:
Expand Down
4 changes: 2 additions & 2 deletions k8s/consumer/application/identityhub-seed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,12 @@ spec:
\"issuerDid\": \"did:web:issuerservice.issuer.svc.cluster.local%3A10016:issuer\",
\"holderPid\": \"${HOLDER_PID}\",
\"credentials\": [{
\"format\": \"VC2_0_JOSE\",
\"format\": \"vc20-bssl/jwt\",
\"type\": \"MembershipCredential\",
\"id\": \"membership-credential-def\"
},
{
\"format\": \"VC2_0_JOSE\",
\"format\": \"vc20-bssl/jwt\",
\"type\": \"ManufacturerCredential\",
\"id\": \"manufacturer-credential-def\"
}]
Expand Down
2 changes: 1 addition & 1 deletion k8s/consumer/application/identityhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
spec:
containers:
- name: identityhub
image: ghcr.io/eclipse-edc/minimumviabledataspace/identity-hub:latest
image: ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/identity-hub:latest
imagePullPolicy: Always
envFrom:
- configMapRef:
Expand Down
8 changes: 8 additions & 0 deletions k8s/consumer/base/vault.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ spec:
image: hashicorp/vault:latest
ports:
- containerPort: 8200
securityContext:
capabilities:
add:
- IPC_LOCK
env:
- name: VAULT_DEV_ROOT_TOKEN_ID
value: "root"
Expand Down Expand Up @@ -69,6 +73,10 @@ spec:
containers:
- name: vault-cli
image: hashicorp/vault:latest
securityContext:
capabilities:
add:
- IPC_LOCK
env:
- name: VAULT_ADDR
value: "http://vault.consumer.svc.cluster.local:8200"
Expand Down
4 changes: 2 additions & 2 deletions k8s/issuer/application/issuerservice-seed-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ spec:
}
],
"rules": [],
"format": "VC2_0_JOSE",
"format": "vc20-bssl/jwt",
"validity": "604800"
}'
Expand Down Expand Up @@ -317,7 +317,7 @@ spec:
}
],
"rules": [],
"format": "VC2_0_JOSE",
"format": "vc20-bssl/jwt",
"validity": "604800"
}'
Expand Down
2 changes: 1 addition & 1 deletion k8s/issuer/application/issuerservice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
spec:
containers:
- name: issuerservice
image: ghcr.io/eclipse-edc/minimumviabledataspace/issuerservice:latest
image: ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/issuerservice:latest
imagePullPolicy: Always
ports:
- containerPort: 80
Expand Down
4 changes: 4 additions & 0 deletions k8s/issuer/base/vault.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ spec:
value: "http://vault.issuer.svc.cluster.local:8200"
- name: VAULT_TOKEN
value: "root"
securityContext:
capabilities:
add:
- IPC_LOCK
command: [ "sh", "-ec" ]
args:
- |
Expand Down
2 changes: 1 addition & 1 deletion k8s/provider/application/controlplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: controlplane
image: ghcr.io/eclipse-edc/minimumviabledataspace/controlplane:latest
image: ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/controlplane:latest
imagePullPolicy: Always
envFrom:
- configMapRef: { name: controlplane-config }
Expand Down
2 changes: 1 addition & 1 deletion k8s/provider/application/dataplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: dataplane
image: ghcr.io/eclipse-edc/minimumviabledataspace/dataplane:latest
image: ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/dataplane:latest
imagePullPolicy: Always
envFrom:
- configMapRef:
Expand Down
4 changes: 2 additions & 2 deletions k8s/provider/application/identityhub-seed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,12 @@ spec:
\"issuerDid\": \"did:web:issuerservice.issuer.svc.cluster.local%3A10016:issuer\",
\"holderPid\": \"${HOLDER_PID}\",
\"credentials\": [{
\"format\": \"VC2_0_JOSE\",
\"format\": \"vc20-bssl/jwt\",
\"type\": \"MembershipCredential\",
\"id\": \"membership-credential-def\"
},
{
\"format\": \"VC2_0_JOSE\",
\"format\": \"vc20-bssl/jwt\",
\"type\": \"ManufacturerCredential\",
\"id\": \"manufacturer-credential-def\"
}]
Expand Down
2 changes: 1 addition & 1 deletion k8s/provider/application/identityhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
spec:
containers:
- name: identityhub
image: ghcr.io/eclipse-edc/minimumviabledataspace/identity-hub:latest
image: ghcr.io/eclipse-dataspace-hub/minimumviabledataspace/identity-hub:latest
imagePullPolicy: Always
envFrom:
- configMapRef:
Expand Down
5 changes: 5 additions & 0 deletions k8s/provider/base/vault.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ spec:
image: hashicorp/vault:latest
ports:
- containerPort: 8200

env:
- name: VAULT_DEV_ROOT_TOKEN_ID
value: "root"
Expand Down Expand Up @@ -75,6 +76,10 @@ spec:
value: "http://vault.provider.svc.cluster.local:8200"
- name: VAULT_TOKEN
value: "root"
securityContext:
capabilities:
add:
- IPC_LOCK
command: [ "sh", "-ec" ]
args:
- |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void makeCredentialRequest_expectCredential() {
"issuerDid": "%s",
"holderPid": "%s",
"credentials": [
{"format": "VC2_0_JOSE", "type": "MembershipCredential", "id": "membership-credential-def"}
{"format": "vc20-bssl/jwt", "type": "MembershipCredential", "id": "membership-credential-def"}
]
}
""".formatted(ISSUER_DID, HOLDER_PID))
Expand Down
Loading