Fix #802: Update Fabric8 Kubernetes Client to v5.10.1

+ Update Fabric8 Kubernetes Client to v5.10.1
+ Remove GenericCustomResource from project and replace it with GenericKubernetesResource(provided by Fabric8 Kubernetes Client)
+ Refactor ApplyService#applyGenericKubernetesResource CustomResourceDefinition discovery logic to use genericKubernetesResources(apiVersion, kind) method instead
+ Update Framework CustomResourceDefinition manifest in Spring Boot CRD Quickstart to apiextensions.k8s.io/v1 from apiextensions.k8s.io/v1beta1

Signed-off-by: Rohan Kumar <rohaan@redhat.com>

CHANGELOG.md

@@ -22,6 +22,7 @@ Usage:
 ```
 ### 1.6.0-SNAPSHOT
 * Fix #887: Incorrect warning about overriding environment variable
+* Fix #802: Update Fabric8 kubernetes Client to v5.10.1
 
 ### 1.5.1 (2021-10-28)
 * Fix #1084: Gradle dependencies should be test or provided scope

jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/KubernetesHelper.java

@@ -36,12 +36,10 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
-import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import io.fabric8.kubernetes.api.model.HTTPHeader;
-import org.eclipse.jkube.kit.common.GenericCustomResource;
 import org.eclipse.jkube.kit.common.KitLogger;
 import org.eclipse.jkube.kit.common.ResourceFileType;
 
@@ -70,9 +68,6 @@
 import io.fabric8.kubernetes.api.model.ReplicationController;
 import io.fabric8.kubernetes.api.model.ReplicationControllerSpec;
 import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionVersion;
 import io.fabric8.kubernetes.api.model.apps.DaemonSet;
 import io.fabric8.kubernetes.api.model.apps.DaemonSetSpec;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
@@ -91,16 +86,13 @@
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.PodResource;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
 import io.fabric8.openshift.api.model.Build;
 import io.fabric8.openshift.api.model.DeploymentConfig;
 import io.fabric8.openshift.api.model.DeploymentConfigSpec;
 import io.fabric8.openshift.api.model.Template;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import static io.fabric8.kubernetes.client.utils.ApiVersionUtil.trimGroup;
-import static io.fabric8.kubernetes.client.utils.ApiVersionUtil.trimVersion;
 
 /**
  * @author roland
@@ -864,8 +856,8 @@ private static File[] listRemoteResourceFragments(List<String> remotes, KitLogge
         return new File[0];
     }
 
-    public static String getFullyQualifiedApiGroupWithKind(CustomResourceDefinitionContext crdContext) {
-        return crdContext.getGroup() + "/" + crdContext.getVersion() + "#" + crdContext.getKind();
+    public static String getFullyQualifiedApiGroupWithKind(String group, String version, String kind) {
+        return group + "/" + version + "#" + kind;
     }
 
     public static String getNewestApplicationPodName(KubernetesClient client, String namespace, Collection<HasMetadata> resources) {
@@ -952,12 +944,6 @@ public static boolean isControllerResource(HasMetadata h) {
         return Arrays.stream(POD_CONTROLLER_KINDS).anyMatch(c -> c.equals(h.getKind()));
     }
 
-    public static CustomResourceDefinitionContext getCrdContext(CustomResourceDefinitionList customResourceDefinitionList, GenericCustomResource customResource) {
-        return findCrdForCustomResource(customResourceDefinitionList, customResource)
-            .map(CustomResourceDefinitionContext::fromCrd)
-            .orElse(null);
-    }
-
     public static List<HTTPHeader> convertMapToHTTPHeaderList(Map<String, String> headers) {
         List<HTTPHeader> httpHeaders = new ArrayList<>();
         if (headers != null) {
@@ -967,34 +953,5 @@ public static List<HTTPHeader> convertMapToHTTPHeaderList(Map<String, String> he
         }
         return httpHeaders;
     }
-
-    private static Optional<CustomResourceDefinition> findCrdForCustomResource(CustomResourceDefinitionList crdList, GenericCustomResource gcr) {
-        return crdList.getItems().stream()
-            .filter(hasGroup(gcr))
-            .filter(isVersionPresentInSpecVersion(gcr).or(isVersionPresentInVersionsList(gcr)))
-            .filter(hasKind(gcr))
-            .findFirst();
-    }
-
-    private static Predicate<CustomResourceDefinition> hasGroup(GenericCustomResource gcr) {
-        return crd -> crd.getSpec().getGroup().equals(trimGroup(gcr.getApiVersion()));
-    }
-
-    private static Predicate<CustomResourceDefinition> isVersionPresentInSpecVersion(GenericCustomResource gcr) {
-        final String gcrVersion = trimVersion(gcr.getApiVersion());
-        return crd -> crd.getSpec().getVersion() != null && crd.getSpec().getVersion().equals(gcrVersion);
-    }
-
-    private static Predicate<CustomResourceDefinition> isVersionPresentInVersionsList(GenericCustomResource gcr) {
-        final String gcrVersion = trimVersion(gcr.getApiVersion());
-        return crd -> crd.getSpec().getVersions() != null && crd.getSpec().getVersions()
-            .stream()
-            .map(CustomResourceDefinitionVersion::getName)
-            .anyMatch(n -> n.equals(gcrVersion));
-    }
-
-    private static Predicate<CustomResourceDefinition> hasKind(GenericCustomResource gcr) {
-        return crd -> crd.getSpec().getNames().getKind().equals(gcr.getKind());
-    }
 }
 

jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/ResourceUtil.java

@@ -32,13 +32,13 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.gson.JsonObject;
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesList;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.openshift.api.model.Template;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.eclipse.jkube.kit.common.GenericCustomResource;
 import org.eclipse.jkube.kit.common.ResourceFileType;
 import org.apache.commons.lang3.StringUtils;
 
@@ -95,7 +95,7 @@ private static List<HasMetadata> parseKubernetesListOrTemplate(ObjectMapper mapp
     private static List<HasMetadata> parseKubernetesList(ObjectMapper mapper, Map<String, Object> manifest) {
         final List<Map<String, Object>> items = (List<Map<String, Object>>)manifest.get("items");
         return items.stream().map(item -> {
-            final GenericCustomResource fallback = mapper.convertValue(item, GenericCustomResource.class);
+            final GenericKubernetesResource fallback = mapper.convertValue(item, GenericKubernetesResource.class);
             try {
                 // Convert Using KubernetesDeserializer or fail and return fallback generic
                 return mapper.convertValue(fallback, HasMetadata.class);
@@ -111,17 +111,17 @@ public static <T extends KubernetesResource> T load(File file, Class<T> clazz) t
         return load(file, clazz, type);
     }
 
-    private static boolean isGenericCustomResourceCompatible(Class<?> clazz){
-        return clazz.isAssignableFrom(GenericCustomResource.class);
+    private static boolean isGenericKubernetesResourceCompatible(Class<?> clazz){
+        return clazz.isAssignableFrom(GenericKubernetesResource.class);
     }
 
     public static <T extends KubernetesResource> T load(File file, Class<T> clazz, ResourceFileType resourceFileType)
         throws IOException {
         try {
             return getObjectMapper(resourceFileType).readValue(file, clazz);
         } catch(IOException ex) {
-            if (isGenericCustomResourceCompatible(clazz)) {
-                return clazz.cast(getObjectMapper(resourceFileType).readValue(file, GenericCustomResource.class));
+            if (isGenericKubernetesResourceCompatible(clazz)) {
+                return clazz.cast(getObjectMapper(resourceFileType).readValue(file, GenericKubernetesResource.class));
             }
             throw ex;
         }
@@ -134,8 +134,8 @@ public static <T extends KubernetesResource> T load(InputStream in, Class<T> cla
             IOUtils.copy(in, baos);
             return getObjectMapper(resourceFileType).readValue(baos.toByteArray(), clazz);
         } catch(IOException ex) {
-            if (isGenericCustomResourceCompatible(clazz)) {
-                return clazz.cast(getObjectMapper(resourceFileType).readValue(baos.toByteArray(), GenericCustomResource.class));
+            if (isGenericKubernetesResourceCompatible(clazz)) {
+                return clazz.cast(getObjectMapper(resourceFileType).readValue(baos.toByteArray(), GenericKubernetesResource.class));
             }
             throw ex;
         }