Merge pull request #2321 from brendandburns/auth_config

k8s-ci-robot · web-flow · commit 1a1529cce574 · 2022-08-18T03:10:37.000-07:00
Add support for dynamic objects to kubectl apply.
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;
@@ -22,6 +23,8 @@
 import io.kubernetes.client.openapi.Configuration;
 import io.kubernetes.client.util.ModelMapper;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
+import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesListObject;
+import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesObject;
 
 /**
  * Kubectl provides a set of helper functions that has the same functionalities as corresponding
@@ -308,6 +311,34 @@ protected GenericKubernetesApi<ApiType, KubernetesListObject> getGenericApi()
         throws KubectlException {
       return getGenericApi(apiTypeClass, KubernetesListObject.class);
     }
+
+    protected boolean isNamespaced(KubernetesObject obj) {
+      if (obj instanceof DynamicKubernetesObject) {
+        // This is slightly hacky, but for now CRD objects are all namespaced.
+        return true;
+      } else {
+        return ModelMapper.isNamespaced(obj.getClass());
+      }
+    }
+
+    protected GenericKubernetesApi<? extends KubernetesObject, ? extends KubernetesListObject>
+        getGenericApi(KubernetesObject targetObj) throws KubectlException {
+      if (targetObj instanceof DynamicKubernetesObject) {
+        DynamicKubernetesObject obj = (DynamicKubernetesObject) targetObj;
+        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,
+            gvk.getGroup(),
+            gvk.getVersion(),
+            plural,
+            apiClient);
+      }
+      return getGenericApi();
+    }
   }
 
   abstract static class ResourceAndContainerBuilder<
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlApply.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlApply.java
@@ -17,7 +17,6 @@
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.openapi.ApiException;
-import io.kubernetes.client.util.ModelMapper;
 import io.kubernetes.client.util.Namespaces;
 import io.kubernetes.client.util.Strings;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
@@ -70,13 +69,17 @@ public ApiType execute() throws KubectlException {
   private ApiType executeServerSideApply() throws KubectlException {
     refreshDiscovery();
 
-    GenericKubernetesApi<ApiType, KubernetesListObject> api = getGenericApi();
+    GenericKubernetesApi<? extends KubernetesObject, ? extends KubernetesListObject> api =
+        getGenericApi(this.targetObj);
+    if (api == null) {
+      api = getGenericApi();
+    }
 
     PatchOptions patchOptions = new PatchOptions();
     patchOptions.setForce(this.forceConflict);
     patchOptions.setFieldManager(this.fieldManager);
 
-    if (ModelMapper.isNamespaced(this.targetObj.getClass())) {
+    if (isNamespaced(this.targetObj)) {
       String targetNamespace =
           namespace != null
               ? namespace
@@ -86,26 +89,28 @@ private ApiType executeServerSideApply() throws KubectlException {
 
       KubernetesApiResponse<KubernetesObject> response = null;
       try {
-        return api.patch(
-                targetNamespace,
-                targetObj.getMetadata().getName(),
-                V1Patch.PATCH_FORMAT_APPLY_YAML,
-                new V1Patch(apiClient.getJSON().serialize(targetObj)),
-                patchOptions)
-            .throwsApiException()
-            .getObject();
+        return (ApiType)
+            api.patch(
+                    targetNamespace,
+                    targetObj.getMetadata().getName(),
+                    V1Patch.PATCH_FORMAT_APPLY_YAML,
+                    new V1Patch(apiClient.getJSON().serialize(targetObj)),
+                    patchOptions)
+                .throwsApiException()
+                .getObject();
       } catch (ApiException e) {
         throw new KubectlException(e);
       }
     } else {
       try {
-        return api.patch(
-                targetObj.getMetadata().getName(),
-                V1Patch.PATCH_FORMAT_APPLY_YAML,
-                new V1Patch(apiClient.getJSON().serialize(targetObj)),
-                patchOptions)
-            .throwsApiException()
-            .getObject();
+        return (ApiType)
+            api.patch(
+                    targetObj.getMetadata().getName(),
+                    V1Patch.PATCH_FORMAT_APPLY_YAML,
+                    new V1Patch(apiClient.getJSON().serialize(targetObj)),
+                    patchOptions)
+                .throwsApiException()
+                .getObject();
       } catch (ApiException e) {
         throw new KubectlException(e);
       }
diff --git a/extended/src/test/java/io/kubernetes/client/extended/kubectl/KubectlApplyTest.java b/extended/src/test/java/io/kubernetes/client/extended/kubectl/KubectlApplyTest.java
@@ -21,12 +21,14 @@
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import com.github.tomakehurst.wiremock.matching.EqualToPattern;
+import com.google.gson.JsonObject;
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.util.ClientBuilder;
+import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesObject;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -110,4 +112,48 @@ public void testApplyConfigMap() throws KubectlException, IOException {
         1, patchRequestedFor(urlPathEqualTo("/api/v1/namespaces/foo/configmaps/bar")));
     assertNotNull(configMap);
   }
+
+  @Test
+  public void testApplyDynamic() throws KubectlException, IOException {
+    JsonObject json = new JsonObject();
+    json.addProperty("kind", "bar");
+    json.addProperty("apiVersion", "example.com/v1");
+    JsonObject meta = new JsonObject();
+    meta.addProperty("name", "something");
+    meta.addProperty("namespace", "foo");
+    json.add("metadata", meta);
+
+    DynamicKubernetesObject obj = new DynamicKubernetesObject(json);
+    wireMockRule.stubFor(
+        patch(urlPathEqualTo("/apis/example.com/v1/namespaces/foo/bars/something"))
+            .withHeader("Content-Type", new EqualToPattern(V1Patch.PATCH_FORMAT_APPLY_YAML))
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withBody("{\"metadata\":{\"name\":\"something\",\"namespace\":\"bar\"}}")));
+    wireMockRule.stubFor(
+        get(urlPathEqualTo("/api"))
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withBody(new String(Files.readAllBytes(Paths.get(DISCOVERY_API))))));
+    wireMockRule.stubFor(
+        get(urlPathEqualTo("/apis"))
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withBody(new String(Files.readAllBytes(Paths.get(DISCOVERY_APIS))))));
+    wireMockRule.stubFor(
+        get(urlPathEqualTo("/api/v1"))
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withBody(new String(Files.readAllBytes(Paths.get(DISCOVERY_APIV1))))));
+
+    DynamicKubernetesObject out =
+        Kubectl.apply(DynamicKubernetesObject.class).apiClient(apiClient).resource(obj).execute();
+    wireMockRule.verify(
+        1, patchRequestedFor(urlPathEqualTo("/apis/example.com/v1/namespaces/foo/bars/something")));
+    assertNotNull(out);
+  }
 }
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,38 @@ 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");
