Fallback to merge patch

examples/patch.py

@@ -99,7 +99,8 @@ async def main():
             SERVICE_NAME,
             SERVICE_NS,
             patch,
-            _content_type="application/merge-patch+json",  # required to force merge patch
+            # required to force merge patch when strategic merge patch would otherwise be used
+            _content_type="application/merge-patch+json",
         )
 
 

kubernetes_asyncio/client/api_client.py

@@ -539,9 +539,13 @@
             if ('application/json-patch+json' in content_types and
                     isinstance(body, list)):
                 return 'application/json-patch+json'
-            if ('application/strategic-merge-patch+json' in content_types and
-                    (isinstance(body, dict) or hasattr(body, "to_dict"))):
-                return 'application/strategic-merge-patch+json'
+            if isinstance(body, dict) or hasattr(body, "to_dict"):
+                if 'application/strategic-merge-patch+json' in content_types:
+                    return 'application/strategic-merge-patch+json'
+                elif 'application/merge-patch+json' in content_types:
+                    # Intended for cases where strategic merge patch is not
+                    # supported, like when patching custom objects.
+                    return 'application/merge-patch+json'
 
         if 'application/json' in content_types or '*/*' in content_types:
             return 'application/json'

kubernetes_asyncio/e2e_test/test_client.py

@@ -17,7 +17,9 @@
 from unittest import IsolatedAsyncioTestCase
 
 from kubernetes_asyncio.client import api_client
-from kubernetes_asyncio.client.api import core_v1_api
+from kubernetes_asyncio.client.api import (
+    apiextensions_v1_api, core_v1_api, custom_objects_api,
+)
 from kubernetes_asyncio.e2e_test import base
 from kubernetes_asyncio.stream import WsApiClient
 
@@ -187,6 +189,92 @@
             name=name, body={}, namespace="default"
         )
 
+    async def test_custom_objects_api(self):
+        client = api_client.ApiClient(configuration=self.config)
+
+        apiextensions_api_client = apiextensions_v1_api.ApiextensionsV1Api(client)
+        custom_objects_api_client = custom_objects_api.CustomObjectsApi(client)
+
+        name = 'clusterchangemes.apps.example.com'
+        crd_manifest = {
+            "apiVersion": "apiextensions.k8s.io/v1",
+            "kind": "CustomResourceDefinition",
+            "metadata": {
+                "name": name,
+            },
+            "spec": {
+                "group": "apps.example.com",
+                "names": {
+                    "kind": "ClusterChangeMe",
+                    "listKind": "ClusterChangeMeList",
+                    "plural": "clusterchangemes",
+                    "singular": "clusterchangeme",
+                },
+                "scope": "Cluster",
+                "versions": [
+                    {
+                        "name": "v1",
+                        "served": True,
+                        "storage": True,
+                        "schema": {
+                            "openAPIV3Schema": {
+                                "type": "object",
+                                "properties": {
+                                    "spec": {
+                                        "type": "object",
+                                        "properties": {
+                                            "size": {"type": "integer"}
+                                        },
+                                    }
+                                },
+                            }
+                        },
+                    }
+                ],
+            },
+        }
+        custom_object_manifest = {
+            'apiVersion': 'apps.example.com/v1',
+            'kind': 'ClusterChangeMe',
+            'metadata': {
+                'name': "changeme-name",
+            },
+            'spec': {}
+        }
+
+        await apiextensions_api_client.create_custom_resource_definition(
+            crd_manifest
+        )
+
+        await apiextensions_api_client.read_custom_resource_definition(
+            crd_manifest["metadata"]["name"]
+        )
+
+        await custom_objects_api_client.create_cluster_custom_object(
+            crd_manifest["spec"]["group"],
+            crd_manifest["spec"]["versions"][0]["name"],
+            crd_manifest["spec"]["names"]["plural"],
+            custom_object_manifest
+        )
+
+        # json merge patch (implied)
+        resp = await custom_objects_api_client.patch_cluster_custom_object(
+            group=crd_manifest["spec"]["group"],
+            version=crd_manifest["spec"]["versions"][0]["name"],
+            plural=crd_manifest["spec"]["names"]["plural"],
+            name=custom_object_manifest["metadata"]["name"],
+            body={
+                "spec": {
+                    "size": 0
+                }
+            },
+        )
+        self.assertEqual(resp["spec"]["size"], 0)
+
+        await apiextensions_api_client.delete_custom_resource_definition(
+            crd_manifest["metadata"]["name"]
+        )
+
     async def test_replication_controller_apis(self):
         client = api_client.ApiClient(configuration=self.config)
         api = core_v1_api.CoreV1Api(client)

scripts/api_client_strategic_merge_patch.diff

@@ -1,9 +1,9 @@
---- /tmp/api_client.py	2024-02-25 20:40:28.143350042 +0100
-+++ kubernetes_asyncio/client/api_client.py	2024-02-25 20:40:32.954201652 +0100
-@@ -535,10 +535,13 @@
- 
+--- /tmp/api_client.py	2024-12-18 03:36:59.552742383 +0000
++++ kubernetes_asyncio/client/api_client.py	2024-12-18 03:36:11.062928089 +0000
+@@ -535,10 +535,17 @@
+
          content_types = [x.lower() for x in content_types]
- 
+
 -        if (method == 'PATCH' and
 -                'application/json-patch+json' in content_types and
 -                isinstance(body, list)):
@@ -12,9 +12,13 @@
 +            if ('application/json-patch+json' in content_types and
 +                    isinstance(body, list)):
 +                return 'application/json-patch+json'
-+            if ('application/strategic-merge-patch+json' in content_types and
-+                    (isinstance(body, dict) or hasattr(body, "to_dict"))):
-+                return 'application/strategic-merge-patch+json'
-
++            if isinstance(body, dict) or hasattr(body, "to_dict"):
++                if 'application/strategic-merge-patch+json' in content_types:
++                    return 'application/strategic-merge-patch+json'
++                elif 'application/merge-patch+json' in content_types:
++                    # Intended for cases where strategic merge patch is not
++                    # supported, like when patching custom objects.
++                    return 'application/merge-patch+json'
+
          if 'application/json' in content_types or '*/*' in content_types:
              return 'application/json'

scripts/update-client.sh

@@ -35,7 +35,7 @@ pushd "${CLIENT_ROOT}" > /dev/null
 CLIENT_ROOT=`pwd`
 popd > /dev/null
 
-TEMP_FOLDER=$(mktemp -d) 
+TEMP_FOLDER=$(mktemp -d)
 trap "rm -rf ${TEMP_FOLDER}" EXIT SIGINT
 
 SETTING_FILE="${TEMP_FOLDER}/settings"