From b49454605cbe26a196bbd9946d9eb4e526edd4c2 Mon Sep 17 00:00:00 2001 From: Gwenneg Lepage Date: Tue, 7 Nov 2023 19:59:24 +0100 Subject: [PATCH] Make the export service an optional dependency (#2320) --- .rhcicd/clowdapp-engine.yaml | 2 +- engine/src/main/resources/application.properties | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.rhcicd/clowdapp-engine.yaml b/.rhcicd/clowdapp-engine.yaml index 9f01fc3072..5c65b9d3ff 100644 --- a/.rhcicd/clowdapp-engine.yaml +++ b/.rhcicd/clowdapp-engine.yaml @@ -16,10 +16,10 @@ objects: - ingress - notifications-backend - rbac - - export-service - notifications-recipients-resolver optionalDependencies: - sources-api # https://issues.redhat.com/browse/RHCLOUD-23993 + - export-service database: sharedDbAppName: notifications-backend kafkaTopics: diff --git a/engine/src/main/resources/application.properties b/engine/src/main/resources/application.properties index f0efad428b..2fea18dbef 100644 --- a/engine/src/main/resources/application.properties +++ b/engine/src/main/resources/application.properties @@ -185,10 +185,10 @@ sources.psk=development-value-123 # are using a real Export Service application to test the integration, you will # need to set this PSK in the PSKS environment variable on that end. export-service.psk=development-value-123 -quarkus.rest-client.export-service.url=${clowder.private-endpoints.export-service-service.url:http://localhost:10010} -quarkus.rest-client.export-service.trust-store=${clowder.private-endpoints.export-service-service.trust-store-path} -quarkus.rest-client.export-service.trust-store-password=${clowder.private-endpoints.export-service-service.trust-store-password} -quarkus.rest-client.export-service.trust-store-type=${clowder.private-endpoints.export-service-service.trust-store-type} +quarkus.rest-client.export-service.url=${clowder.optional-private-endpoints.export-service-service.url:http://localhost:10010} +quarkus.rest-client.export-service.trust-store=${clowder.optional-private-endpoints.export-service-service.trust-store-path} +quarkus.rest-client.export-service.trust-store-password=${clowder.optional-private-endpoints.export-service-service.trust-store-password} +quarkus.rest-client.export-service.trust-store-type=${clowder.optional-private-endpoints.export-service-service.trust-store-type} # Quarkus caches quarkus.cache.caffeine.drawer-template.expire-after-write=PT5M