From 18310d25d113400dfb87b2cc83edf95024aafd13 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 16 Apr 2021 10:57:11 +0200 Subject: [PATCH 1/2] Upgrade to Quarkus 1.13.2.Final Changes: - Remove workaround of issues/14525 - Changed TODO by comment for issues/15464 - Make sure we use the same gRPC port for running in prod and test (for backward compatibility) --- .../src/main/resources/application.properties | 9 +-------- .../src/main/resources/application.properties | 3 +++ .../src/main/resources/application.properties | 4 +++- .../src/main/resources/application.properties | 3 ++- .../src/main/resources/application.properties | 4 +++- pom.xml | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/configmap/file-system/src/main/resources/application.properties b/configmap/file-system/src/main/resources/application.properties index 31fb1369..347e8abe 100644 --- a/configmap/file-system/src/main/resources/application.properties +++ b/configmap/file-system/src/main/resources/application.properties @@ -1,16 +1,9 @@ quarkus.openshift.expose=true -quarkus.openshift.config-map-volumes.app-config.config-map-name=app-config -quarkus.openshift.mounts.app-config.path=/deployments/config +quarkus.openshift.app-config-map=app-config quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest -# TODO: remove workaround for https://github.com/quarkusio/quarkus/issues/14525 -quarkus.openshift.env.vars.smallrye-config-locations=/deployments/config - %test.hello.message=Hello, %s! -# the application binary resides in /home/quarkus with quarkus/ubi-quarkus-native-binary-s2i -%native.quarkus.openshift.mounts.app-config.path=/home/quarkus/config - quarkus.openshift.readiness-probe.period=5s quarkus.openshift.readiness-probe.initial-delay=0s quarkus.openshift.readiness-probe.failure-threshold=5 \ No newline at end of file diff --git a/http/http-advanced/src/main/resources/application.properties b/http/http-advanced/src/main/resources/application.properties index 13ec8411..7fc085f2 100644 --- a/http/http-advanced/src/main/resources/application.properties +++ b/http/http-advanced/src/main/resources/application.properties @@ -40,6 +40,9 @@ io.quarkus.ts.openshift.http.clients.HttpVersionClientServiceAsync/mp-rest/trust # gRPC quarkus.grpc.clients.hello.host=localhost +## Use the same gRPC for prod and test +quarkus.grpc.server.port=9000 +quarkus.grpc.server.test-port=${quarkus.grpc.server.port} # authZ quarkus.keycloak.policy-enforcer.enable=true diff --git a/messaging/kafka-avro-reactive-messaging/src/main/resources/application.properties b/messaging/kafka-avro-reactive-messaging/src/main/resources/application.properties index f71cc070..c17ca48e 100644 --- a/messaging/kafka-avro-reactive-messaging/src/main/resources/application.properties +++ b/messaging/kafka-avro-reactive-messaging/src/main/resources/application.properties @@ -5,7 +5,9 @@ %local.mp.messaging.connector.smallrye-kafka.apicurio.registry.url=http://localhost:8081/api kafka.bootstrap.servers=kafka-broker-1:9092 -# TODO: Disable health check because of https://github.com/quarkusio/quarkus/issues/15464 + +# Kafka Health Check readiness remains down until It's consumed the first time, so we need to disable it in OpenShift. +# Related to https://github.com/quarkusio/quarkus/issues/15464 quarkus.reactive-messaging.health.enabled=false mp.messaging.connector.smallrye-kafka.apicurio.registry.url=http://registry-service:8081/api diff --git a/messaging/kafka-streams-reactive-messaging/src/main/resources/application.properties b/messaging/kafka-streams-reactive-messaging/src/main/resources/application.properties index 6e60bb7d..df5fea49 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/resources/application.properties +++ b/messaging/kafka-streams-reactive-messaging/src/main/resources/application.properties @@ -7,7 +7,8 @@ producer.loginUrls=redhat/login,inditex/login,santander/login,bbva/login kafka.bootstrap.servers=kafka-broker-1:9092 -# TODO: Disable health check because of https://github.com/quarkusio/quarkus/issues/15464 +# Kafka Health Check readiness remains down until It's consumed the first time, so we need to disable it in OpenShift. +# Related to https://github.com/quarkusio/quarkus/issues/15464 quarkus.reactive-messaging.health.enabled=false mp.messaging.outgoing.login-http-response-values.connector=smallrye-kafka diff --git a/micrometer/prometheus-kafka/src/main/resources/application.properties b/micrometer/prometheus-kafka/src/main/resources/application.properties index ce7e07b3..f44d56fd 100644 --- a/micrometer/prometheus-kafka/src/main/resources/application.properties +++ b/micrometer/prometheus-kafka/src/main/resources/application.properties @@ -1,5 +1,7 @@ kafka.bootstrap.servers=kafka-broker-1:9092 -# TODO: Disable health check because of https://github.com/quarkusio/quarkus/issues/15464 + +# Kafka Health Check readiness remains down until It's consumed the first time, so we need to disable it in OpenShift. +# Related to https://github.com/quarkusio/quarkus/issues/15464 quarkus.reactive-messaging.health.enabled=false mp.messaging.outgoing.alerts-source.connector=smallrye-kafka diff --git a/pom.xml b/pom.xml index 0bdddca7..b5ccf7cb 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 3.8.1 3.2.0 2.22.2 - 1.12.2.Final + 1.13.2.Final ${version.quarkus} 1.15.3 From 67be3bc1e9a9fa7948183369ea03553401e10e8d Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 22 Apr 2021 14:18:08 +0200 Subject: [PATCH 2/2] Increased timeout for external applications --- external-applications/quarkus-workshop-super-heroes/pom.xml | 6 ++++++ external-applications/todo-demo-app/pom.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/external-applications/quarkus-workshop-super-heroes/pom.xml b/external-applications/quarkus-workshop-super-heroes/pom.xml index eca51da9..1b818911 100644 --- a/external-applications/quarkus-workshop-super-heroes/pom.xml +++ b/external-applications/quarkus-workshop-super-heroes/pom.xml @@ -45,6 +45,12 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + 20 + + diff --git a/external-applications/todo-demo-app/pom.xml b/external-applications/todo-demo-app/pom.xml index 445f8b55..1e2186cb 100644 --- a/external-applications/todo-demo-app/pom.xml +++ b/external-applications/todo-demo-app/pom.xml @@ -35,6 +35,12 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + 20 + +