diff --git a/docs/src/main/asciidoc/stork-reference.adoc b/docs/src/main/asciidoc/stork-reference.adoc index c08622dbb6407..c0ebaea23db7c 100644 --- a/docs/src/main/asciidoc/stork-reference.adoc +++ b/docs/src/main/asciidoc/stork-reference.adoc @@ -49,8 +49,8 @@ For each service expected to be exposed as a Kubernetes Service, configure the l [source, properties] ---- -stork.my-service.service-discovery=kubernetes -stork.my-service.service-discovery.k8s-namespace=my-namespace +quarkus.stork.service-configuration.my-service.service-discovery.type=kubernetes +quarkus.stork.service-configuration.my-service.service-discovery.params.k8s-namespace=my-namespace ---- Stork looks for the Kubernetes Service with the given name (`my-service` in the previous example) in the specified namespace. @@ -110,7 +110,7 @@ This type is used in the configuration to reference the provider: [source, properties] ---- -stork.my-service.service-discovery=acme +quarkus.stork.service-configuration.my-service.service-discovery.type=acme ---- The first step consists of implementing the `io.smallrye.stork.spi.ServiceDiscoveryProvider` interface: @@ -148,7 +148,7 @@ public class AcmeServiceDiscoveryProvider // <3> This implementation is straightforward. <1> `@ServiceDiscoveryType` annotation defines the type of the service discovery provider. For each `ServiceDiscoveryProvider` annotated with this annotation, a configuration class will be generated. The name of the configuration class is constructed by appending `Configuration` to the name of the provider. -<2> Use `@ServiceDiscoveryAttribute` to define configuration properties for services configured with this service discovery provider. Configuration properties are gathered from all properties of a form: `stork.my-service.service-discovery.attr=value`. +<2> Use `@ServiceDiscoveryAttribute` to define configuration properties for services configured with this service discovery provider. Configuration properties are gathered from all properties of a form: `quarkus.stork.service-configuration.my-service.service-discovery.params.attr=value`. <3> The provider needs to implement `ServiceDiscoveryType` typed by the configuration class. <4> `createServiceDiscovery` method is the factory method. It receives the configuration and access to the name of the service and available infrastructure. @@ -201,9 +201,9 @@ Then, in the configuration, just add: [source, properties] ---- -stork.my-service.service-discovery=acme -stork.my-service.service-discovery.host=localhost -stork.my-service.service-discovery.port=1234 +quarkus.stork.service-configuration.my-service.service-discovery.type=acme +quarkus.stork.service-configuration.my-service.service-discovery.params.host=localhost +quarkus.stork.service-configuration.my-service.service-discovery.params.port=1234 ---- Then, Stork will use your implementation to locate the `my-service` service. @@ -256,7 +256,7 @@ This _type_ is used in the configuration to reference the provider: [source, properties] ---- -stork.my-service.load-balancer=acme +quarkus.stork.service-configuration.my-service.load-balancer.type=acme ---- Similarly to `ServiceDiscoveryProvider, a `LoadBalancerProvider` implementation needs to be annotated with `@LoadBalancerType` that defines the _type_. @@ -336,8 +336,8 @@ Then, in the configuration, just add: [source, properties] ---- -stork.my-service.service-discovery=... -stork.my-service.load-balancer=acme +quarkus.stork.service-configuration.my-service.service-discovery.type=... +quarkus.stork.service-configuration.my-service.load-balancer.type=acme ---- Then, Stork will use your implementation to select the `my-service` service instance. diff --git a/docs/src/main/asciidoc/stork.adoc b/docs/src/main/asciidoc/stork.adoc index 099d33912201d..f39bade8c235b 100644 --- a/docs/src/main/asciidoc/stork.adoc +++ b/docs/src/main/asciidoc/stork.adoc @@ -307,10 +307,10 @@ In the `src/main/resources/application.properties`, add: consul.host=localhost consul.port=8500 -stork.my-service.service-discovery=consul -stork.my-service.service-discovery.consul-host=localhost -stork.my-service.service-discovery.consul-port=8500 -stork.my-service.load-balancer=round-robin +quarkus.stork.service-configuration.my-service.service-discovery.type=consul +quarkus.stork.service-configuration.my-service.service-discovery.params.consul-host=localhost +quarkus.stork.service-configuration.my-service.service-discovery.params.consul-port=8500 +quarkus.stork.service-configuration.my-service.load-balancer.type=round-robin ---- The first two lines provide the Consul location used by the `Registration` bean. @@ -318,8 +318,8 @@ The first two lines provide the Consul location used by the `Registration` bean. The other properties are related to Stork. `stork.my-service.service-discovery` indicates which type of service discovery we will be using to locate the `my-service` service. In our case, it's `consul`. -`stork.my-service.service-discovery.consul-host` and `stork.my-service.service-discovery.consul-port` configures the access to Consul. -Finally, `stork.my-service.load-balancer` configures the service selection. +`quarkus.stork.service-configuration.my-service.service-discovery.params.consul-host` and `quarkus.stork.service-configuration.my-service.service-discovery.params.consul-port` configures the access to Consul. +Finally, `quarkus.stork.service-configuration.my-service.load-balancer.type` configures the service selection. In our case, we use a `round-robin`. == Running the application diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkDevModeTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkDevModeTest.java index 5575d6e695a56..11bd067e06a08 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkDevModeTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkDevModeTest.java @@ -57,8 +57,8 @@ void shouldModifyStorkSettings() { // @formatter:on TEST.modifyResourceFile("application.properties", - v -> v.replaceAll("stork.hello-service.service-discovery.address-list=.*", - "stork.hello-service.service-discovery.address-list=localhost:8766")); + v -> v.replaceAll("quarkus.stork.service-configuration.hello-service.service-discovery.params.address-list=.*", + "quarkus.stork.service-configuration.hello-service.service-discovery.params.address-list=localhost:8766")); // @formatter:off when() .get("/helper") diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-application.properties b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-application.properties index 9be930f64b7db..630a201aa1074 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-application.properties +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-application.properties @@ -1,5 +1,5 @@ -stork.hello-service.service-discovery=static -stork.hello-service.service-discovery.address-list=${quarkus.http.host}:${quarkus.http.test-port} -stork.hello-service.load-balancer=least-response-time +quarkus.stork.service-configuration.hello-service.service-discovery.type=static +quarkus.stork.service-configuration.hello-service.service-discovery.params.address-list=${quarkus.http.host}:${quarkus.http.test-port} +quarkus.stork.service-configuration.hello-service.load-balancer.type=least-response-time hello2/mp-rest/url=stork://hello-service/hello diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-dev-application.properties b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-dev-application.properties index 97c18da51f2bc..36231a6e59489 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-dev-application.properties +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-dev-application.properties @@ -1,5 +1,5 @@ -stork.hello-service.service-discovery=static -stork.hello-service.service-discovery.address-list=${quarkus.http.host}:${quarkus.http.port} -stork.hello-service.load-balancer=least-response-time +quarkus.stork.service-configuration.hello-service.service-discovery.type=static +quarkus.stork.service-configuration.hello-service.service-discovery.params.address-list=${quarkus.http.host}:${quarkus.http.port} +quarkus.stork.service-configuration.hello-service.load-balancer.type=least-response-time hello2/mp-rest/url=stork://hello-service/hello diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-stat-lb.properties b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-stat-lb.properties index d7ebe87048c41..06d43cb4729d6 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-stat-lb.properties +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/stork-stat-lb.properties @@ -1,4 +1,4 @@ -stork.hello-service.service-discovery=static -stork.hello-service.service-discovery.address-list=${quarkus.http.host}:${quarkus.http.test-port},localhost:8766 -stork.hello-service.load-balancer=least-response-time +quarkus.stork.service-configuration.hello-service.service-discovery.type=static +quarkus.stork.service-configuration.hello-service.service-discovery.params.address-list=${quarkus.http.host}:${quarkus.http.test-port},localhost:8766 +quarkus.stork.service-configuration.hello-service.load-balancer.type=least-response-time hello2/mp-rest/url=stork://hello-service/hello diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml b/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml index beee5450bbceb..db21c51c49a9b 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml @@ -28,8 +28,16 @@ io.smallrye.stork - stork-microprofile-config + stork-api + + io.smallrye.stork + stork-core + + + + + org.eclipse.microprofile.rest.client microprofile-rest-client-api diff --git a/extensions/smallrye-stork/deployment/src/main/java/io/quarkus/stork/deployment/SmallRyeStorkProcessor.java b/extensions/smallrye-stork/deployment/src/main/java/io/quarkus/stork/deployment/SmallRyeStorkProcessor.java index 4133832be3d85..45d96371a0f69 100644 --- a/extensions/smallrye-stork/deployment/src/main/java/io/quarkus/stork/deployment/SmallRyeStorkProcessor.java +++ b/extensions/smallrye-stork/deployment/src/main/java/io/quarkus/stork/deployment/SmallRyeStorkProcessor.java @@ -12,8 +12,9 @@ import io.quarkus.deployment.builditem.ShutdownContextBuildItem; import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; import io.quarkus.stork.SmallRyeStorkRecorder; +import io.quarkus.stork.StorkConfigProvider; +import io.quarkus.stork.StorkConfiguration; import io.quarkus.vertx.deployment.VertxBuildItem; -import io.smallrye.stork.microprofile.MicroProfileConfigProvider; import io.smallrye.stork.spi.internal.LoadBalancerLoader; import io.smallrye.stork.spi.internal.ServiceDiscoveryLoader; @@ -22,7 +23,7 @@ public class SmallRyeStorkProcessor { @BuildStep void registerServiceProviders(BuildProducer services) { services.produce(new ServiceProviderBuildItem(io.smallrye.stork.spi.config.ConfigProvider.class.getName(), - MicroProfileConfigProvider.class.getName())); + StorkConfigProvider.class.getName())); for (Class providerClass : asList(LoadBalancerLoader.class, ServiceDiscoveryLoader.class)) { services.produce(ServiceProviderBuildItem.allProvidersFromClassPath(providerClass.getName())); @@ -33,7 +34,9 @@ void registerServiceProviders(BuildProducer services) @Record(ExecutionTime.RUNTIME_INIT) @Consume(RuntimeConfigSetupCompleteBuildItem.class) @Consume(SyntheticBeansRuntimeInitBuildItem.class) - void initializeStork(SmallRyeStorkRecorder storkRecorder, ShutdownContextBuildItem shutdown, VertxBuildItem vertx) { - storkRecorder.initialize(shutdown, vertx.getVertx()); + void initializeStork(SmallRyeStorkRecorder storkRecorder, ShutdownContextBuildItem shutdown, VertxBuildItem vertx, + StorkConfiguration configuration) { + storkRecorder.initialize(shutdown, vertx.getVertx(), configuration); } + } diff --git a/extensions/smallrye-stork/runtime/pom.xml b/extensions/smallrye-stork/runtime/pom.xml index 382ec8f8a6e26..c41b82681ad48 100644 --- a/extensions/smallrye-stork/runtime/pom.xml +++ b/extensions/smallrye-stork/runtime/pom.xml @@ -16,7 +16,11 @@ io.smallrye.stork - stork-microprofile-config + stork-api + + + io.smallrye.stork + stork-core io.quarkus diff --git a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/ServiceConfiguration.java b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/ServiceConfiguration.java new file mode 100644 index 0000000000000..a5d170359a1a4 --- /dev/null +++ b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/ServiceConfiguration.java @@ -0,0 +1,19 @@ +package io.quarkus.stork; + +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; + +@ConfigGroup +public class ServiceConfiguration { + /** + * ServiceDiscovery configuration for the service + */ + @ConfigItem + public StorkServiceDiscoveryConfiguration serviceDiscovery; + + /** + * LoadBalancer configuration for the service + */ + @ConfigItem + public StorkLoadBalancerConfiguration loadBalancer; +} diff --git a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/SmallRyeStorkRecorder.java b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/SmallRyeStorkRecorder.java index 20c9295e41982..dd82473fdac6c 100644 --- a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/SmallRyeStorkRecorder.java +++ b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/SmallRyeStorkRecorder.java @@ -1,15 +1,20 @@ package io.quarkus.stork; +import java.util.List; + import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.ShutdownContext; import io.quarkus.runtime.annotations.Recorder; import io.smallrye.stork.Stork; +import io.smallrye.stork.api.config.ServiceConfig; import io.vertx.core.Vertx; @Recorder public class SmallRyeStorkRecorder { - public void initialize(ShutdownContext shutdown, RuntimeValue vertx) { + public void initialize(ShutdownContext shutdown, RuntimeValue vertx, StorkConfiguration configuration) { + List serviceConfigs = StorkConfigUtil.toStorkServiceConfig(configuration); + StorkConfigProvider.init(serviceConfigs); Stork.initialize(new QuarkusStorkInfrastructure(vertx.getValue())); shutdown.addShutdownTask(new Runnable() { @Override diff --git a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfigProvider.java b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfigProvider.java new file mode 100644 index 0000000000000..a79b424102690 --- /dev/null +++ b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfigProvider.java @@ -0,0 +1,27 @@ +package io.quarkus.stork; + +import java.util.ArrayList; +import java.util.List; + +import io.smallrye.stork.api.config.ServiceConfig; +import io.smallrye.stork.spi.config.ConfigProvider; + +public class StorkConfigProvider implements ConfigProvider { + + private static final List serviceConfigs = new ArrayList<>(); + + public static void init(List configs) { + serviceConfigs.addAll(configs); + } + + @Override + public List getConfigs() { + return serviceConfigs; + } + + @Override + public int priority() { + return 150; + } + +} diff --git a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfigUtil.java b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfigUtil.java new file mode 100644 index 0000000000000..db9d9f68b29a8 --- /dev/null +++ b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfigUtil.java @@ -0,0 +1,30 @@ +package io.quarkus.stork; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import io.smallrye.stork.api.config.ServiceConfig; +import io.smallrye.stork.spi.config.SimpleServiceConfig; + +public class StorkConfigUtil { + + public static List toStorkServiceConfig(StorkConfiguration storkConfiguration) { + List storkServicesConfigs = new ArrayList<>(); + Set servicesConfigs = storkConfiguration.serviceConfiguration.keySet(); + SimpleServiceConfig.Builder builder = new SimpleServiceConfig.Builder(); + for (String serviceName : servicesConfigs) { + builder.setServiceName(serviceName); + ServiceConfiguration serviceConfiguration = storkConfiguration.serviceConfiguration.get(serviceName); + SimpleServiceConfig.SimpleServiceDiscoveryConfig storkServiceDiscoveryConfig = new SimpleServiceConfig.SimpleServiceDiscoveryConfig( + serviceConfiguration.serviceDiscovery.type, serviceConfiguration.serviceDiscovery.params); + builder.setServiceDiscovery(storkServiceDiscoveryConfig); + SimpleServiceConfig.SimpleLoadBalancerConfig loadBalancerConfig = new SimpleServiceConfig.SimpleLoadBalancerConfig( + serviceConfiguration.loadBalancer.type, serviceConfiguration.loadBalancer.parameters); + builder.setLoadBalancer(loadBalancerConfig); + storkServicesConfigs.add(builder.build()); + } + return storkServicesConfigs; + } + +} diff --git a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfiguration.java b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfiguration.java new file mode 100644 index 0000000000000..6f9f9aebb4aa9 --- /dev/null +++ b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfiguration.java @@ -0,0 +1,25 @@ +package io.quarkus.stork; + +import java.util.Map; + +import io.quarkus.runtime.annotations.ConfigDocMapKey; +import io.quarkus.runtime.annotations.ConfigDocSection; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; + +/** + * Stork configuration root. + */ +@ConfigRoot(phase = ConfigPhase.RUN_TIME) +public class StorkConfiguration { + + /** + * ServiceDiscovery configuration for the service + */ + @ConfigItem + @ConfigDocSection + @ConfigDocMapKey("service-name") + public Map serviceConfiguration; + +} diff --git a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkLoadBalancerConfiguration.java b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkLoadBalancerConfiguration.java new file mode 100644 index 0000000000000..185c7b2340410 --- /dev/null +++ b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkLoadBalancerConfiguration.java @@ -0,0 +1,27 @@ +package io.quarkus.stork; + +import java.util.Map; + +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; + +@ConfigGroup +public class StorkLoadBalancerConfiguration { + + /** + * Configures load balancer type, e.g. "round-robin". + * A LoadBalancerProvider for the type has to be available + * + */ + @ConfigItem(defaultValue = "round-robin") + public String type; + + /** + * Load Balancer parameters. + * Check the documentation of the selected load balancer type for available parameters + * + */ + @ConfigItem + public Map parameters; + +} diff --git a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkServiceDiscoveryConfiguration.java b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkServiceDiscoveryConfiguration.java new file mode 100644 index 0000000000000..6426542e16dbf --- /dev/null +++ b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkServiceDiscoveryConfiguration.java @@ -0,0 +1,27 @@ +package io.quarkus.stork; + +import java.util.Map; + +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; + +@ConfigGroup +public class StorkServiceDiscoveryConfiguration { + + /** + * Configures the service discovery type, e.g. "consul". + * ServiceDiscoveryProvider for the type has to be available + * + */ + @ConfigItem + public String type; + + /** + * ServiceDiscovery parameters. + * Check the documentation of the selected service discovery type for available parameters. + * + */ + @ConfigItem + public Map params; + +} diff --git a/extensions/smallrye-stork/runtime/src/main/resources/META-INF/services/io.smallrye.stork.spi.config.ConfigProvider b/extensions/smallrye-stork/runtime/src/main/resources/META-INF/services/io.smallrye.stork.spi.config.ConfigProvider new file mode 100644 index 0000000000000..f8c30f22a8c04 --- /dev/null +++ b/extensions/smallrye-stork/runtime/src/main/resources/META-INF/services/io.smallrye.stork.spi.config.ConfigProvider @@ -0,0 +1 @@ +io.quarkus.stork.StorkConfigProvider \ No newline at end of file diff --git a/integration-tests/grpc-mutual-auth/src/main/resources/application.properties b/integration-tests/grpc-mutual-auth/src/main/resources/application.properties index fab7b39e3849a..87d6e7e1fe215 100644 --- a/integration-tests/grpc-mutual-auth/src/main/resources/application.properties +++ b/integration-tests/grpc-mutual-auth/src/main/resources/application.properties @@ -2,10 +2,10 @@ quarkus.grpc.clients.hello.host=hello-service quarkus.grpc.clients.hello.override-authority=localhost quarkus.grpc.clients.hello.name-resolver=stork -stork."hello-service".service-discovery=static -stork."hello-service".service-discovery.address-list=${quarkus.http.host}:9000 -%test.stork."hello-service".service-discovery.address-list=${quarkus.http.host}:9001 -stork."hello-service".load-balancer=round-robin +quarkus.stork.service-configuration."hello-service".service-discovery.type=static +quarkus.stork.service-configuration."hello-service".service-discovery.params.address-list=${quarkus.http.host}:9000 +%test.quarkus.stork.service-configuration."hello-service".service-discovery.params.address-list=${quarkus.http.host}:9001 +quarkus.stork.service-configuration."hello-service".load-balancer.type=round-robin quarkus.grpc.clients.hello.ssl.certificate=src/main/resources/tls/client.pem quarkus.grpc.clients.hello.ssl.key=src/main/resources/tls/client.key diff --git a/integration-tests/grpc-plain-text-mutiny/src/main/resources/application.properties b/integration-tests/grpc-plain-text-mutiny/src/main/resources/application.properties index b7a1143759b4f..81ea2a7e675bd 100644 --- a/integration-tests/grpc-plain-text-mutiny/src/main/resources/application.properties +++ b/integration-tests/grpc-plain-text-mutiny/src/main/resources/application.properties @@ -3,7 +3,7 @@ quarkus.grpc.clients.hello.host=hello-service quarkus.grpc.clients.hello.name-resolver=stork -stork.hello-service.service-discovery=static -%test.stork.hello-service.service-discovery.address-list=badd-url:9001,${quarkus.http.host}:9001 -stork.hello-service.service-discovery.address-list=badd-url:9000,${quarkus.http.host}:9000 -stork.hello-service.load-balancer=round-robin +quarkus.stork.service-configuration.hello-service.service-discovery.type=static +%test.quarkus.stork.service-configuration.hello-service.service-discovery.params.address-list=badd-url:9001,${quarkus.http.host}:9001 +quarkus.stork.service-configuration.hello-service.service-discovery.params.address-list=badd-url:9000,${quarkus.http.host}:9000 +quarkus.stork.service-configuration.hello-service.load-balancer.type=round-robin diff --git a/integration-tests/grpc-stork-response-time/src/main/resources/application.properties b/integration-tests/grpc-stork-response-time/src/main/resources/application.properties index 4310eaefc3cc5..8280cb4f2f4c3 100644 --- a/integration-tests/grpc-stork-response-time/src/main/resources/application.properties +++ b/integration-tests/grpc-stork-response-time/src/main/resources/application.properties @@ -4,12 +4,12 @@ quarkus.grpc.clients.hello2.host=hello-service2 quarkus.grpc.clients.hello1.name-resolver=stork quarkus.grpc.clients.hello2.name-resolver=stork -stork.hello-service1.service-discovery=static -stork.hello-service1.service-discovery.address-list=localhost:9013,localhost:9012 -stork.hello-service1.load-balancer=least-response-time +quarkus.stork.service-configuration.hello-service1.service-discovery.type=static +quarkus.stork.service-configuration.hello-service1.service-discovery.params.address-list=localhost:9013,localhost:9012 +quarkus.stork.service-configuration.hello-service1.load-balancer.type=least-response-time -stork.hello-service2.service-discovery=static -stork.hello-service2.service-discovery.address-list=localhost:9013,localhost:9012 -stork.hello-service2.load-balancer=least-response-time +quarkus.stork.service-configuration.hello-service2.service-discovery.type=static +quarkus.stork.service-configuration.hello-service2.service-discovery.params.address-list=localhost:9013,localhost:9012 +quarkus.stork.service-configuration.hello-service2.load-balancer.type=least-response-time #quarkus.log.category."io.quarkus.grpc.runtime.stork".level=DEBUG diff --git a/integration-tests/rest-client-reactive-stork/src/main/resources/application.properties b/integration-tests/rest-client-reactive-stork/src/main/resources/application.properties index 1d041dba8de8f..975412aa02093 100644 --- a/integration-tests/rest-client-reactive-stork/src/main/resources/application.properties +++ b/integration-tests/rest-client-reactive-stork/src/main/resources/application.properties @@ -1,5 +1,5 @@ -stork.hello-service.service-discovery=my -stork.hello-service.load-balancer=least-response-time +quarkus.stork.service-configuration.hello-service.service-discovery.type=my +quarkus.stork.service-configuration.hello-service.load-balancer.type=least-response-time hello/mp-rest/url=stork://hello-service/hello # slow-service and fast-service come from Slow- and FastWiremockServer -stork.hello-service.service-discovery.address-list=${slow-service},${fast-service} \ No newline at end of file +quarkus.stork.service-configuration.hello-service.service-discovery.params.address-list=${slow-service},${fast-service} \ No newline at end of file