From e4203010fcf785f889d3f2e9cc119612e39ba602 Mon Sep 17 00:00:00 2001 From: "Dr. Christoph \"Schorsch\" Jung" <c-jung@t-systems.com> Date: Fri, 5 Jul 2024 10:27:36 +0200 Subject: [PATCH] fix: ignore wrecked azure EDC dependencies. make ct more tolerant for startup times because of lacking vault. --- agent-plane/agentplane-azure-vault/pom.xml | 4 ++++ agent-plane/agentplane-hashicorp/pom.xml | 4 ++++ charts/agent-plane-azure-vault/ci/integration-values.yaml | 7 ++++++- charts/agent-plane/ci/integration-values.yaml | 5 +++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/agent-plane/agentplane-azure-vault/pom.xml b/agent-plane/agentplane-azure-vault/pom.xml index fc1fa5b..10174bc 100644 --- a/agent-plane/agentplane-azure-vault/pom.xml +++ b/agent-plane/agentplane-azure-vault/pom.xml @@ -176,6 +176,10 @@ <groupId>org.eclipse.edc</groupId> <artifactId>asset-index-sql</artifactId> </exclusion> + <exclusion> + <groupId>org.eclipse.edc</groupId> + <artifactId>control-plane-spi</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/agent-plane/agentplane-hashicorp/pom.xml b/agent-plane/agentplane-hashicorp/pom.xml index 45f70e0..b545d1d 100644 --- a/agent-plane/agentplane-hashicorp/pom.xml +++ b/agent-plane/agentplane-hashicorp/pom.xml @@ -169,6 +169,10 @@ <groupId>org.eclipse.edc</groupId> <artifactId>asset-index-sql</artifactId> </exclusion> + <exclusion> + <groupId>org.eclipse.edc</groupId> + <artifactId>control-plane-spi</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/charts/agent-plane-azure-vault/ci/integration-values.yaml b/charts/agent-plane-azure-vault/ci/integration-values.yaml index 53afdf0..4081fa2 100644 --- a/charts/agent-plane-azure-vault/ci/integration-values.yaml +++ b/charts/agent-plane-azure-vault/ci/integration-values.yaml @@ -40,7 +40,12 @@ controlplane: hostname: 67dd349198194b508a8fd5e2dd24c173.api.mockbin.io tls: enabled: true - + +livenessProbe: + initialDelaySeconds: 60 +readinessProbe: + initialDelaySeconds: 60 + vault: azure: name: "AZURE_NAME" diff --git a/charts/agent-plane/ci/integration-values.yaml b/charts/agent-plane/ci/integration-values.yaml index 0f2c008..92bf2ca 100644 --- a/charts/agent-plane/ci/integration-values.yaml +++ b/charts/agent-plane/ci/integration-values.yaml @@ -42,6 +42,11 @@ controlplane: tls: enabled: true +livenessProbe: + initialDelaySeconds: 60 +readinessProbe: + initialDelaySeconds: 60 + vault: azure: name: "AZURE_NAME"