Feature implementation from commits 31fbfdf..9ccf42e

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java

@@ -9,7 +9,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -462,7 +461,7 @@ public boolean isSatisfiedBy(Task t) {
                     });
 
                     tasks.withType(Test.class).configureEach(t -> {
-                        t.setSystemProperties(extractQuarkusTestSystemProperties());
+                        t.setSystemProperties(extractQuarkusTestSystemProperties(project));
 
                         t.getInputs().files(quarkusGenerateTestAppModelTask);
                         // Quarkus test configuration action which should be executed before any Quarkus test
@@ -731,16 +730,9 @@ private Optional<TaskProvider<Task>> getLazyTask(Project project, String name) {
         }
     }
 
-    private static Map<String, Object> extractQuarkusTestSystemProperties() {
-        Properties systemProperties = System.getProperties();
-        Map<String, Object> quarkusSystemProperties = new HashMap<>();
-        for (String propertyName : systemProperties.stringPropertyNames()) {
-            if (!propertyName.startsWith("quarkus.test.")) {
-                continue;
-            }
-
-            quarkusSystemProperties.put(propertyName, systemProperties.get(propertyName));
-        }
-        return quarkusSystemProperties;
+    private static Map<String, Object> extractQuarkusTestSystemProperties(Project project) {
+        return new HashMap<>(project.getProviders()
+                .systemPropertiesPrefixedBy("quarkus.test.")
+                .get());
     }
 }

docs/src/main/asciidoc/kubernetes-dev-services.adoc

@@ -55,6 +55,15 @@ quarkus.kubernetes-client.devservices.flavor=api-only # k3s or kind
 quarkus.kubernetes-client.devservices.api-version=1.22
 ----
 
+You can also configure a custom image compatible with standard images (kind, k3s & api-server) using the `quarkus.kubernetes-client.devservices.image-name` property. However, it must be consistent with the flavor and api-version properties:
+
+[source, properties]
+----
+quarkus.kubernetes-client.devservices.flavor=api-only # k3s or kind
+quarkus.kubernetes-client.devservices.api-version=1.24.1
+quarkus.kubernetes-client.devservices.image-name=quay.io/giantswarm/kube-apiserver:v1.24.1
+----
+
 `api-only` only starts a Kubernetes API Server (plus the required etcd). If you need a fully-featured Kubernetes cluster that can spin up Pods, you can use `k3s` or `kind`. `k3s` requires to start the container with `privileged mode`. The `kind` test container now also supports using podman's rootless mode.
 
 If `api-version` is not set, the latest version for the given flavor will be used. Otherwise, the version must match a https://github.com/dajudge/kindcontainer/blob/master/k8s-versions.json[version supported by the given flavor].

extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java

@@ -17,6 +17,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -30,6 +31,8 @@
 import com.dajudge.kindcontainer.K3sContainerVersion;
 import com.dajudge.kindcontainer.KindContainer;
 import com.dajudge.kindcontainer.KindContainerVersion;
+import com.dajudge.kindcontainer.KubernetesContainer;
+import com.dajudge.kindcontainer.KubernetesImageSpec;
 import com.dajudge.kindcontainer.KubernetesVersionEnum;
 import com.dajudge.kindcontainer.client.KubeConfigUtils;
 import com.dajudge.kindcontainer.client.config.Cluster;
@@ -225,18 +228,12 @@ private RunningDevService startKubernetes(DockerStatusBuildItem dockerStatusBuil
                     .orElse(api_only);
 
             @SuppressWarnings("rawtypes")
-            final var container = switch (clusterType) {
-                case api_only -> new ApiServerContainer(
-                        config.apiVersion
-                                .map(version -> findOrElseThrow(clusterType, version, ApiServerContainerVersion.class))
-                                .orElseGet(() -> latest(ApiServerContainerVersion.class)));
-                case k3s -> new K3sContainer(
-                        config.apiVersion.map(version -> findOrElseThrow(clusterType, version, K3sContainerVersion.class))
-                                .orElseGet(() -> latest(K3sContainerVersion.class)));
-                case kind -> new KindContainer(
-                        config.apiVersion
-                                .map(version -> findOrElseThrow(clusterType, version, KindContainerVersion.class))
-                                .orElseGet(() -> latest(KindContainerVersion.class)));
+            KubernetesContainer container = switch (clusterType) {
+                case api_only -> createContainer(ApiServerContainer::new, ApiServerContainerVersion.class, config, clusterType);
+
+                case k3s -> createContainer(K3sContainer::new, K3sContainerVersion.class, config, clusterType);
+
+                case kind -> createContainer(KindContainer::new, KindContainerVersion.class, config, clusterType);
             };
 
             if (useSharedNetwork) {
@@ -270,7 +267,21 @@ private RunningDevService startKubernetes(DockerStatusBuildItem dockerStatusBuil
                 .orElseGet(defaultKubernetesClusterSupplier);
     }
 
-    <T extends KubernetesVersionEnum<T>> T findOrElseThrow(final Flavor flavor, final String version,
+    @SuppressWarnings("rawtypes")
+    private <T extends KubernetesVersionEnum<T>, C extends KubernetesContainer> C createContainer(
+            Function<KubernetesImageSpec<T>, C> constructor,
+            Class<T> versionClass,
+            KubernetesDevServiceCfg config,
+            Flavor flavor) {
+        T version = config.apiVersion
+                .map(v -> findOrElseThrow(flavor, v, versionClass))
+                .orElseGet(() -> latest(versionClass));
+
+        KubernetesImageSpec<T> imageSpec = version.withImage(config.imageName);
+        return constructor.apply(imageSpec);
+    }
+
+    private <T extends KubernetesVersionEnum<T>> T findOrElseThrow(final Flavor flavor, final String version,
             final Class<T> versions) {
         final String versionWithPrefix = !version.startsWith("v") ? "v" + version : version;
         return KubernetesVersionEnum.ascending(versions)
@@ -315,6 +326,7 @@ private KubernetesDevServiceCfg getConfiguration(KubernetesClientBuildConfig cfg
     private static final class KubernetesDevServiceCfg {
 
         public boolean devServicesEnabled;
+        public String imageName;
         public Optional<Flavor> flavor;
         public Optional<String> apiVersion;
         public boolean overrideKubeconfig;
@@ -324,6 +336,8 @@ private static final class KubernetesDevServiceCfg {
 
         public KubernetesDevServiceCfg(KubernetesDevServicesBuildTimeConfig config) {
             this.devServicesEnabled = config.enabled();
+            this.imageName = config.imageName()
+                    .orElse(null);
             this.serviceName = config.serviceName();
             this.apiVersion = config.apiVersion();
             this.overrideKubeconfig = config.overrideKubeconfig();
@@ -334,7 +348,8 @@ public KubernetesDevServiceCfg(KubernetesDevServicesBuildTimeConfig config) {
 
         @Override
         public int hashCode() {
-            return Objects.hash(devServicesEnabled, flavor, apiVersion, overrideKubeconfig, shared, serviceName, containerEnv);
+            return Objects.hash(devServicesEnabled, imageName, flavor, apiVersion, overrideKubeconfig, shared, serviceName,
+                    containerEnv);
         }
 
         @Override

extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesDevServicesBuildTimeConfig.java

@@ -26,6 +26,15 @@ public interface KubernetesDevServicesBuildTimeConfig {
      */
     Optional<String> apiVersion();
 
+    /**
+     * The kubernetes image to use.
+     * <p>
+     * If not set, Dev Services for Kubernetes will use default image for the specified {@link #apiVersion()} for the given
+     * {@link #flavor()}.
+     */
+
+    Optional<String> imageName();
+
     /**
      * The flavor to use (kind, k3s or api-only).
      * <p>

extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/OpenTelemetryDestroyer.java

@@ -18,10 +18,9 @@ public class OpenTelemetryDestroyer implements BeanDestroyer<OpenTelemetry> {
     @Override
     public void destroy(OpenTelemetry openTelemetry, CreationalContext<OpenTelemetry> creationalContext,
             Map<String, Object> params) {
-        if (openTelemetry instanceof OpenTelemetrySdk) {
+        if (openTelemetry instanceof OpenTelemetrySdk openTelemetrySdk) {
             // between flush and shutdown we will wait shutdown-wait-time, at the most.
             var waitTime = getShutdownWaitTime().dividedBy(4);
-            var openTelemetrySdk = ((OpenTelemetrySdk) openTelemetry);
             openTelemetrySdk.getSdkLoggerProvider().forceFlush().join(waitTime.toMillis(), MILLISECONDS);
             openTelemetrySdk.getSdkTracerProvider().forceFlush().join(waitTime.toMillis(), MILLISECONDS);
             openTelemetrySdk.getSdkMeterProvider().forceFlush().join(waitTime.toMillis(), MILLISECONDS);
@@ -31,8 +30,7 @@ public void destroy(OpenTelemetry openTelemetry, CreationalContext<OpenTelemetry
 
     public static Duration getShutdownWaitTime() {
         var config = ConfigProvider.getConfig().unwrap(SmallRyeConfig.class);
-        var waitTime = config.getOptionalValue("quarkus.otel.experimental.shutdown-wait-time", Duration.class)
+        return config.getOptionalValue("quarkus.otel.experimental.shutdown-wait-time", Duration.class)
                 .orElse(Duration.ofSeconds(2));
-        return waitTime;
     }
 }

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/AbstractListCommands.java

@@ -127,7 +127,6 @@ Uni<Response> _blpop(Duration timeout, K... keys) {
         validate(timeout, "timeout");
 
         RedisCommand cmd = RedisCommand.of(Command.BLPOP);
-        cmd.put(timeout.toSeconds());
         cmd.putAll(marshaller.encode(keys));
         cmd.put(timeout.toSeconds());
 
@@ -140,7 +139,6 @@ Uni<Response> _brpop(Duration timeout, K... keys) {
         validate(timeout, "timeout");
 
         RedisCommand cmd = RedisCommand.of(Command.BRPOP);
-        cmd.put(timeout.toSeconds());
         cmd.putAll(marshaller.encode(keys));
         cmd.put(timeout.toSeconds());
 

extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/subprotocol/SubprotocolFromConnectionTest.java

@@ -0,0 +1,79 @@
+package io.quarkus.websockets.next.test.subprotocol;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.net.URI;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import jakarta.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.websockets.next.OnOpen;
+import io.quarkus.websockets.next.WebSocket;
+import io.quarkus.websockets.next.WebSocketClient;
+import io.quarkus.websockets.next.WebSocketClientConnection;
+import io.quarkus.websockets.next.WebSocketConnection;
+import io.quarkus.websockets.next.WebSocketConnector;
+
+public class SubprotocolFromConnectionTest {
+
+    @RegisterExtension
+    public static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .withApplicationRoot(root -> {
+                root.addClasses(Endpoint.class, Client.class);
+            }).overrideConfigKey("quarkus.websockets-next.server.supported-subprotocols", "oak,larch");
+
+    @TestHTTPResource("/")
+    URI endpointUri;
+
+    @Inject
+    WebSocketConnector<Client> connector;
+
+    @Test
+    void testSubprotocolFromConnection() throws InterruptedException, ExecutionException {
+        var connection = connector.baseUri(endpointUri).addSubprotocol("larch").connectAndAwait();
+        assertEquals("larch", connection.subprotocol());
+        assertTrue(Client.OPEN_LATCH.await(5, TimeUnit.SECONDS));
+        assertEquals("larch", Client.SUB_PROTOCOL.get());
+        assertTrue(Endpoint.OPEN_LATCH.await(5, TimeUnit.SECONDS));
+        assertEquals("larch", Endpoint.SUB_PROTOCOL.get());
+        connection.closeAndAwait();
+    }
+
+    @WebSocket(path = "/endpoint")
+    public static class Endpoint {
+
+        static final CountDownLatch OPEN_LATCH = new CountDownLatch(1);
+
+        static final AtomicReference<String> SUB_PROTOCOL = new AtomicReference<>();
+
+        @OnOpen
+        void connected(WebSocketConnection connection) {
+            SUB_PROTOCOL.set(connection.subprotocol());
+            OPEN_LATCH.countDown();
+        }
+    }
+
+    @WebSocketClient(path = "/endpoint")
+    public static class Client {
+
+        static final CountDownLatch OPEN_LATCH = new CountDownLatch(1);
+
+        static final AtomicReference<String> SUB_PROTOCOL = new AtomicReference<>();
+
+        @OnOpen
+        void connected(WebSocketClientConnection connection) {
+            SUB_PROTOCOL.set(connection.subprotocol());
+            OPEN_LATCH.countDown();
+        }
+    }
+
+}

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/Connection.java

@@ -97,6 +97,12 @@ default void closeAndAwait(CloseReason reason) {
      */
     HandshakeRequest handshakeRequest();
 
+    /**
+     *
+     * @return the subprotocol selected by the handshake
+     */
+    String subprotocol();
+
     /**
      *
      * @return the time when this connection was created

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/WebSocketConnection.java

@@ -36,12 +36,6 @@ public interface WebSocketConnection extends Connection {
      */
     Set<WebSocketConnection> getOpenConnections();
 
-    /**
-     *
-     * @return the subprotocol selected by the handshake
-     */
-    String subprotocol();
-
     /**
      * Makes it possible to send messages to all clients connected to the same WebSocket endpoint.
      *

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketConnectionBase.java

@@ -155,6 +155,11 @@ public HandshakeRequest handshakeRequest() {
         return handshakeRequest;
     }
 
+    @Override
+    public String subprotocol() {
+        return webSocket().subProtocol();
+    }
+
     @Override
     public Instant creationTime() {
         return creationTime;

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketConnectionImpl.java

@@ -65,11 +65,6 @@ public Set<WebSocketConnection> getOpenConnections() {
                 .collect(Collectors.toUnmodifiableSet());
     }
 
-    @Override
-    public String subprotocol() {
-        return webSocket.subProtocol();
-    }
-
     @Override
     public String toString() {
         return "WebSocket connection [endpointId=" + endpointId + ", path=" + webSocket.path() + ", id=" + identifier + "]";

independent-projects/arc/pom.xml

@@ -49,7 +49,7 @@
         <version.jboss-logging>3.6.1.Final</version.jboss-logging>
         <version.mutiny>2.9.2</version.mutiny>
         <version.bridger>1.6.Final</version.bridger>
-        <version.smallrye-common>2.12.0</version.smallrye-common>
+        <version.smallrye-common>2.12.2</version.smallrye-common>
         <!-- test versions -->
         <version.assertj>3.27.3</version.assertj>
         <version.junit5>5.13.2</version.junit5>

independent-projects/bootstrap/pom.xml

@@ -69,7 +69,7 @@
         <plexus-interpolation.version>1.26</plexus-interpolation.version>
         <plexus-sec-dispatcher.version>2.0</plexus-sec-dispatcher.version>
         <plexus-utils.version>3.5.1</plexus-utils.version>
-        <smallrye-common.version>2.12.0</smallrye-common.version>
+        <smallrye-common.version>2.12.2</smallrye-common.version>
         <smallrye-beanbag.version>1.5.3</smallrye-beanbag.version>
         <gradle-tooling.version>8.14</gradle-tooling.version>
         <quarkus-fs-util.version>1.0.0</quarkus-fs-util.version>

independent-projects/qute/pom.xml

@@ -43,7 +43,7 @@
         <version.jandex>3.3.1</version.jandex>
         <version.gizmo>1.9.0</version.gizmo>
         <version.jboss-logging>3.6.1.Final</version.jboss-logging>
-        <version.smallrye-common>2.12.0</version.smallrye-common>
+        <version.smallrye-common>2.12.2</version.smallrye-common>
         <version.smallrye-mutiny>2.9.2</version.smallrye-mutiny>
     </properties>
 

independent-projects/resteasy-reactive/pom.xml

@@ -56,7 +56,7 @@
         <jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
 
         <mutiny.version>2.9.2</mutiny.version>
-        <smallrye-common.version>2.12.0</smallrye-common.version>
+        <smallrye-common.version>2.12.2</smallrye-common.version>
         <vertx.version>4.5.16</vertx.version>
         <rest-assured.version>5.5.5</rest-assured.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>