From 8bc889410eb7aee922452321c274c5e7fcd8bf54 Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Tue, 31 Jan 2023 16:02:28 +0200
Subject: [PATCH] Remove workaround for testing knative environment

This can now be done because
https://github.com/fabric8io/kubernetes-client/issues/4447
is included in version 6.3 of the k8s client
---
 .../kubernetes/deployment/KnativeDeployer.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 9905451f8abf9..4e9079689f8f2 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
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import io.fabric8.knative.client.DefaultKnativeClient;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem;
@@ -22,12 +23,13 @@ public void checkEnvironment(Optional<SelectedKubernetesDeploymentTargetBuildIte
                 return;
             }
             if (target.getEntry().getName().equals(KNATIVE)) {
-                // 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(
-                            "Knative was requested as a deployment, but the target cluster is not a Knative cluster!");
+                try (DefaultKnativeClient knativeClient = client.getClient().adapt(DefaultKnativeClient.class)) {
+                    if (knativeClient.isSupported()) {
+                        deploymentCluster.produce(new KubernetesDeploymentClusterBuildItem(KNATIVE));
+                    } else {
+                        throw new IllegalStateException(
+                                "Knative was requested as a deployment, but the target cluster is not a Knative cluster!");
+                    }
                 }
             }
         });