Skip to content

Commit b326ea3

Browse files
fix deployments, add OTLP to dataplane
1 parent e0ddc09 commit b326ea3

8 files changed

Lines changed: 19 additions & 13 deletions

File tree

k8s/apps/cfm-agents.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
containers:
3636
- name: keycloak-agent
3737
image: ghcr.io/eclipse-cfm/cfm/kcagent:latest
38-
imagePullPolicy: Never
38+
imagePullPolicy: Always
3939
command: [ "/kcagent" ]
4040
args: [
4141
"--mode=debug"
@@ -49,7 +49,7 @@ spec:
4949
readOnly: true
5050
- name: edcv-agent
5151
image: ghcr.io/eclipse-cfm/cfm/edcvagent:latest
52-
imagePullPolicy: Never
52+
imagePullPolicy: Always
5353
command: [ "/edcvagent" ]
5454
args: [
5555
"--mode=debug"
@@ -63,7 +63,7 @@ spec:
6363
readOnly: true
6464
- name: registration-agent
6565
image: ghcr.io/eclipse-cfm/cfm/regagent:latest
66-
imagePullPolicy: Never
66+
imagePullPolicy: Always
6767
command: [ "/regagent" ]
6868
args: [
6969
"--mode=debug"
@@ -77,7 +77,7 @@ spec:
7777
readOnly: true
7878
- name: onboarding-agent
7979
image: ghcr.io/eclipse-cfm/cfm/obagent:latest
80-
imagePullPolicy: Never
80+
imagePullPolicy: Always
8181
command: [ "/obagent" ]
8282
args: [
8383
"--mode=debug"

k8s/apps/dataplane.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ spec:
3939
envFrom:
4040
- configMapRef:
4141
name: dataplane-config
42+
- configMapRef:
43+
name: telemetry-config
44+
env:
45+
- name: OTEL_SERVICE_NAME
46+
value: "edc.dataplane"
4247
ports:
4348
- containerPort: 11002
4449
name: public-port

k8s/apps/provision-manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
containers:
3636
- name: provision-manager
3737
image: ghcr.io/eclipse-cfm/cfm/pmanager:latest
38-
imagePullPolicy: Never
38+
imagePullPolicy: Always
3939
command: [ "/pmanager" ]
4040
args: [
4141
"--mode=debug"

k8s/apps/tenant-manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
containers:
3636
- name: tenant-manager
3737
image: ghcr.io/eclipse-cfm/cfm/tmanager:latest
38-
imagePullPolicy: Never
38+
imagePullPolicy: Always
3939
command: [ "/tmanager" ]
4040
args: [
4141
"--mode=debug"

k8s/base/vault.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,11 @@ spec:
4141
value: "root"
4242
- name: VAULT_DEV_LISTEN_ADDRESS
4343
value: "0.0.0.0:8200"
44+
- name: SKIP_SETCAP
45+
value: "true"
4446
args:
4547
- "server"
4648
- "-dev"
47-
securityContext:
48-
capabilities:
49-
add:
50-
- IPC_LOCK
5149
---
5250
apiVersion: v1
5351
kind: ServiceAccount

launchers/dataplane/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ dependencies {
2929
runtimeOnly(libs.edc.core.participantcontext.config)
3030
runtimeOnly(libs.edc.vault.hashicorp)
3131
runtimeOnly(libs.edc.bom.dataplane.sql)
32+
33+
runtimeOnly(libs.opentelemetry.exporter.otlp)
3234
}
3335

3436
tasks.shadowJar {

launchers/dataplane/src/main/docker/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ FROM eclipse-temurin:24.0.2_12-jre-alpine
44
# Optional JVM arguments, such as memory settings
55
ARG JVM_ARGS=""
66
ARG JAR
7+
ARG OTEL_AGENT
78

89
RUN apk --no-cache add curl
910

1011
WORKDIR /app
1112

12-
13+
COPY ${OTEL_AGENT} opentelemetry-javaagent.jar
1314
COPY ${JAR} edc-dataplane.jar
1415

1516

@@ -20,4 +21,4 @@ HEALTHCHECK --interval=5s --timeout=5s --retries=10 CMD curl --fail http://local
2021
ENV ENV_JVM_ARGS=$JVM_ARGS
2122
# need the sh -c syntax so that the SECRETS variable gets expanded
2223
# use the "exec" syntax so that SIGINT reaches the JVM -> graceful termination
23-
CMD ["sh", "-c", "exec java -Djava.security.egd=file:/dev/urandom -jar edc-dataplane.jar --log-level=debug"]
24+
CMD ["sh", "-c", "exec java -javaagent:opentelemetry-javaagent.jar -Djava.security.egd=file:/dev/urandom -jar edc-dataplane.jar --log-level=debug"]

requests/EDC-V Onboarding/CFM - Provision Consumer/Deploy Participant Profile.bru

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ post {
1313
body:json {
1414
{
1515
"id": "{{$randomAlphaNumeric}}",
16-
"identifier": "{{participant_did}}-{{$randomNamePrefix}}",
16+
"identifier": "{{participant_did}}-{{$randomUUID}}",
1717
"properties": {},
1818
"cellId": "{{cell_id}}",
1919
"version": 0,

0 commit comments

Comments
 (0)