diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java index 53c6e938ac37e..3b73580454293 100644 --- a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java +++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java @@ -28,7 +28,6 @@ import org.jboss.logging.Logger; -import io.dekorate.utils.Clients; import io.dekorate.utils.Packaging; import io.dekorate.utils.Serialization; import io.fabric8.kubernetes.api.model.HasMetadata; @@ -36,8 +35,10 @@ import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.dsl.LogWatch; +import io.fabric8.kubernetes.client.http.HttpClient; import io.fabric8.openshift.api.model.Build; import io.fabric8.openshift.api.model.BuildConfig; import io.fabric8.openshift.api.model.ImageStream; @@ -231,7 +232,7 @@ public void openshiftRequirementsNative(OpenshiftConfig openshiftConfig, public void openshiftBuildFromJar(OpenshiftConfig openshiftConfig, S2iConfig s2iConfig, ContainerImageConfig containerImageConfig, - KubernetesClientBuildItem kubernetesClientSupplier, + KubernetesClientBuildItem kubernetesClientBuilder, ContainerImageInfoBuildItem containerImage, ArchiveRootBuildItem archiveRoot, OutputTargetBuildItem out, PackageConfig packageConfig, List generatedResources, @@ -263,7 +264,7 @@ public void openshiftBuildFromJar(OpenshiftConfig openshiftConfig, return; } - try (KubernetesClient kubernetesClient = kubernetesClientSupplier.getClient().get()) { + try (KubernetesClient kubernetesClient = kubernetesClientBuilder.buildClient()) { String namespace = Optional.ofNullable(kubernetesClient.getNamespace()).orElse("default"); LOG.info("Starting (in-cluster) container image build for jar using: " + config.buildStrategy + " on server: " + kubernetesClient.getMasterUrl() + " in namespace:" + namespace + "."); @@ -272,14 +273,16 @@ public void openshiftBuildFromJar(OpenshiftConfig openshiftConfig, //For s2i kind of builds where jars are expected directly in the '/' we have to use null. String outputDirName = out.getOutputDirectory().getFileName().toString(); String contextRoot = getContextRoot(outputDirName, packageConfig.isFastJar(), config.buildStrategy); + KubernetesClientBuilder clientBuilder = newClientBuilderWithoutHttp2(kubernetesClient.getConfiguration(), + kubernetesClientBuilder.getHttpClientFactory()); if (packageConfig.isFastJar()) { - createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(), + createContainerImage(clientBuilder, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(), jar.getPath().getParent()); } else if (jar.getLibraryDir() != null) { //When using uber-jar the libraryDir is going to be null, potentially causing NPE. - createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(), + createContainerImage(clientBuilder, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(), jar.getPath(), jar.getLibraryDir()); } else { - createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(), + createContainerImage(clientBuilder, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(), jar.getPath()); } artifactResultProducer.produce(new ArtifactResultBuildItem(null, "jar-container", Collections.emptyMap())); @@ -300,7 +303,7 @@ private String getContextRoot(String outputDirName, boolean isFastJar, BuildStra @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, OpenshiftBuild.class, NativeBuild.class }) public void openshiftBuildFromNative(OpenshiftConfig openshiftConfig, S2iConfig s2iConfig, ContainerImageConfig containerImageConfig, - KubernetesClientBuildItem kubernetesClientSupplier, + KubernetesClientBuildItem kubernetesClientBuilder, ContainerImageInfoBuildItem containerImage, ArchiveRootBuildItem archiveRoot, OutputTargetBuildItem out, PackageConfig packageConfig, List generatedResources, @@ -321,7 +324,7 @@ public void openshiftBuildFromNative(OpenshiftConfig openshiftConfig, S2iConfig return; } - try (KubernetesClient kubernetesClient = kubernetesClientSupplier.getClient().get()) { + try (KubernetesClient kubernetesClient = kubernetesClientBuilder.buildClient()) { String namespace = Optional.ofNullable(kubernetesClient.getNamespace()).orElse("default"); LOG.info("Starting (in-cluster) container image build for jar using: " + config.buildStrategy + " on server: " @@ -340,14 +343,16 @@ public void openshiftBuildFromNative(OpenshiftConfig openshiftConfig, S2iConfig //For docker kind of builds where we use instructions like: `COPY target/*.jar /deployments` it using '/target' is a requirement. //For s2i kind of builds where jars are expected directly in the '/' we have to use null. String contextRoot = config.buildStrategy == BuildStrategy.DOCKER ? "target" : null; - createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, out.getOutputDirectory(), - nativeImage.getPath()); + createContainerImage( + newClientBuilderWithoutHttp2(kubernetesClient.getConfiguration(), + kubernetesClientBuilder.getHttpClientFactory()), + openshiftYml.get(), config, contextRoot, out.getOutputDirectory(), nativeImage.getPath()); artifactResultProducer.produce(new ArtifactResultBuildItem(null, "native-container", Collections.emptyMap())); containerImageBuilder.produce(new ContainerImageBuilderBuildItem(OPENSHIFT)); } } - public static void createContainerImage(KubernetesClient kubernetesClient, + public static void createContainerImage(KubernetesClientBuilder kubernetesClientBuilder, GeneratedFileSystemResourceBuildItem openshiftManifests, OpenshiftConfig openshiftConfig, String base, @@ -364,10 +369,7 @@ public static void createContainerImage(KubernetesClient kubernetesClient, throw new RuntimeException("Error creating the openshift binary build archive.", e); } - Config config = kubernetesClient.getConfiguration(); - //Let's disable http2 as it causes issues with duplicate build triggers. - config.setHttp2Disable(true); - try (KubernetesClient client = Clients.fromConfig(config)) { + try (KubernetesClient client = kubernetesClientBuilder.build()) { OpenShiftClient openShiftClient = toOpenshiftClient(client); KubernetesList kubernetesList = Serialization .unmarshalAsList(new ByteArrayInputStream(openshiftManifests.getData())); @@ -533,6 +535,14 @@ private static void display(Reader logReader, Logger.Level level) throws IOExcep } } + private static KubernetesClientBuilder newClientBuilderWithoutHttp2(Config configuration, + HttpClient.Factory httpClientFactory) { + //Let's disable http2 as it causes issues with duplicate build triggers. + configuration.setHttp2Disable(true); + + return new KubernetesClientBuilder().withConfig(configuration).withHttpClientFactory(httpClientFactory); + } + // visible for test static String concatUnixPaths(String... elements) { StringBuilder result = new StringBuilder(); diff --git a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java index 7585ad2111932..81b0da6832b37 100644 --- a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java +++ b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java @@ -171,7 +171,7 @@ public void s2iRequirementsNative(S2iConfig s2iConfig, @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, S2iBuild.class }, onlyIfNot = NativeBuild.class) public void s2iBuildFromJar(S2iConfig s2iConfig, ContainerImageConfig containerImageConfig, - KubernetesClientBuildItem kubernetesClientSupplier, + KubernetesClientBuildItem kubernetesClientBuilder, ContainerImageInfoBuildItem containerImage, ArchiveRootBuildItem archiveRoot, OutputTargetBuildItem out, PackageConfig packageConfig, List generatedResources, @@ -201,7 +201,7 @@ public void s2iBuildFromJar(S2iConfig s2iConfig, ContainerImageConfig containerI "No Openshift manifests were generated so no s2i process will be taking place"); return; } - try (KubernetesClient kubernetesClient = kubernetesClientSupplier.getClient().get()) { + try (KubernetesClient kubernetesClient = kubernetesClientBuilder.buildClient()) { String namespace = Optional.ofNullable(kubernetesClient.getNamespace()).orElse("default"); LOG.info("Performing s2i binary build with jar on server: " + kubernetesClient.getMasterUrl() + " in namespace:" + namespace + "."); @@ -215,7 +215,7 @@ public void s2iBuildFromJar(S2iConfig s2iConfig, ContainerImageConfig containerI @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, S2iBuild.class, NativeBuild.class }) public void s2iBuildFromNative(S2iConfig s2iConfig, ContainerImageConfig containerImageConfig, - KubernetesClientBuildItem kubernetesClientSupplier, + KubernetesClientBuildItem kubernetesClientBuilder, ContainerImageInfoBuildItem containerImage, ArchiveRootBuildItem archiveRoot, OutputTargetBuildItem out, PackageConfig packageConfig, List generatedResources, @@ -234,7 +234,7 @@ public void s2iBuildFromNative(S2iConfig s2iConfig, ContainerImageConfig contain return; } - try (KubernetesClient kubernetesClient = kubernetesClientSupplier.getClient().get()) { + try (KubernetesClient kubernetesClient = kubernetesClientBuilder.buildClient()) { String namespace = Optional.ofNullable(kubernetesClient.getNamespace()).orElse("default"); LOG.info("Performing s2i binary build with native image on server: " + kubernetesClient.getMasterUrl() + " in namespace:" + namespace + "."); diff --git a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java index 6c5bd544cf0cd..5a9c0e98efea9 100644 --- a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java +++ b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java @@ -1,9 +1,11 @@ package io.quarkus.kubernetes.client.deployment; -import static io.quarkus.kubernetes.client.runtime.KubernetesClientUtils.*; +import static io.quarkus.kubernetes.client.runtime.KubernetesClientUtils.createConfig; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.QuarkusBuildCloseablesBuildItem; import io.quarkus.kubernetes.client.runtime.KubernetesClientBuildConfig; +import io.quarkus.kubernetes.client.runtime.QuarkusHttpClientFactory; import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem; import io.quarkus.runtime.TlsConfig; @@ -12,7 +14,9 @@ public class KubernetesClientBuildStep { private KubernetesClientBuildConfig buildConfig; @BuildStep - public KubernetesClientBuildItem process(TlsConfig tlsConfig) { - return new KubernetesClientBuildItem(createConfig(buildConfig, tlsConfig)); + public KubernetesClientBuildItem process(TlsConfig tlsConfig, QuarkusBuildCloseablesBuildItem closeablesBuildItem) { + QuarkusHttpClientFactory httpClientFactory = new QuarkusHttpClientFactory(); + closeablesBuildItem.add(httpClientFactory); + return new KubernetesClientBuildItem(createConfig(buildConfig, tlsConfig), httpClientFactory); } } diff --git a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/QuarkusHttpClientFactory.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/QuarkusHttpClientFactory.java index a02f597c89bdf..dadb84a0a0baf 100644 --- a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/QuarkusHttpClientFactory.java +++ b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/QuarkusHttpClientFactory.java @@ -2,6 +2,8 @@ import static io.vertx.core.spi.resolver.ResolverProvider.DISABLE_DNS_RESOLVER_PROP_NAME; +import java.io.Closeable; + import jakarta.enterprise.inject.spi.CDI; import io.fabric8.kubernetes.client.Config; @@ -10,17 +12,20 @@ import io.vertx.core.Vertx; import io.vertx.core.VertxOptions; -public class QuarkusHttpClientFactory implements HttpClient.Factory { +public class QuarkusHttpClientFactory implements HttpClient.Factory, Closeable { private Vertx vertx; + private boolean closeVertxOnExit; public QuarkusHttpClientFactory() { // The client might get initialized outside a Quarkus context that can provide the Vert.x instance // This is the case for the MockServer / @KubernetesTestServer where the server provides the KubernetesClient instance try { this.vertx = CDI.current().select(Vertx.class).get(); + this.closeVertxOnExit = false; } catch (Exception e) { this.vertx = createVertxInstance(); + this.closeVertxOnExit = true; } } @@ -59,4 +64,11 @@ public VertxHttpClientBuilder newBuilder() { public int priority() { return 1; } + + @Override + public void close() { + if (closeVertxOnExit) { + vertx.close(); + } + } } diff --git a/extensions/kubernetes-client/runtime-internal/src/main/resources/META-INF/services/io.fabric8.kubernetes.client.http.HttpClient$Factory b/extensions/kubernetes-client/runtime-internal/src/main/resources/META-INF/services/io.fabric8.kubernetes.client.http.HttpClient$Factory deleted file mode 100644 index 5ad0eb6326624..0000000000000 --- a/extensions/kubernetes-client/runtime-internal/src/main/resources/META-INF/services/io.fabric8.kubernetes.client.http.HttpClient$Factory +++ /dev/null @@ -1 +0,0 @@ -io.quarkus.kubernetes.client.runtime.QuarkusHttpClientFactory diff --git a/extensions/kubernetes-client/spi/src/main/java/io/quarkus/kubernetes/client/spi/KubernetesClientBuildItem.java b/extensions/kubernetes-client/spi/src/main/java/io/quarkus/kubernetes/client/spi/KubernetesClientBuildItem.java index b68b3fd113fb1..07b3339b0423c 100644 --- a/extensions/kubernetes-client/spi/src/main/java/io/quarkus/kubernetes/client/spi/KubernetesClientBuildItem.java +++ b/extensions/kubernetes-client/spi/src/main/java/io/quarkus/kubernetes/client/spi/KubernetesClientBuildItem.java @@ -1,26 +1,30 @@ package io.quarkus.kubernetes.client.spi; -import java.util.function.Supplier; - import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; +import io.fabric8.kubernetes.client.http.HttpClient; import io.quarkus.builder.item.SimpleBuildItem; public final class KubernetesClientBuildItem extends SimpleBuildItem { private final Config config; + private final HttpClient.Factory httpClientFactory; - public KubernetesClientBuildItem(Config config) { + public KubernetesClientBuildItem(Config config, HttpClient.Factory httpClientFactory) { this.config = config; - } - - public Supplier getClient() { - return () -> new KubernetesClientBuilder().withConfig(config).build(); + this.httpClientFactory = httpClientFactory; } public Config getConfig() { return config; } + public HttpClient.Factory getHttpClientFactory() { + return httpClientFactory; + } + + public KubernetesClient buildClient() { + return new KubernetesClientBuilder().withConfig(config).withHttpClientFactory(httpClientFactory).build(); + } } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeDeployer.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeDeployer.java index 7edfbeb45d6a9..6429c424cdb55 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeDeployer.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeDeployer.java @@ -17,13 +17,14 @@ public class KnativeDeployer { @BuildStep public void checkEnvironment(Optional selectedDeploymentTarget, List resources, - KubernetesClientBuildItem clientSupplier, BuildProducer deploymentCluster) { + KubernetesClientBuildItem kubernetesClientBuilder, + BuildProducer deploymentCluster) { selectedDeploymentTarget.ifPresent(target -> { - if (!KubernetesDeploy.INSTANCE.checkSilently()) { + if (!KubernetesDeploy.INSTANCE.checkSilently(kubernetesClientBuilder)) { return; } if (target.getEntry().getName().equals(KNATIVE)) { - try (DefaultKnativeClient client = clientSupplier.getClient().get().adapt(DefaultKnativeClient.class)) { + try (DefaultKnativeClient client = kubernetesClientBuilder.buildClient().adapt(DefaultKnativeClient.class)) { if (client.isSupported()) { deploymentCluster.produce(new KubernetesDeploymentClusterBuildItem(KNATIVE)); } else { diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java index 2eddd027840c5..7961676eab0a7 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java @@ -9,7 +9,7 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.VersionInfo; -import io.quarkus.kubernetes.client.runtime.KubernetesClientUtils; +import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem; public class KubernetesDeploy { @@ -27,8 +27,8 @@ private KubernetesDeploy() { * * @throws RuntimeException if there was an error while communicating with the Kubernetes API server */ - public boolean check() { - Result result = doCheck(); + public boolean check(KubernetesClientBuildItem clientBuilder) { + Result result = doCheck(clientBuilder); if (result.getException().isPresent()) { throw result.getException().get(); @@ -41,11 +41,11 @@ public boolean check() { * @return {@code true} if @{code quarkus.kubernetes.deploy=true} AND the target Kubernetes API server is reachable * {@code false} otherwise or if there was an error while communicating with the Kubernetes API server */ - public boolean checkSilently() { - return doCheck().isAllowed(); + public boolean checkSilently(KubernetesClientBuildItem clientBuilder) { + return doCheck(clientBuilder).isAllowed(); } - private Result doCheck() { + private Result doCheck(KubernetesClientBuildItem clientBuilder) { if (!KubernetesConfigUtil.isDeploymentEnabled()) { return Result.notConfigured(); } @@ -55,9 +55,8 @@ private Result doCheck() { return Result.enabled(); } - KubernetesClient client = KubernetesClientUtils.createClient(); - String masterURL = client.getConfiguration().getMasterUrl(); - try { + String masterURL = clientBuilder.getConfig().getMasterUrl(); + try (KubernetesClient client = clientBuilder.buildClient()) { //Let's check if we can connect. VersionInfo version = client.getVersion(); if (version == null) { @@ -83,8 +82,6 @@ private Result doCheck() { + masterURL + "'", e)); } - } finally { - client.close(); } } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java index a48f1a68425b8..0bc527a2f9d44 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java @@ -23,7 +23,6 @@ import org.jboss.logging.Logger; -import io.dekorate.utils.Clients; import io.dekorate.utils.Serialization; import io.fabric8.kubernetes.api.model.APIResourceList; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; @@ -90,11 +89,11 @@ public void selectDeploymentTarget(ContainerImageInfoBuildItem containerImageInf @BuildStep public void checkEnvironment(Optional selectedDeploymentTarget, - KubernetesClientBuildItem client, + KubernetesClientBuildItem kubernetesClientBuilder, List resources, BuildProducer deploymentCluster) { - if (!KubernetesDeploy.INSTANCE.checkSilently()) { + if (!KubernetesDeploy.INSTANCE.checkSilently(kubernetesClientBuilder)) { return; } String target = selectedDeploymentTarget.map(s -> s.getEntry().getName()).orElse(KUBERNETES); @@ -104,7 +103,7 @@ public void checkEnvironment(Optional deploymentClusters, Optional selectedDeploymentTarget, @@ -117,7 +116,7 @@ public void deploy(KubernetesClientBuildItem kubernetesClientSupplier, // needed to ensure that this step runs after the container image has been built @SuppressWarnings("unused") List artifactResults) { - if (!KubernetesDeploy.INSTANCE.check()) { + if (!KubernetesDeploy.INSTANCE.check(kubernetesClientBuilder)) { return; } @@ -134,7 +133,7 @@ public void deploy(KubernetesClientBuildItem kubernetesClientSupplier, return; } - try (final KubernetesClient client = Clients.fromConfig(kubernetesClientSupplier.getConfig())) { + try (final KubernetesClient client = kubernetesClientBuilder.buildClient()) { deploymentResult .produce(deploy(selectedDeploymentTarget.get().getEntry(), client, outputTarget.getOutputDirectory(), openshiftConfig, applicationInfo, optionalResourceDefinitions)); diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployerPrerequisite.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployerPrerequisite.java index 6a28b164fcc7e..7a89568a0f306 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployerPrerequisite.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployerPrerequisite.java @@ -10,11 +10,13 @@ import io.quarkus.deployment.IsNormalNotRemoteDev; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem; public class KubernetesDeployerPrerequisite { @BuildStep(onlyIf = IsNormalNotRemoteDev.class) public void prepare(ContainerImageInfoBuildItem containerImage, + KubernetesClientBuildItem kubernetesClientBuilder, Optional selectedDeploymentTarget, Optional fallbackRegistry, List preventImplicitContainerImagePush, @@ -23,7 +25,7 @@ public void prepare(ContainerImageInfoBuildItem containerImage, // we don't want to throw an exception at this step and fail the build because it could prevent // the Kubernetes resources from being generated - if (!KubernetesDeploy.INSTANCE.checkSilently() || !selectedDeploymentTarget.isPresent()) { + if (!KubernetesDeploy.INSTANCE.checkSilently(kubernetesClientBuilder) || !selectedDeploymentTarget.isPresent()) { return; } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftDeployer.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftDeployer.java index b74b863826fd7..cdcc28b0128e2 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftDeployer.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftDeployer.java @@ -18,13 +18,14 @@ public class OpenshiftDeployer { @BuildStep public void checkEnvironment(Optional selectedDeploymentTarget, List resources, - KubernetesClientBuildItem clientSupplier, BuildProducer deploymentCluster) { + KubernetesClientBuildItem kubernetesClientBuilder, + BuildProducer deploymentCluster) { selectedDeploymentTarget.ifPresent(target -> { - if (!KubernetesDeploy.INSTANCE.checkSilently()) { + if (!KubernetesDeploy.INSTANCE.checkSilently(kubernetesClientBuilder)) { return; } if (target.getEntry().getName().equals(OPENSHIFT)) { - try (var openShiftClient = clientSupplier.getClient().get().adapt(OpenShiftClient.class)) { + try (var openShiftClient = kubernetesClientBuilder.buildClient().adapt(OpenShiftClient.class)) { if (openShiftClient.isSupported()) { deploymentCluster.produce(new KubernetesDeploymentClusterBuildItem(OPENSHIFT)); } else {