Address comments.

brendandburns · brendandburns · commit 7cb7d63ea422 · 2022-08-12T20:56:52.000Z
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/Kubectl.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/Kubectl.java
@@ -13,6 +13,7 @@
 package io.kubernetes.client.extended.kubectl;
 
 import io.kubernetes.client.Discovery;
+import io.kubernetes.client.apimachinery.GroupVersionKind;
 import io.kubernetes.client.apimachinery.GroupVersionResource;
 import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.common.KubernetesObject;
@@ -316,17 +317,15 @@ protected GenericKubernetesApi<ApiType, KubernetesListObject> getGenericApi()
         throws KubectlException {
       if (targetObj instanceof DynamicKubernetesObject) {
         DynamicKubernetesObject obj = (DynamicKubernetesObject)targetObj;
-        String gv = obj.getApiVersion();
-        int ix = gv.indexOf("/");
-        String group = ix == -1 ? "" : gv.substring(0, ix);
-        String version = gv.substring(ix + 1);
-    
+        GroupVersionKind gvk = ModelMapper.groupVersionKindFromApiVersionAndKind(obj.getApiVersion(), obj.getKind());
+        Discovery.APIResource rsrc = ModelMapper.findApiResourceByGroupVersionKind(gvk);
+        String plural = rsrc == null ? obj.getKind() + "s" /* hack! */ : rsrc.getResourcePlural();
         return new GenericKubernetesApi<DynamicKubernetesObject, DynamicKubernetesListObject>(
           DynamicKubernetesObject.class,
           DynamicKubernetesListObject.class,
-          group,
-          version,
-          obj.getKind() + "s" // TODO: Extend the model mapper to be able to look up plurals
+          gvk.getGroup(),
+          gvk.getVersion(),
+          plural
         );
       }
       return getGenericApi();
diff --git a/util/src/main/java/io/kubernetes/client/util/ModelMapper.java b/util/src/main/java/io/kubernetes/client/util/ModelMapper.java
@@ -322,6 +322,34 @@ public static Boolean isNamespaced(Class<?> clazz) {
     return isNamespacedByClasses.get(clazz);
   }
 
+  /**
+   * Find GroupVersionKind from fields in a Kubernetes Resource
+   * @param apiVersion The apiVersion field from the object
+   * @param kind The kind for the object
+   * @return the GroupVersionKind
+   */
+  public static GroupVersionKind groupVersionKindFromApiVersionAndKind(String apiVersion, String kind) {
+    int ix = apiVersion.indexOf("/");
+    String group = ix == -1 ? "" : apiVersion.substring(0, ix);
+    String version = apiVersion.substring(ix + 1);
+    return new GroupVersionKind(group, version, kind);
+  }
+
+  public static Discovery.APIResource findApiResourceByGroupVersionKind(GroupVersionKind gvk) {
+    // TODO: Create another hash map to make this lookup fast? For now I don't think it matters, but it's definitely slow.
+    for (Discovery.APIResource apiResource : lastAPIDiscovery) {
+      if (!apiResource.getGroup().equals(gvk.getGroup()) || !apiResource.getKind().equals(gvk.getKind())) {
+        continue;
+      }
+      for (String version : apiResource.getVersions()) {
+        if (version.equals(gvk.getVersion())) {
+          return apiResource;
+        }
+      }
+    }
+    return null;
+  }
+
   private static void initApiGroupMap() {
     preBuiltApiGroups.put("Admissionregistration", "admissionregistration.k8s.io");
     preBuiltApiGroups.put("Apiextensions", "apiextensions.k8s.io");
