Merge pull request #28172 from michalvavrik/feature/fix-knative-clien…

…t-validation Fix Knative/OpenShift client environment check
quarkusio · Sep 27, 2022 · 463f9a6 · 463f9a6
2 parents adff7c4 + 621fc75
commit 463f9a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...es/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeDeployer.java b/...es/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeDeployer.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import io.fabric8.knative.client.KnativeClient;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem;
@@ -23,7 +22,8 @@ public void checkEnvironment(Optional<SelectedKubernetesDeploymentTargetBuildIte
                 return;
             }
             if (target.getEntry().getName().equals(KNATIVE)) {
-                if (client.getClient().isAdaptable(KnativeClient.class)) {
+                // use 'isSupported' once https://github.com/fabric8io/kubernetes-client/issues/4447 is resolved
+                if (client.getClient().hasApiGroup("knative.dev", false)) {
                     deploymentCluster.produce(new KubernetesDeploymentClusterBuildItem(KNATIVE));
                 } else {
                     throw new IllegalStateException(

diff --git a/.../vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftDeployer.java b/.../vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftDeployer.java
@@ -24,11 +24,16 @@ public void checkEnvironment(Optional<SelectedKubernetesDeploymentTargetBuildIte
                 return;
             }
             if (target.getEntry().getName().equals(OPENSHIFT)) {
-                if (client.getClient().isAdaptable(OpenShiftClient.class)) {
-                    deploymentCluster.produce(new KubernetesDeploymentClusterBuildItem(OPENSHIFT));
-                } else {
-                    throw new IllegalStateException(
-                            "Openshift was requested as a deployment, but the target cluster is not an Openshift cluster!");
+                try (var openShiftClient = client.getClient().adapt(OpenShiftClient.class)) {
+                    if (openShiftClient.isSupported()) {
+                        deploymentCluster.produce(new KubernetesDeploymentClusterBuildItem(OPENSHIFT));
+                    } else {
+                        throw new IllegalStateException(
+                                "Openshift was requested as a deployment, but the target cluster is not an Openshift cluster!");
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException(
+                            "Failed to configure OpenShift. Make sure you have the Quarkus OpenShift extension.", e);
                 }
             }
         });