From 28f02cdb7a8ca3b23f55d1951cdf9522df6c748d Mon Sep 17 00:00:00 2001 From: Walter Medvedeo Date: Thu, 12 Dec 2024 12:48:13 +0100 Subject: [PATCH] incubator-kie-tools-2796: [sonataflow-operator] Jobs service operator managed deployment is missing the property to disable the kafka-client health checks (#2797) --- .../controller/platform/services/properties_services_test.go | 4 ++++ .../controller/profiles/common/constants/platform_services.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/sonataflow-operator/internal/controller/platform/services/properties_services_test.go b/packages/sonataflow-operator/internal/controller/platform/services/properties_services_test.go index 686022a80ac..67af7665ec0 100644 --- a/packages/sonataflow-operator/internal/controller/platform/services/properties_services_test.go +++ b/packages/sonataflow-operator/internal/controller/platform/services/properties_services_test.go @@ -104,6 +104,7 @@ func generateJobServiceDeploymentDevProperties() *properties.Properties { p.Set("quarkus.http.port", "8080") p.Set("quarkus.kogito.devservices.enabled", "false") p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`, "false") + p.Set(`quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`, "false") p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.management.JobServiceLeaderLivenessHealthCheck".enabled`, "true") p.Set("kogito.jobs-service.management.leader-check.expiration-in-seconds", "60") p.Sort() @@ -130,6 +131,7 @@ func generateJobServiceDeploymentWithPostgreSQLProperties() *properties.Properti p.Set("quarkus.http.port", "8080") p.Set("quarkus.kogito.devservices.enabled", "false") p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`, "false") + p.Set(`quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`, "false") p.Set("quarkus.datasource.reactive.url", "postgresql://postgres:5432/sonataflow?search_path=myschema") p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.management.JobServiceLeaderLivenessHealthCheck".enabled`, "true") p.Set("kogito.jobs-service.management.leader-check.expiration-in-seconds", "60") @@ -147,6 +149,7 @@ func generateJobServiceDeploymentWithDataIndexAndEphemeralProperties() *properti p.Set("quarkus.http.port", "8080") p.Set("quarkus.kogito.devservices.enabled", "false") p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`, "false") + p.Set(`quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`, "false") p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.management.JobServiceLeaderLivenessHealthCheck".enabled`, "true") p.Set("kogito.jobs-service.management.leader-check.expiration-in-seconds", "60") p.Sort() @@ -163,6 +166,7 @@ func generateJobServiceDeploymentWithDataIndexAndPostgreSQLProperties() *propert p.Set("quarkus.http.port", "8080") p.Set("quarkus.kogito.devservices.enabled", "false") p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`, "false") + p.Set(`quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`, "false") p.Set("quarkus.datasource.reactive.url", "postgresql://postgres:5432/sonataflow?search_path=myschema") p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.management.JobServiceLeaderLivenessHealthCheck".enabled`, "true") p.Set("kogito.jobs-service.management.leader-check.expiration-in-seconds", "60") diff --git a/packages/sonataflow-operator/internal/controller/profiles/common/constants/platform_services.go b/packages/sonataflow-operator/internal/controller/profiles/common/constants/platform_services.go index 185f78427e1..4aef6076eeb 100644 --- a/packages/sonataflow-operator/internal/controller/profiles/common/constants/platform_services.go +++ b/packages/sonataflow-operator/internal/controller/profiles/common/constants/platform_services.go @@ -67,7 +67,7 @@ const ( KogitoServiceURLProperty = "kogito.service.url" KogitoServiceURLProtocol = "http" DataIndexKafkaSmallRyeHealthProperty = `quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled` - JobServiceKafkaSmallRyeHealthProperty = `quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled` + JobServiceKafkaSmallRyeHealthProperty = `quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled` JobServiceLeaderLivenessSmallRyeHealthProperty = `quarkus.smallrye-health.check."org.kie.kogito.jobs.service.management.JobServiceLeaderLivenessHealthCheck".enabled` DataIndexKafkaHealthCheck = `quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled` JobServiceKSinkInjectionHealthCheck = `quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`